diff options
| author | Lauris BH <lauris@nix.lv> | 2018-05-02 18:02:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 18:02:02 +0300 |
| commit | 1e1ece8f3dce8ed9958f3bd5823c135d1c19eb49 (patch) | |
| tree | ea20ecae0125334774662796a667570b71bbdd99 /models | |
| parent | c58e1e437bafe2023b34c16d03f22764ece94d38 (diff) | |
| download | gitea-1e1ece8f3dce8ed9958f3bd5823c135d1c19eb49.tar.gz gitea-1e1ece8f3dce8ed9958f3bd5823c135d1c19eb49.zip | |
Do not allow to reuse TOTP passcode (#3878)
Diffstat (limited to 'models')
| -rw-r--r-- | models/migrations/migrations.go | 2 | ||||
| -rw-r--r-- | models/migrations/v62.go | 22 | ||||
| -rw-r--r-- | models/twofactor.go | 13 |
3 files changed, 31 insertions, 6 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 16037e1472..522086a520 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -176,6 +176,8 @@ var migrations = []Migration{ NewMigration("add is_fsck_enabled column for repos", addFsckEnabledToRepo), // v61 -> v62 NewMigration("add size column for attachments", addSizeToAttachment), + // v62 -> v63 + NewMigration("add last used passcode column for TOTP", addLastUsedPasscodeTOTP), } // Migrate database to current version diff --git a/models/migrations/v62.go b/models/migrations/v62.go new file mode 100644 index 0000000000..0c2966854b --- /dev/null +++ b/models/migrations/v62.go @@ -0,0 +1,22 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "fmt" + + "github.com/go-xorm/xorm" +) + +func addLastUsedPasscodeTOTP(x *xorm.Engine) error { + type TwoFactor struct { + LastUsedPasscode string `xorm:"VARCHAR(10)"` + } + + if err := x.Sync2(new(TwoFactor)); err != nil { + return fmt.Errorf("Sync2: %v", err) + } + return nil +} diff --git a/models/twofactor.go b/models/twofactor.go index 789315021e..5f3c6efc21 100644 --- a/models/twofactor.go +++ b/models/twofactor.go @@ -23,12 +23,13 @@ import ( // TwoFactor represents a two-factor authentication token. type TwoFactor struct { - ID int64 `xorm:"pk autoincr"` - UID int64 `xorm:"UNIQUE"` - Secret string - ScratchToken string - CreatedUnix util.TimeStamp `xorm:"INDEX created"` - UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` + ID int64 `xorm:"pk autoincr"` + UID int64 `xorm:"UNIQUE"` + Secret string + ScratchToken string + LastUsedPasscode string `xorm:"VARCHAR(10)"` + CreatedUnix util.TimeStamp `xorm:"INDEX created"` + UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` } // GenerateScratchToken recreates the scratch token the user is using. |