Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix auth issue on #80

Browse source
This commit is contained in:
Unknown 2014-04-16 04:45:02 -04:00
parent 6277f8497c
commit 2dc0329c5f
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
routers/repo/http.go
View file

@ -58,7 +58,8 @@ func Http(ctx *middleware.Context, params martini.Params) {
} }
// only public pull don't need auth // only public pull don't need auth
var askAuth = !(!repo.IsPrivate && isPull) || base.Service.RequireSignInView isPublicPull := !repo.IsPrivate && isPull
var askAuth = !isPublicPull || base.Service.RequireSignInView
var authUser *models.User var authUser *models.User
@ -91,32 +92,33 @@ func Http(ctx *middleware.Context, params martini.Params) {
} }
newUser := &models.User{Passwd: passwd, Salt: authUser.Salt} newUser := &models.User{Passwd: passwd, Salt: authUser.Salt}
newUser.EncodePasswd() newUser.EncodePasswd()
if authUser.Passwd != newUser.Passwd { if authUser.Passwd != newUser.Passwd {
ctx.Handle(401, "no basic auth and digit auth", nil) ctx.Handle(401, "no basic auth and digit auth", nil)
return return
} }
var tp = models.AU_WRITABLE if !isPublicPull {
if isPull { var tp = models.AU_WRITABLE
tp = models.AU_READABLE if isPull {
} tp = models.AU_READABLE
}
has, err := models.HasAccess(authUsername, username+"/"+reponame, tp) has, err := models.HasAccess(authUsername, username+"/"+reponame, tp)
if err != nil { if err != nil {
ctx.Handle(401, "no basic auth and digit auth", nil) ctx.Handle(401, "no basic auth and digit auth", nil)
return return
} else if !has { } else if !has {
if tp == models.AU_READABLE { if tp == models.AU_READABLE {
has, err = models.HasAccess(authUsername, username+"/"+reponame, models.AU_WRITABLE) has, err = models.HasAccess(authUsername, username+"/"+reponame, models.AU_WRITABLE)
if err != nil || !has { if err != nil || !has {
ctx.Handle(401, "no basic auth and digit auth", nil)
return
}
} else {
ctx.Handle(401, "no basic auth and digit auth", nil) ctx.Handle(401, "no basic auth and digit auth", nil)
return return
} }
} else {
ctx.Handle(401, "no basic auth and digit auth", nil)
return
} }
} }
} }