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

Return sample message for login error in api context #12994

Merged
merged 7 commits into from
Oct 4, 2020
Merged

Return sample message for login error in api context #12994

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e961667
Return sample message for login error in api context
a1012112796 Oct 1, 2020
44406f3
Update modules/context/auth.go
a1012112796 Oct 2, 2020
c8a4a8a
Merge branch 'master' into fix_err_msg
a1012112796 Oct 2, 2020
7c11a96
Apply suggestions from code review
a1012112796 Oct 3, 2020
318e9c3
Apply suggestions from code review
a1012112796 Oct 3, 2020
18e883e
Merge branch 'master' into fix_err_msg
lafriks Oct 4, 2020
9fd68df
Merge branch 'master' into fix_err_msg
techknowlogick Oct 4, 2020
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
26 changes: 23 additions & 3 deletions modules/context/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,40 @@ func Toggle(options *ToggleOptions) macaron.Handler {
return
}

isAPIPath := auth.IsAPIPath(ctx.Req.URL.Path)

// Check prohibit login users.
if ctx.IsSigned {
if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
if isAPIPath {
ctx.JSON(403, map[string]string{
"message": "Your account is not active.",
a1012112796 marked this conversation as resolved.
Show resolved Hide resolved
})
return
}
ctx.HTML(200, "user/auth/activate")
return
} else if !ctx.User.IsActive || ctx.User.ProhibitLogin {
log.Info("Failed authentication attempt for %s from %s", ctx.User.Name, ctx.RemoteAddr())
ctx.Data["Title"] = ctx.Tr("auth.prohibit_login")
if isAPIPath {
ctx.JSON(403, map[string]string{
"message": "Your account is prohibited to sign in, please contact your site administrator.",
a1012112796 marked this conversation as resolved.
Show resolved Hide resolved
})
return
}
ctx.HTML(200, "user/auth/prohibit_login")
return
}

if ctx.User.MustChangePassword {
if isAPIPath {
ctx.JSON(403, map[string]string{
"message": "You must change password. You can do it using link " + setting.AppURL + "/user/change_password",
a1012112796 marked this conversation as resolved.
Show resolved Hide resolved
})
return
}
if ctx.Req.URL.Path != "/user/settings/change_password" {
ctx.Data["Title"] = ctx.Tr("auth.must_change_password")
ctx.Data["ChangePasscodeLink"] = setting.AppSubURL + "/user/change_password"
Expand Down Expand Up @@ -78,7 +98,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
if options.SignInRequired {
if !ctx.IsSigned {
// Restrict API calls with error message.
if auth.IsAPIPath(ctx.Req.URL.Path) {
if isAPIPath {
ctx.JSON(403, map[string]string{
"message": "Only signed in user is allowed to call APIs.",
})
Expand All @@ -94,7 +114,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
ctx.HTML(200, "user/auth/activate")
return
}
if ctx.IsSigned && auth.IsAPIPath(ctx.Req.URL.Path) && ctx.IsBasicAuth {
if ctx.IsSigned && isAPIPath && ctx.IsBasicAuth {
twofa, err := models.GetTwoFactorByUID(ctx.User.ID)
if err != nil {
if models.IsErrTwoFactorNotEnrolled(err) {
Expand All @@ -119,7 +139,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
}

// Redirect to log in page if auto-signin info is provided and has not signed in.
if !options.SignOutRequired && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) &&
if !options.SignOutRequired && !ctx.IsSigned && !isAPIPath &&
len(ctx.GetCookie(setting.CookieUserName)) > 0 {
if ctx.Req.URL.Path != "/user/events" {
ctx.SetCookie("redirect_to", setting.AppSubURL+ctx.Req.URL.RequestURI(), 0, setting.AppSubURL)
Expand Down