Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: login with apiKey capability #4557

Merged
merged 4 commits into from
Oct 14, 2020
Merged

fix: login with apiKey capability #4557

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e47e47b
fix: login with apiKey capability
mayzhang2000 Oct 14, 2020
710384b
fix: update based on code review.
mayzhang2000 Oct 14, 2020
ad60a67
fix: update based on code review.
mayzhang2000 Oct 14, 2020
54cb477
fix: check pws first.
mayzhang2000 Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions util/session/sessionmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,11 @@ const (
SessionManagerClaimsIssuer = "argocd"

// invalidLoginError, for security purposes, doesn't say whether the username or password was invalid. This does not mitigate the potential for timing attacks to determine which is which.
invalidLoginError = "Invalid username or password"
blankPasswordError = "Blank passwords are not allowed"
accountDisabled = "Account %s is disabled"
usernameTooLongError = "Username is too long (%d bytes max)"
invalidLoginError = "Invalid username or password"
blankPasswordError = "Blank passwords are not allowed"
accountDisabled = "Account %s is disabled"
usernameTooLongError = "Username is too long (%d bytes max)"
userDoesNotHaveCapability = "Account %s does not have %s capability"
)

const (
Expand Down Expand Up @@ -403,6 +404,10 @@ func (mgr *SessionManager) VerifyUsernamePassword(username string, password stri
return status.Errorf(codes.Unauthenticated, accountDisabled, username)
}

if !account.HasCapability(settings.AccountCapabilityLogin) {
return status.Errorf(codes.Unauthenticated, userDoesNotHaveCapability, username, settings.AccountCapabilityLogin)
mayzhang2000 marked this conversation as resolved.
Show resolved Hide resolved
}

valid, _ := passwordutil.VerifyPassword(password, account.PasswordHash)
if !valid {
mgr.updateFailureCount(username, true)
Expand Down