a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add DisableLoginLog config setting. 

The tests / tickloop portions (to purge existing login logs when the setting is enabled) are coming with the tickloop rewrite.
This commit is contained in:
Azareal 2021-04-27 19:44:00 +10:00
parent 0c0f265daf
commit 67a968caf2
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/site.go
View File

@ -103,6 +103,7 @@ type config struct {
DisablePostIP bool
DisablePollIP bool
DisableRegLog bool
DisableLoginLog bool
//DisableSelfDeleteLog bool
DisableLiveTopicList bool

39
routes/account.go
View File

@ -37,29 +37,31 @@ func AccountLoginSubmit(w http.ResponseWriter, r *http.Request, u *c.User) c.Rou
}
name := c.SanitiseSingleLine(r.PostFormValue("username"))
uid, err, requiresExtraAuth := c.Auth.Authenticate(name, r.PostFormValue("password"))
if err != nil {
uid, e, requiresExtraAuth := c.Auth.Authenticate(name, r.PostFormValue("password"))
if e != nil {
// TODO: uid is currently set to 0 as authenticate fetches the user by username and password. Get the actual uid, so we can alert the user of attempted logins? What if someone takes advantage of the response times to deduce if an account exists?
logItem := &c.LoginLogItem{UID: uid, Success: false, IP: u.GetIP()}
_, ierr := logItem.Create()
if ierr != nil {
return c.InternalError(ierr, w, r)
if !c.Config.DisableLoginLog {
li := &c.LoginLogItem{UID: uid, Success: false, IP: u.GetIP()}
if _, ie := li.Create(); ie != nil {
return c.InternalError(ie, w, r)
}
return c.LocalError(err.Error(), w, r, u)
}
return c.LocalError(e.Error(), w, r, u)
}
// TODO: Take 2FA into account
logItem := &c.LoginLogItem{UID: uid, Success: true, IP: u.GetIP()}
_, err = logItem.Create()
if err != nil {
return c.InternalError(err, w, r)
if !c.Config.DisableLoginLog {
li := &c.LoginLogItem{UID: uid, Success: true, IP: u.GetIP()}
if _, e = li.Create(); e != nil {
return c.InternalError(e, w, r)
}
}
// TODO: Do we want to slacken this by only doing it when the IP changes?
if requiresExtraAuth {
provSession, signedSession, err := c.Auth.CreateProvisionalSession(uid)
if err != nil {
return c.InternalError(err, w, r)
provSession, signedSession, e := c.Auth.CreateProvisionalSession(uid)
if e != nil {
return c.InternalError(e, w, r)
}
// TODO: Use the login log ID in the provisional cookie?
c.Auth.SetProvisionalCookies(w, uid, provSession, signedSession)
@ -283,9 +285,8 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user *c.User)
regLog := c.RegLogItem{Username: name, Email: email, FailureReason: regErrReason, Success: regSuccess, IP: user.GetIP()}
if !c.Config.DisableRegLog && regSuccess {
_, err := regLog.Create()
if err != nil {
return c.InternalError(err, w, r)
if _, e := regLog.Create(); e != nil {
return c.InternalError(e, w, r)
}
}
if !regSuccess {
@ -305,8 +306,8 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user *c.User)
pushLog := func(reason string) error {
if !c.Config.DisableRegLog {
regLog.FailureReason += reason + "|"
_, err := regLog.Create()
return err
_, e := regLog.Create()
return e
}
return nil
}