Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
0053be98
Commit
0053be98
authored
Feb 16, 2018
by
Leonard Gram
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
login: uses epochs for login throtting.
Closes #10937
parent
2e9433c4
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
9 deletions
+27
-9
pkg/models/login_attempt.go
+1
-1
pkg/services/sqlstore/login_attempt.go
+4
-4
pkg/services/sqlstore/migrations/common.go
+1
-0
pkg/services/sqlstore/migrations/dashboard_mig.go
+1
-4
pkg/services/sqlstore/migrations/login_attempt_mig.go
+20
-0
No files found.
pkg/models/login_attempt.go
View file @
0053be98
...
...
@@ -8,7 +8,7 @@ type LoginAttempt struct {
Id
int64
Username
string
IpAddress
string
Created
time
.
Time
Created
int64
}
// ---------------------
...
...
pkg/services/sqlstore/login_attempt.go
View file @
0053be98
...
...
@@ -21,7 +21,7 @@ func CreateLoginAttempt(cmd *m.CreateLoginAttemptCommand) error {
loginAttempt
:=
m
.
LoginAttempt
{
Username
:
cmd
.
Username
,
IpAddress
:
cmd
.
IpAddress
,
Created
:
getTimeNow
(),
Created
:
getTimeNow
()
.
Unix
()
,
}
if
_
,
err
:=
sess
.
Insert
(
&
loginAttempt
);
err
!=
nil
{
...
...
@@ -37,8 +37,8 @@ func CreateLoginAttempt(cmd *m.CreateLoginAttemptCommand) error {
func
DeleteOldLoginAttempts
(
cmd
*
m
.
DeleteOldLoginAttemptsCommand
)
error
{
return
inTransaction
(
func
(
sess
*
DBSession
)
error
{
var
maxId
int64
sql
:=
"SELECT max(id) as id FROM login_attempt WHERE created <
"
+
dialect
.
DateTimeFunc
(
"?"
)
result
,
err
:=
sess
.
Query
(
sql
,
cmd
.
OlderThan
)
sql
:=
"SELECT max(id) as id FROM login_attempt WHERE created <
?"
result
,
err
:=
sess
.
Query
(
sql
,
cmd
.
OlderThan
.
Unix
()
)
if
err
!=
nil
{
return
err
...
...
@@ -66,7 +66,7 @@ func GetUserLoginAttemptCount(query *m.GetUserLoginAttemptCountQuery) error {
loginAttempt
:=
new
(
m
.
LoginAttempt
)
total
,
err
:=
x
.
Where
(
"username = ?"
,
query
.
Username
)
.
And
(
"created >=
"
+
dialect
.
DateTimeFunc
(
"?"
),
query
.
Since
)
.
And
(
"created >=
?"
,
query
.
Since
.
Unix
()
)
.
Count
(
loginAttempt
)
if
err
!=
nil
{
...
...
pkg/services/sqlstore/migrations/common.go
View file @
0053be98
...
...
@@ -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
)
dropTable
:=
fmt
.
Sprintf
(
"drop %v"
,
tmpTableName
)
addDropAllIndicesMigrations
(
mg
,
fromV
,
from
)
addTableRenameMigration
(
mg
,
from
.
Name
,
tmpTableName
,
fromV
)
mg
.
AddMigration
(
createTable
,
NewAddTableMigration
(
to
))
addTableIndicesMigrations
(
mg
,
toV
,
to
)
...
...
pkg/services/sqlstore/migrations/dashboard_mig.go
View file @
0053be98
...
...
@@ -187,10 +187,7 @@ func addDashboardMigration(mg *Migrator) {
{
Name
:
"external_id"
,
Type
:
DB_Text
,
Nullable
:
false
},
{
Name
:
"updated"
,
Type
:
DB_DateTime
,
Nullable
:
false
},
},
Indices
:
[]
*
Index
{
{
Cols
:
[]
string
{
"dashboard_id"
}},
{
Cols
:
[]
string
{
"dashboard_id"
,
"name"
},
Type
:
IndexType
},
},
Indices
:
[]
*
Index
{},
}
mg
.
AddMigration
(
"create dashboard_provisioning"
,
NewAddTableMigration
(
dashboardExtrasTable
))
...
...
pkg/services/sqlstore/migrations/login_attempt_mig.go
View file @
0053be98
...
...
@@ -20,4 +20,24 @@ func addLoginAttemptMigrations(mg *Migrator) {
mg
.
AddMigration
(
"create login attempt table"
,
NewAddTableMigration
(
loginAttemptV1
))
// add indices
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"
,
})
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment