github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-07-02 04:00:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #764 from caiych/noauth-better

Browse Source 
skip the login window if web_username/password is empty
This commit is contained in:
ffdfgdfg 2021-04-07 17:11:40 +08:00 committed by GitHub
commit d331db723b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
web/controllers/login.go
View File

@ -24,11 +24,28 @@ type record struct {
} }
func (self *LoginController) Index() { func (self *LoginController) Index() {
self.Data["web_base_url"] = beego.AppConfig.String("web_base_url") // Try login implicitly, will succeed if it's configured as no-auth(empty username&password).
webBaseUrl := beego.AppConfig.String("web_base_url")
if self.doLogin("", "", false) {
self.Redirect(webBaseUrl+"/index/index", 302)
}
self.Data["web_base_url"] = webBaseUrl
self.Data["register_allow"], _ = beego.AppConfig.Bool("allow_user_register") self.Data["register_allow"], _ = beego.AppConfig.Bool("allow_user_register")
self.TplName = "login/index.html" self.TplName = "login/index.html"
} }
func (self *LoginController) Verify() { func (self *LoginController) Verify() {
username := self.GetString("username")
password := self.GetString("password")
if self.doLogin(username, password, true) {
self.Data["json"] = map[string]interface{}{"status": 1, "msg": "login success"}
} else {
self.Data["json"] = map[string]interface{}{"status": 0, "msg": "username or password incorrect"}
}
self.ServeJSON()
}
func (self *LoginController) doLogin(username, password string, explicit bool) bool {
clearIprecord() clearIprecord()
ip, _, _ := net.SplitHostPort(self.Ctx.Request.RemoteAddr) ip, _, _ := net.SplitHostPort(self.Ctx.Request.RemoteAddr)
if v, ok := ipRecord.Load(ip); ok { if v, ok := ipRecord.Load(ip); ok {
@ -37,13 +54,11 @@ func (self *LoginController) Verify() {
vv.hasLoginFailTimes = 0 vv.hasLoginFailTimes = 0
} }
if vv.hasLoginFailTimes >= 10 { if vv.hasLoginFailTimes >= 10 {
self.Data["json"] = map[string]interface{}{"status": 0, "msg": "username or password incorrect"} return false
self.ServeJSON()
return
} }
} }
var auth bool var auth bool
if self.GetString("password") == beego.AppConfig.String("web_password") && self.GetString("username") == beego.AppConfig.String("web_username") { if password == beego.AppConfig.String("web_password") && username == beego.AppConfig.String("web_username") {
self.SetSession("isAdmin", true) self.SetSession("isAdmin", true)
self.DelSession("clientId") self.DelSession("clientId")
self.DelSession("username") self.DelSession("username")
@ -58,13 +73,13 @@ func (self *LoginController) Verify() {
return true return true
} }
if v.WebUserName == "" && v.WebPassword == "" { if v.WebUserName == "" && v.WebPassword == "" {
if self.GetString("username") != "user" || v.VerifyKey != self.GetString("password") { if username != "user" || v.VerifyKey != password {
return true return true
} else { } else {
auth = true auth = true
} }
} }
if !auth && v.WebPassword == self.GetString("password") && self.GetString("username") == v.WebUserName { if !auth && v.WebPassword == password && v.WebUserName == username {
auth = true auth = true
} }
if auth { if auth {
@ -78,18 +93,17 @@ func (self *LoginController) Verify() {
} }
if auth { if auth {
self.SetSession("auth", true) self.SetSession("auth", true)
self.Data["json"] = map[string]interface{}{"status": 1, "msg": "login success"}
ipRecord.Delete(ip) ipRecord.Delete(ip)
} else { return true
if v, load := ipRecord.LoadOrStore(ip, &record{hasLoginFailTimes: 1, lastLoginTime: time.Now()}); load {
vv := v.(*record)
vv.lastLoginTime = time.Now()
vv.hasLoginFailTimes += 1
ipRecord.Store(ip, vv)
}
self.Data["json"] = map[string]interface{}{"status": 0, "msg": "username or password incorrect"}
} }
self.ServeJSON() if v, load := ipRecord.LoadOrStore(ip, &record{hasLoginFailTimes: 1, lastLoginTime: time.Now()}); load && explicit {
vv := v.(*record)
vv.lastLoginTime = time.Now()
vv.hasLoginFailTimes += 1
ipRecord.Store(ip, vv)
}
return false
} }
func (self *LoginController) Register() { func (self *LoginController) Register() {
if self.Ctx.Request.Method == "GET" { if self.Ctx.Request.Method == "GET" {