Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle ErrUserProhibitLogin in http git #7586

Merged
merged 3 commits into from
Jul 23, 2019
Merged

Handle ErrUserProhibitLogin in http git #7586

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
439b241
Handle ErrUserProhibitLogin in http git
zeripath Jul 23, 2019
b3db50c
Merge branch 'master' into fix-7558-handle-not-signin-better
lunny Jul 23, 2019
0a12734
Merge branch 'master' into fix-7558-handle-not-signin-better
zeripath Jul 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion routers/repo/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,10 @@ func HTTP(ctx *context.Context) {
// Check username and password
authUser, err = models.UserSignIn(authUsername, authPasswd)
if err != nil {
if !models.IsErrUserNotExist(err) {
if models.IsErrUserProhibitLogin(err) {
ctx.HandleText(http.StatusUnauthorized, "User is not permitted to login")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

StatusForbidden seems more legit in this case. http://www.dirv.me/blog/2011/07/18/understanding-403-forbidden/index.html

Suggested change
ctx.HandleText(http.StatusUnauthorized, "User is not permitted to login")
ctx.HandleText(http.StatusForbidden, "User is not permitted to login")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn you're right but it's just been merged!

return
} else if !models.IsErrUserNotExist(err) {
ctx.ServerError("UserSignIn error: %v", err)
return
}
Expand Down