diff options
| author | Denis Denisov <denji@users.noreply.github.com> | 2016-12-20 14:32:02 +0200 |
|---|---|---|
| committer | Thomas Boerger <thomas@webhippie.de> | 2016-12-20 13:32:02 +0100 |
| commit | 380e32e129d7a8868b9853e92e208a97e3ac125f (patch) | |
| tree | 3b7ffc74a7f28f9c165ee4a780e52053d9f749fd /models/migrations | |
| parent | 952587dbae987e05fb36f0ff56bf5eff92ae1080 (diff) | |
| download | gitea-380e32e129d7a8868b9853e92e208a97e3ac125f.tar.gz gitea-380e32e129d7a8868b9853e92e208a97e3ac125f.zip | |
Fix random string generator (#384)
* Remove unused custom-alphabet feature of random string generator
Fix random string generator
Random string generator should return error if it fails to read random data via crypto/rand
* Fixes variable (un)initialization mixed assign
Update test GetRandomString
Diffstat (limited to 'models/migrations')
| -rw-r--r-- | models/migrations/migrations.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 9c37da4a3a..2d5aba7546 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -457,8 +457,12 @@ func generateOrgRandsAndSalt(x *xorm.Engine) (err error) { } for _, org := range orgs { - org.Rands = base.GetRandomString(10) - org.Salt = base.GetRandomString(10) + if org.Rands, err = base.GetRandomString(10); err != nil { + return err + } + if org.Salt, err = base.GetRandomString(10); err != nil { + return err + } if _, err = sess.Id(org.ID).Update(org); err != nil { return err } |