From 380e32e129d7a8868b9853e92e208a97e3ac125f Mon Sep 17 00:00:00 2001 From: Denis Denisov Date: Tue, 20 Dec 2016 14:32:02 +0200 Subject: 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 --- models/migrations/migrations.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'models/migrations') 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 } -- cgit v1.2.3