return generic login error when invalid credentials (#350)
This commit is contained in:
@@ -99,25 +99,25 @@ func getLoginResponse(lr *models.LoginRequest) (*models.LoginResponse, *models.E
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
mAdmin, err := newSuperMAdminClient()
|
mAdmin, err := newSuperMAdminClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, prepareError(err)
|
return nil, prepareError(err, errorGeneric)
|
||||||
}
|
}
|
||||||
adminClient := adminClient{client: mAdmin}
|
adminClient := adminClient{client: mAdmin}
|
||||||
// obtain the configured MinIO region
|
// obtain the configured MinIO region
|
||||||
// need it for user authentication
|
// need it for user authentication
|
||||||
location, err := getConfiguredRegionForLogin(adminClient)
|
location, err := getConfiguredRegionForLogin(adminClient)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, prepareError(err)
|
return nil, prepareError(err, errorGeneric)
|
||||||
}
|
}
|
||||||
creds, err := newConsoleCredentials(*lr.AccessKey, *lr.SecretKey, location)
|
creds, err := newConsoleCredentials(*lr.AccessKey, *lr.SecretKey, location)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, prepareError(err)
|
return nil, prepareError(err, errInvalidCredentials)
|
||||||
}
|
}
|
||||||
credentials := consoleCredentials{consoleCredentials: creds}
|
credentials := consoleCredentials{consoleCredentials: creds}
|
||||||
// obtain the current policy assigned to this user
|
// obtain the current policy assigned to this user
|
||||||
// necessary for generating the list of allowed endpoints
|
// necessary for generating the list of allowed endpoints
|
||||||
userInfo, err := adminClient.getUserInfo(ctx, *lr.AccessKey)
|
userInfo, err := adminClient.getUserInfo(ctx, *lr.AccessKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, prepareError(err)
|
return nil, prepareError(err, errorGeneric)
|
||||||
}
|
}
|
||||||
policy, _ := adminClient.getPolicy(ctx, userInfo.PolicyName)
|
policy, _ := adminClient.getPolicy(ctx, userInfo.PolicyName)
|
||||||
// by default every user starts with an empty array of available actions
|
// by default every user starts with an empty array of available actions
|
||||||
|
|||||||
Reference in New Issue
Block a user