ING-662: Have creds take priority over client cert if both given

Author: Westwooo

gateway/dataimpl/server_v1/authhandler.go

@@ -77,15 +77,13 @@ func (a AuthHandler) MaybeGetOboUserFromContext(ctx context.Context) (string, st
 	credsFound := username != "" && password != ""
 	certFound := connState != nil && len(connState.PeerCertificates) != 0
 
-	if credsFound && certFound {
-		return "", "", a.ErrorHandler.NewCredentialsAndCertStatus()
-	}
-
-	if !credsFound && !certFound {
+	switch {
+	case !credsFound && !certFound:
 		return "", "", nil
-	}
-
-	if certFound {
+	case credsFound && certFound:
+		a.Logger.Debug("username/password taking priority over client cert auth as both were given.")
+	case credsFound:
+	case certFound:
 		oboUser, oboDomain, err := a.Authenticator.ValidateConnStateForObo(ctx, connState)
 		if err != nil {
 			if errors.Is(err, auth.ErrInvalidCertificate) {

gateway/dataimpl/server_v1/errorhandler.go

@@ -884,11 +884,6 @@ func (e ErrorHandler) NewUnexpectedAuthTypeStatus() *status.Status {
 	return st
 }
 
-func (e ErrorHandler) NewCredentialsAndCertStatus() *status.Status {
-	st := status.New(codes.InvalidArgument, "Authorization header and client certificate provided.")
-	return st
-}
-
 func (e ErrorHandler) NewInvalidQueryStatus(baseErr error, queryErrStr string) *status.Status {
 	st := status.New(codes.InvalidArgument,
 		fmt.Sprintf("Query parsing failed: %s", queryErrStr))