From 96c268c0fcc22604103f67821d66fef39944e80b Mon Sep 17 00:00:00 2001 From: Codruț Constantin Gușoi Date: Sun, 18 Feb 2018 18:14:37 +0000 Subject: Implements generator cli for secrets (#3531) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Codruț Constantin Gușoi --- models/migrations/migrations.go | 6 +++--- models/twofactor.go | 4 ++-- models/user.go | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'models') diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 23235f7819..d79d403712 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -20,7 +20,7 @@ import ( gouuid "github.com/satori/go.uuid" "gopkg.in/ini.v1" - "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" ) @@ -539,10 +539,10 @@ func generateOrgRandsAndSalt(x *xorm.Engine) (err error) { } for _, org := range orgs { - if org.Rands, err = base.GetRandomString(10); err != nil { + if org.Rands, err = generate.GetRandomString(10); err != nil { return err } - if org.Salt, err = base.GetRandomString(10); err != nil { + if org.Salt, err = generate.GetRandomString(10); err != nil { return err } if _, err = sess.Id(org.ID).Update(org); err != nil { diff --git a/models/twofactor.go b/models/twofactor.go index 526ab917e8..789315021e 100644 --- a/models/twofactor.go +++ b/models/twofactor.go @@ -16,7 +16,7 @@ import ( "github.com/pquerna/otp/totp" - "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" ) @@ -33,7 +33,7 @@ type TwoFactor struct { // GenerateScratchToken recreates the scratch token the user is using. func (t *TwoFactor) GenerateScratchToken() error { - token, err := base.GetRandomString(8) + token, err := generate.GetRandomString(8) if err != nil { return err } diff --git a/models/user.go b/models/user.go index 57abfc1965..fa41deec92 100644 --- a/models/user.go +++ b/models/user.go @@ -34,6 +34,7 @@ import ( "code.gitea.io/gitea/modules/avatar" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -638,7 +639,7 @@ func IsUserExist(uid int64, name string) (bool, error) { // GetUserSalt returns a random user salt token. func GetUserSalt() (string, error) { - return base.GetRandomString(10) + return generate.GetRandomString(10) } // NewGhostUser creates and returns a fake user for someone has deleted his/her account. -- cgit v1.2.3