Merge branches 'dev' and 'dev' of github.com:gogits/gogs into dev
commit
1336d8d54d
|
@ -77,8 +77,8 @@ func init() {
|
||||||
// PublicKey represents a SSH key of user.
|
// PublicKey represents a SSH key of user.
|
||||||
type PublicKey struct {
|
type PublicKey struct {
|
||||||
Id int64
|
Id int64
|
||||||
OwnerId int64 `xorm:" index not null"`
|
OwnerId int64 `xorm:"unique(s) index not null"`
|
||||||
Name string `xorm:" not null"` //UNIQUE(s)
|
Name string `xorm:"unique(s) not null"` //UNIQUE(s)
|
||||||
Fingerprint string
|
Fingerprint string
|
||||||
Content string `xorm:"TEXT not null"`
|
Content string `xorm:"TEXT not null"`
|
||||||
Created time.Time `xorm:"created"`
|
Created time.Time `xorm:"created"`
|
||||||
|
|
|
@ -261,7 +261,7 @@ func basicDecode(encoded string) (user string, name string, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func authRequired(ctx *middleware.Context) {
|
func authRequired(ctx *middleware.Context) {
|
||||||
ctx.ResponseWriter.Header().Set("WWW-Authenticate", `Basic realm="Gogs Auth"`)
|
ctx.ResponseWriter.Header().Set("WWW-Authenticate", "Basic realm=\".\"")
|
||||||
ctx.Data["ErrorMsg"] = "no basic auth and digit auth"
|
ctx.Data["ErrorMsg"] = "no basic auth and digit auth"
|
||||||
ctx.HTML(401, fmt.Sprintf("status/401"))
|
ctx.HTML(401, fmt.Sprintf("status/401"))
|
||||||
}
|
}
|
||||||
|
@ -273,6 +273,8 @@ func Http(ctx *middleware.Context, params martini.Params) {
|
||||||
reponame = reponame[:len(reponame)-4]
|
reponame = reponame[:len(reponame)-4]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//fmt.Println("req:", ctx.Req.Header)
|
||||||
|
|
||||||
repoUser, err := models.GetUserByName(username)
|
repoUser, err := models.GetUserByName(username)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Handle(500, "repo.GetUserByName", nil)
|
ctx.Handle(500, "repo.GetUserByName", nil)
|
||||||
|
@ -297,7 +299,11 @@ func Http(ctx *middleware.Context, params martini.Params) {
|
||||||
|
|
||||||
// check basic auth
|
// check basic auth
|
||||||
baHead := ctx.Req.Header.Get("Authorization")
|
baHead := ctx.Req.Header.Get("Authorization")
|
||||||
if baHead != "" {
|
if baHead == "" {
|
||||||
|
authRequired(ctx)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
auths := strings.Fields(baHead)
|
auths := strings.Fields(baHead)
|
||||||
if len(auths) != 2 || auths[0] != "Basic" {
|
if len(auths) != 2 || auths[0] != "Basic" {
|
||||||
ctx.Handle(401, "no basic auth and digit auth", nil)
|
ctx.Handle(401, "no basic auth and digit auth", nil)
|
||||||
|
@ -332,10 +338,6 @@ func Http(ctx *middleware.Context, params martini.Params) {
|
||||||
ctx.Handle(401, "no basic auth and digit auth", nil)
|
ctx.Handle(401, "no basic auth and digit auth", nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
authRequired(ctx)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dir := models.RepoPath(username, reponame)
|
dir := models.RepoPath(username, reponame)
|
||||||
|
|
Loading…
Reference in New Issue