Merge pull request #37 from croessner/features

Refactor auth request processing and TOTP secret retrieval
croessner · May 28, 2024 · 158f4c9 · 158f4c9
2 parents 85be48e + cfa5af1
commit 158f4c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/server/core/hydra.go b/server/core/hydra.go
@@ -1157,10 +1157,8 @@ func initializeAuthLogin(ctx *gin.Context) (*Authentication, error) {
 
 	auth.withDefaults(ctx).withClientInfo(ctx).withLocalInfo(ctx).withUserAgent(ctx).withXSSL(ctx)
 
-	if found, reject := auth.preproccessAuthRequest(ctx); reject {
+	if _, reject := auth.preproccessAuthRequest(ctx); reject {
 		return nil, errors2.ErrBruteForceAttack
-	} else if found {
-		auth.withClientInfo(ctx).withLocalInfo(ctx).withUserAgent(ctx).withXSSL(ctx)
 	}
 
 	return auth, nil

diff --git a/server/core/ldap.go b/server/core/ldap.go
@@ -67,7 +67,7 @@ func saveMasterUserTOTPSecret(masterUserMode bool, ldapReply *backend.LDAPReply,
 	if masterUserMode {
 		// Check if the master user does have a TOTP secret.
 		if value, okay := ldapReply.Result[totpSecretField]; okay {
-			totpSecretPre = value
+			return value
 		}
 	}