summaryrefslogtreecommitdiffstats
path: root/modules/middleware/context.go
diff options
context:
space:
mode:
Diffstat (limited to 'modules/middleware/context.go')
-rw-r--r--modules/middleware/context.go21
1 files changed, 21 insertions, 0 deletions
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index d2620fed12..7d767b9e76 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -173,6 +173,27 @@ func Contexter() macaron.Handler {
// Get user from session if logined.
ctx.User = auth.SignedInUser(ctx.Req.Header, ctx.Session)
+
+ // Check with basic auth again.
+ if ctx.User == nil {
+ baHead := ctx.Req.Header.Get("Authorization")
+ auths := strings.Fields(baHead)
+ if len(auths) == 2 && auths[0] == "Basic" {
+ uname, passwd, _ := base.BasicAuthDecode(auths[1])
+ u, err := models.GetUserByName(uname)
+ if err != nil {
+ if err != models.ErrUserNotExist {
+ ctx.Handle(500, "GetUserByName", err)
+ return
+ }
+ } else {
+ if u.ValidtePassword(passwd) {
+ ctx.User = u
+ }
+ }
+ }
+ }
+
if ctx.User != nil {
ctx.IsSigned = true
ctx.Data["IsSigned"] = ctx.IsSigned