a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gateway: return right error when remotesource login fails 

If the remote source username/password based login fails return the right error
code: 401 (unauthorized) on wrong username/password or a 500 on other errors.
This commit is contained in:
Simone Gotti 2019-05-13 14:23:41 +02:00
parent a7ecfee795
commit a4744ab7f4
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/services/gateway/action/user.go
View File

@ -566,6 +566,9 @@ func (h *ActionHandler) HandleRemoteSourceAuth(ctx context.Context, remoteSource
tokenName := "agola-" + h.agolaID tokenName := "agola-" + h.agolaID
accessToken, err := passwordSource.LoginPassword(loginName, loginPassword, tokenName) accessToken, err := passwordSource.LoginPassword(loginName, loginPassword, tokenName)
if err != nil { if err != nil {
if err == gitsource.ErrUnauthorized {
return nil, util.NewErrUnauthorized(errors.Wrapf(err, "failed to login to remotesource %q", remoteSourceName))
}
return nil, errors.Wrapf(err, "failed to login to remote source %q with login name %q", rs.Name, loginName) return nil, errors.Wrapf(err, "failed to login to remote source %q with login name %q", rs.Name, loginName)
} }
h.log.Infof("access token: %s", accessToken) h.log.Infof("access token: %s", accessToken)

5
internal/services/gateway/api/api.go
View File

@ -36,6 +36,8 @@ func ErrorResponseFromError(err error) *ErrorResponse {
case util.IsErrNotFound(err): case util.IsErrNotFound(err):
fallthrough fallthrough
case util.IsErrForbidden(err): case util.IsErrForbidden(err):
fallthrough
case util.IsErrUnauthorized(err):
return &ErrorResponse{Message: err.Error()} return &ErrorResponse{Message: err.Error()}
} }
@ -64,6 +66,9 @@ func httpError(w http.ResponseWriter, err error) bool {
case util.IsErrForbidden(err): case util.IsErrForbidden(err):
w.WriteHeader(http.StatusForbidden) w.WriteHeader(http.StatusForbidden)
w.Write(resj) w.Write(resj)
case util.IsErrUnauthorized(err):
w.WriteHeader(http.StatusUnauthorized)
w.Write(resj)
default: default:
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
w.Write(resj) w.Write(resj)