Update builtin/credential/ldap/backend.go

Co-authored-by: Calvin Leung Huang <1883212+calvn@users.noreply.github.com>
hashicorp · May 20, 2022 · 04d8cb9 · 04d8cb9
1 parent ae7e2e9
commit 04d8cb9
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/builtin/credential/ldap/backend.go b/builtin/credential/ldap/backend.go
@@ -195,15 +195,16 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri
 	// Policies from each group may overlap
 	policies = strutil.RemoveDuplicates(policies, true)
 
-	entityAliasAttribute := username
-	if !usernameAsAlias {
-		entityAliasAttribute, err = ldapClient.GetUserAliasAttributeValue(cfg.ConfigEntry, c, username)
-		if err != nil {
-			return "", nil, logical.ErrorResponse(err.Error()), nil, nil
-		}
-		if entityAliasAttribute == "" {
-			return "", nil, logical.ErrorResponse("missing entity alias attribute value"), nil, nil
-		}
+	if usernameAsAlias {
+		return username, policies, ldapResponse, allGroups, nil
+	}
+
+	entityAliasAttribute, err = ldapClient.GetUserAliasAttributeValue(cfg.ConfigEntry, c, username)
+	if err != nil {
+		return "", nil, logical.ErrorResponse(err.Error()), nil, nil
+	}
+	if entityAliasAttribute == "" {
+		return "", nil, logical.ErrorResponse("missing entity alias attribute value"), nil, nil
 	}
 
 	return entityAliasAttribute, policies, ldapResponse, allGroups, nil