fix (API): check attributes missing appropriately. (#2219)
* fix (API): check attributes missing appropriately.
This commit is contained in:
8 files changed
+177
-87
No files matched your search
@@ -333,33 +333,42 @@ func validateAuthenticateOidcRequest(req *pbs.AuthenticateRequest) error {
|
||||
case startCommand:
|
||||
if req.GetOidcStartAttributes() != nil {
|
||||
attrs := req.GetOidcStartAttributes()
|
||||
switch {
|
||||
case attrs == nil:
|
||||
badFields["attributes"] = "Attributes field not supplied request"
|
||||
default:
|
||||
// Ensure we pay no attention to cache information provided by the client
|
||||
attrs.CachedRoundtripPayload = ""
|
||||
|
||||
// Ensure we pay no attention to cache information provided by the client
|
||||
attrs.CachedRoundtripPayload = ""
|
||||
|
||||
payload := attrs.GetRoundtripPayload()
|
||||
if payload == nil {
|
||||
break
|
||||
}
|
||||
m, err := json.Marshal(payload.AsMap())
|
||||
if err != nil {
|
||||
// We don't know what's in this payload so we swallow the
|
||||
// error, as it could be something sensitive.
|
||||
badFields[roundtripPayloadAttributesField] = "Unable to marshal given value as JSON."
|
||||
} else {
|
||||
// Cache for later
|
||||
attrs.CachedRoundtripPayload = string(m)
|
||||
payload := attrs.GetRoundtripPayload()
|
||||
if payload == nil {
|
||||
break
|
||||
}
|
||||
m, err := json.Marshal(payload.AsMap())
|
||||
if err != nil {
|
||||
// We don't know what's in this payload so we swallow the
|
||||
// error, as it could be something sensitive.
|
||||
badFields[roundtripPayloadAttributesField] = "Unable to marshal given value as JSON."
|
||||
} else {
|
||||
// Cache for later
|
||||
attrs.CachedRoundtripPayload = string(m)
|
||||
}
|
||||
}
|
||||
}
|
||||
case callbackCommand:
|
||||
attrs := req.GetOidcAuthMethodAuthenticateCallbackRequest()
|
||||
switch {
|
||||
case attrs == nil:
|
||||
badFields["attributes"] = "Attributes field not supplied request"
|
||||
return handlers.InvalidArgumentErrorf("This is a required field.", badFields)
|
||||
default:
|
||||
if attrs.GetCode() == "" && attrs.GetError() == "" {
|
||||
badFields[codeField] = "Code field not supplied in callback request."
|
||||
}
|
||||
|
||||
if attrs.GetCode() == "" && attrs.GetError() == "" {
|
||||
badFields[codeField] = "Code field not supplied in callback request."
|
||||
}
|
||||
|
||||
if attrs.GetState() == "" {
|
||||
badFields[stateField] = "State field not supplied in callback request."
|
||||
if attrs.GetState() == "" {
|
||||
badFields[stateField] = "State field not supplied in callback request."
|
||||
}
|
||||
}
|
||||
|
||||
case tokenCommand:
|
||||
|
||||
@@ -137,27 +137,32 @@ func validateAuthenticatePasswordRequest(req *pbs.AuthenticateRequest) error {
|
||||
badFields := make(map[string]string)
|
||||
|
||||
attrs := req.GetPasswordLoginAttributes()
|
||||
if attrs.LoginName == "" {
|
||||
badFields["attributes.login_name"] = "This is a required field."
|
||||
}
|
||||
if attrs.Password == "" {
|
||||
badFields["attributes.password"] = "This is a required field."
|
||||
}
|
||||
if req.GetCommand() == "" {
|
||||
// TODO: Eventually, require a command. For now, fall back to "login" for backwards compat.
|
||||
req.Command = loginCommand
|
||||
}
|
||||
if req.Command != loginCommand {
|
||||
badFields[commandField] = "Invalid command for this auth method type."
|
||||
}
|
||||
tokenType := req.GetType()
|
||||
if tokenType == "" {
|
||||
// Fall back to deprecated field if type is not set
|
||||
tokenType = req.GetTokenType()
|
||||
}
|
||||
tType := strings.ToLower(strings.TrimSpace(tokenType))
|
||||
if tType != "" && tType != "token" && tType != "cookie" {
|
||||
badFields[tokenTypeField] = `The only accepted types are "token" and "cookie".`
|
||||
switch {
|
||||
case attrs == nil:
|
||||
badFields["attributes"] = "This is a required field."
|
||||
default:
|
||||
if attrs.LoginName == "" {
|
||||
badFields["attributes.login_name"] = "This is a required field."
|
||||
}
|
||||
if attrs.Password == "" {
|
||||
badFields["attributes.password"] = "This is a required field."
|
||||
}
|
||||
if req.GetCommand() == "" {
|
||||
// TODO: Eventually, require a command. For now, fall back to "login" for backwards compat.
|
||||
req.Command = loginCommand
|
||||
}
|
||||
if req.Command != loginCommand {
|
||||
badFields[commandField] = "Invalid command for this auth method type."
|
||||
}
|
||||
tokenType := req.GetType()
|
||||
if tokenType == "" {
|
||||
// Fall back to deprecated field if type is not set
|
||||
tokenType = req.GetTokenType()
|
||||
}
|
||||
tType := strings.ToLower(strings.TrimSpace(tokenType))
|
||||
if tType != "" && tType != "token" && tType != "cookie" {
|
||||
badFields[tokenTypeField] = `The only accepted types are "token" and "cookie".`
|
||||
}
|
||||
}
|
||||
|
||||
if len(badFields) > 0 {
|
||||
|
||||
@@ -498,10 +498,11 @@ func TestAuthenticate_Password(t *testing.T) {
|
||||
require.NotNil(t, acct)
|
||||
|
||||
cases := []struct {
|
||||
name string
|
||||
request *pbs.AuthenticateRequest
|
||||
wantType string
|
||||
wantErr error
|
||||
name string
|
||||
request *pbs.AuthenticateRequest
|
||||
wantType string
|
||||
wantErr error
|
||||
wantErrContains string
|
||||
}{
|
||||
{
|
||||
name: "basic",
|
||||
@@ -597,6 +598,16 @@ func TestAuthenticate_Password(t *testing.T) {
|
||||
},
|
||||
wantErr: handlers.ApiErrorWithCode(codes.Unauthenticated),
|
||||
},
|
||||
{
|
||||
name: "no-attributes",
|
||||
request: &pbs.AuthenticateRequest{
|
||||
AuthMethodId: am.GetPublicId(),
|
||||
TokenType: "token",
|
||||
Attrs: &pbs.AuthenticateRequest_PasswordLoginAttributes{},
|
||||
},
|
||||
wantErr: handlers.ApiErrorWithCode(codes.InvalidArgument),
|
||||
wantErrContains: `Details: {{name: "attributes", desc: "This is a required field."}}`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range cases {
|
||||
@@ -609,6 +620,9 @@ func TestAuthenticate_Password(t *testing.T) {
|
||||
if tc.wantErr != nil {
|
||||
assert.Error(err)
|
||||
assert.Truef(errors.Is(err, tc.wantErr), "Got %#v, wanted %#v", err, tc.wantErr)
|
||||
if tc.wantErrContains != "" {
|
||||
assert.Contains(err.Error(), tc.wantErrContains)
|
||||
}
|
||||
return
|
||||
}
|
||||
require.NoError(err)
|
||||
|
||||
Reference in new issue
Block a user