Skip to content

Commit 31a5d64

Browse files
authored
Support login request with leading or trailing whitespace from payload (#3496)
* trim whitespaces for login request * simplify trimspace calls
1 parent b45e11c commit 31a5d64

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

api/user_login.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ func getLoginResponse(params authApi.LoginParams) (*models.LoginResponse, *Coded
129129
ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
130130
defer cancel()
131131
lr := params.Body
132+
// trim any leading and trailing whitespace from the login request
133+
lr.AccessKey = strings.TrimSpace(lr.AccessKey)
134+
lr.SecretKey = strings.TrimSpace(lr.SecretKey)
135+
lr.Sts = strings.TrimSpace(lr.Sts)
132136

133137
clientIP := getClientIP(params.HTTPRequest)
134138
client := GetConsoleHTTPClient(clientIP)

integration/login_test.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,36 @@ func TestLogout(t *testing.T) {
131131
assert.Equal(response.StatusCode, 200)
132132
}
133133

134+
func TestLoginExtraSpaces(t *testing.T) {
135+
assert := assert.New(t)
136+
137+
client := &http.Client{
138+
Timeout: 2 * time.Second,
139+
}
140+
requestData := map[string]string{
141+
"accessKey": " minioadmin ",
142+
"secretKey": "minioadmin",
143+
}
144+
145+
requestDataJSON, _ := json.Marshal(requestData)
146+
147+
requestDataBody := bytes.NewReader(requestDataJSON)
148+
149+
request, err := http.NewRequest("POST", "http://localhost:9090/api/v1/login", requestDataBody)
150+
if err != nil {
151+
log.Println(err)
152+
return
153+
}
154+
155+
request.Header.Add("Content-Type", "application/json")
156+
157+
response, err := client.Do(request)
158+
159+
assert.Equal(204, response.StatusCode, "Login request should succeed")
160+
assert.NotNil(response, "Login response is nil")
161+
assert.Nil(err, "Login errored out")
162+
}
163+
134164
func TestBadLogin(t *testing.T) {
135165
assert := assert.New(t)
136166

0 commit comments

Comments
 (0)