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 /routers/admin/users.go | |
| 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 'routers/admin/users.go')
| -rw-r--r-- | routers/admin/users.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/routers/admin/users.go b/routers/admin/users.go index c95aba7729..fa61a46938 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -197,7 +197,11 @@ func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) { if len(form.Password) > 0 { u.Passwd = form.Password - u.Salt = models.GetUserSalt() + var err error + if u.Salt, err = models.GetUserSalt(); err != nil { + ctx.Handle(500, "UpdateUser", err) + return + } u.EncodePasswd() } |