Skip to content

Switch plaintext scratch tokens to use hash instead #4331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jul 27, 2018
Merged

Switch plaintext scratch tokens to use hash instead #4331

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2fca6d9
switch plaintext tokens to use hash instead
techknowlogick Jun 28, 2018
050c96f
remove attrib that wasn't needed
techknowlogick Jun 28, 2018
412e27b
correct function call
techknowlogick Jun 28, 2018
fd4445f
show scratch token once to user
techknowlogick Jun 28, 2018
e46e0bc
fix error
techknowlogick Jun 28, 2018
d9d8e0c
correct redirect URL
techknowlogick Jun 28, 2018
fa2b6e5
add copyright
techknowlogick Jun 28, 2018
5cb253a
Merge branch 'master' into tklk/issue-3389
techknowlogick Jul 5, 2018
7caff96
fix copy paste issue
techknowlogick Jul 5, 2018
25ca551
Don't ignore error
techknowlogick Jul 5, 2018
c703bd5
don't ignore error
techknowlogick Jul 5, 2018
b66fb81
Merge branch 'master' into tklk/issue-3389
techknowlogick Jul 7, 2018
e2e1636
Merge branch 'master' into tklk/issue-3389
techknowlogick Jul 10, 2018
66528b9
Merge branch 'master' into tklk/issue-3389
techknowlogick Jul 12, 2018
5cbf3b8
commit changes before dropping columns
techknowlogick Jul 13, 2018
d499fc8
make fmt
techknowlogick Jul 13, 2018
6165857
remove gensalt func
techknowlogick Jul 13, 2018
dc55b92
remove gen salt function
techknowlogick Jul 13, 2018
8ff84a4
Merge branch 'master' into tklk/issue-3389
techknowlogick Jul 13, 2018
a95cf37
Merge branch 'master' into tklk/issue-3389
techknowlogick Jul 17, 2018
e07acd1
Rename v70.go to v71.go
techknowlogick Jul 27, 2018
c001b14
Merge branch 'master' into tklk/issue-3389
techknowlogick Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
show scratch token once to user
  • Loading branch information
@techknowlogick
techknowlogick authored Jun 28, 2018
commit fd4445fa98dcee49892d50a1aa1e57e93c2f61c5
4 changes: 2 additions & 2 deletions routers/user/setting/security_twofa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func EnrollTwoFactorPost(ctx *context.Context, form auth.TwoFactorAuthForm) {
ctx.ServerError("SettingsTwoFactor", err)
return
}
_, err = t.GenerateScratchToken()
token, err := t.GenerateScratchToken()
if err != nil {
ctx.ServerError("SettingsTwoFactor", err)
return
Expand All @@ -183,6 +183,6 @@ func EnrollTwoFactorPost(ctx *context.Context, form auth.TwoFactorAuthForm) {

ctx.Session.Delete("twofaSecret")
ctx.Session.Delete("twofaUri")
ctx.Flash.Success(ctx.Tr("settings.twofa_enrolled", t.ScratchToken))
ctx.Flash.Success(ctx.Tr("settings.twofa_enrolled", token))
ctx.Redirect(setting.AppSubURL + "/user/settings/security")
}