aboutsummaryrefslogtreecommitdiff
path: root/routers/api/v1/admin/user.go
diff options
context:
space:
mode:
authorleonklingele <git@leonklingele.de>2016-12-21 09:41:37 +0100
committer无闻 <u@gogs.io>2016-12-21 03:41:37 -0500
commitd96f2a71849ed312c3c69177f1cb7b4a174421da (patch)
tree8d68aa9631801722ecaeab3d2089bb2a922794b6 /routers/api/v1/admin/user.go
parentadcb1d7c651720d71efea238e011582b9e455c2d (diff)
Fix random string generator (#3953)
* Remove unused custom-alphabet feature of random string generator * Fix modulo-biased random string generator * Random string generator should return error if it fails to read random data via crypto/rand
Diffstat (limited to 'routers/api/v1/admin/user.go')
-rw-r--r--routers/api/v1/admin/user.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
index 6d38dee1..51e2bfe0 100644
--- a/routers/api/v1/admin/user.go
+++ b/routers/api/v1/admin/user.go
@@ -85,7 +85,11 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) {
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.Error(500, "UpdateUser", err)
+ return
+ }
u.EncodePasswd()
}