From d96f2a71849ed312c3c69177f1cb7b4a174421da Mon Sep 17 00:00:00 2001
From: leonklingele <git@leonklingele.de>
Date: Wed, 21 Dec 2016 09:41:37 +0100
Subject: 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
---
 routers/api/v1/admin/user.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'routers/api/v1/admin/user.go')

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()
 	}
 
-- 
cgit v1.2.3