Commit 0053be98 by Leonard Gram

login: uses epochs for login throtting.

Closes #10937
parent 2e9433c4
...@@ -8,7 +8,7 @@ type LoginAttempt struct { ...@@ -8,7 +8,7 @@ type LoginAttempt struct {
Id int64 Id int64
Username string Username string
IpAddress string IpAddress string
Created time.Time Created int64
} }
// --------------------- // ---------------------
......
...@@ -21,7 +21,7 @@ func CreateLoginAttempt(cmd *m.CreateLoginAttemptCommand) error { ...@@ -21,7 +21,7 @@ func CreateLoginAttempt(cmd *m.CreateLoginAttemptCommand) error {
loginAttempt := m.LoginAttempt{ loginAttempt := m.LoginAttempt{
Username: cmd.Username, Username: cmd.Username,
IpAddress: cmd.IpAddress, IpAddress: cmd.IpAddress,
Created: getTimeNow(), Created: getTimeNow().Unix(),
} }
if _, err := sess.Insert(&loginAttempt); err != nil { if _, err := sess.Insert(&loginAttempt); err != nil {
...@@ -37,8 +37,8 @@ func CreateLoginAttempt(cmd *m.CreateLoginAttemptCommand) error { ...@@ -37,8 +37,8 @@ func CreateLoginAttempt(cmd *m.CreateLoginAttemptCommand) error {
func DeleteOldLoginAttempts(cmd *m.DeleteOldLoginAttemptsCommand) error { func DeleteOldLoginAttempts(cmd *m.DeleteOldLoginAttemptsCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
var maxId int64 var maxId int64
sql := "SELECT max(id) as id FROM login_attempt WHERE created < " + dialect.DateTimeFunc("?") sql := "SELECT max(id) as id FROM login_attempt WHERE created < ?"
result, err := sess.Query(sql, cmd.OlderThan) result, err := sess.Query(sql, cmd.OlderThan.Unix())
if err != nil { if err != nil {
return err return err
...@@ -66,7 +66,7 @@ func GetUserLoginAttemptCount(query *m.GetUserLoginAttemptCountQuery) error { ...@@ -66,7 +66,7 @@ func GetUserLoginAttemptCount(query *m.GetUserLoginAttemptCountQuery) error {
loginAttempt := new(m.LoginAttempt) loginAttempt := new(m.LoginAttempt)
total, err := x. total, err := x.
Where("username = ?", query.Username). Where("username = ?", query.Username).
And("created >="+dialect.DateTimeFunc("?"), query.Since). And("created >= ?", query.Since.Unix()).
Count(loginAttempt) Count(loginAttempt)
if err != nil { if err != nil {
......
...@@ -34,6 +34,7 @@ func addTableReplaceMigrations(mg *Migrator, from Table, to Table, migrationVers ...@@ -34,6 +34,7 @@ func addTableReplaceMigrations(mg *Migrator, from Table, to Table, migrationVers
copyTableData := fmt.Sprintf("copy %v %v to %v", to.Name, fromV, toV) copyTableData := fmt.Sprintf("copy %v %v to %v", to.Name, fromV, toV)
dropTable := fmt.Sprintf("drop %v", tmpTableName) dropTable := fmt.Sprintf("drop %v", tmpTableName)
addDropAllIndicesMigrations(mg, fromV, from)
addTableRenameMigration(mg, from.Name, tmpTableName, fromV) addTableRenameMigration(mg, from.Name, tmpTableName, fromV)
mg.AddMigration(createTable, NewAddTableMigration(to)) mg.AddMigration(createTable, NewAddTableMigration(to))
addTableIndicesMigrations(mg, toV, to) addTableIndicesMigrations(mg, toV, to)
......
...@@ -187,10 +187,7 @@ func addDashboardMigration(mg *Migrator) { ...@@ -187,10 +187,7 @@ func addDashboardMigration(mg *Migrator) {
{Name: "external_id", Type: DB_Text, Nullable: false}, {Name: "external_id", Type: DB_Text, Nullable: false},
{Name: "updated", Type: DB_DateTime, Nullable: false}, {Name: "updated", Type: DB_DateTime, Nullable: false},
}, },
Indices: []*Index{ Indices: []*Index{},
{Cols: []string{"dashboard_id"}},
{Cols: []string{"dashboard_id", "name"}, Type: IndexType},
},
} }
mg.AddMigration("create dashboard_provisioning", NewAddTableMigration(dashboardExtrasTable)) mg.AddMigration("create dashboard_provisioning", NewAddTableMigration(dashboardExtrasTable))
......
...@@ -20,4 +20,24 @@ func addLoginAttemptMigrations(mg *Migrator) { ...@@ -20,4 +20,24 @@ func addLoginAttemptMigrations(mg *Migrator) {
mg.AddMigration("create login attempt table", NewAddTableMigration(loginAttemptV1)) mg.AddMigration("create login attempt table", NewAddTableMigration(loginAttemptV1))
// add indices // add indices
mg.AddMigration("add index login_attempt.username", NewAddIndexMigration(loginAttemptV1, loginAttemptV1.Indices[0])) mg.AddMigration("add index login_attempt.username", NewAddIndexMigration(loginAttemptV1, loginAttemptV1.Indices[0]))
loginAttemptV2 := Table{
Name: "login_attempt",
Columns: []*Column{
{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
{Name: "username", Type: DB_NVarchar, Length: 190, Nullable: false},
{Name: "ip_address", Type: DB_NVarchar, Length: 30, Nullable: false},
{Name: "created", Type: DB_Int, Default: "0", Nullable: false},
},
Indices: []*Index{
{Cols: []string{"username"}},
},
}
addTableReplaceMigrations(mg, loginAttemptV1, loginAttemptV2, 2, map[string]string{
"id": "id",
"username": "username",
"ip_address": "ip_address",
"created": "created",
})
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment