Skip to content

Commit

Permalink
BED-5434: Fix login with leading/trailing spaces in username (#1173)
Browse files Browse the repository at this point in the history
* fix: remove leading and trailing spaces from username

* just prepare-for-codereview
  • Loading branch information
iustinum authored Feb 25, 2025
1 parent a05cb8c commit 93d9914
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
19 changes: 11 additions & 8 deletions cmd/api/src/api/v2/auth/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,21 @@ func (s LoginResource) loginSecret(loginRequest api.LoginRequest, response http.

func (s LoginResource) Login(response http.ResponseWriter, request *http.Request) {
var loginRequest api.LoginRequest

if err := api.ReadJSONRequestPayloadLimited(&loginRequest, request); err != nil {
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, err.Error(), request), response)
} else if err = s.patchEULAAcceptance(request.Context(), loginRequest.Username); err != nil {
api.HandleDatabaseError(request, response, err)
} else {
switch strings.ToLower(loginRequest.LoginMethod) {
case auth.ProviderTypeSecret:
s.loginSecret(loginRequest, response, request)
// Trim leading and trailing spaces from the username
loginRequest.Username = strings.TrimSpace(loginRequest.Username)

default:
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, fmt.Sprintf("Login method %s is not supported.", loginRequest.LoginMethod), request), response)
if err = s.patchEULAAcceptance(request.Context(), loginRequest.Username); err != nil {
api.HandleDatabaseError(request, response, err)
} else {
switch strings.ToLower(loginRequest.LoginMethod) {
case auth.ProviderTypeSecret:
s.loginSecret(loginRequest, response, request)
default:
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, fmt.Sprintf("Login method %s is not supported.", loginRequest.LoginMethod), request), response)
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/go/graphschema/ad/ad.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/go/graphschema/azure/azure.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/go/graphschema/common/common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 93d9914

Please sign in to comment.