pkg/util: Check errors (#19832)

* pkg/util: Check errors
* pkg/services: DRY up code

pkg/middleware/middleware.go

@@ -128,7 +128,12 @@ func initContextWithApiKey(ctx *models.ReqContext) bool {
 	apikey := keyQuery.Result
 
 	// validate api key
-	if !apikeygen.IsValid(decoded, apikey.Key) {
+	isValid, err := apikeygen.IsValid(decoded, apikey.Key)
+	if err != nil {
+		ctx.JsonApiErr(500, "Validating API key failed", err)
+		return true
+	}
+	if !isValid {
 		ctx.JsonApiErr(401, errStringInvalidAPIKey, err)
 		return true
 	}

pkg/middleware/middleware_basic_auth_test.go

@@ -27,7 +27,8 @@ func TestMiddlewareBasicAuth(t *testing.T) {
 
 		middlewareScenario(t, "Valid API key", func(sc *scenarioContext) {
 			var orgID int64 = 2
-			keyhash := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd")
+			keyhash, err := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd")
+			So(err, ShouldBeNil)
 
 			bus.AddHandler("test", func(query *models.GetApiKeyByNameQuery) error {
 				query.Result = &models.ApiKey{OrgId: orgID, Role: models.ROLE_EDITOR, Key: keyhash}
@@ -54,8 +55,12 @@ func TestMiddlewareBasicAuth(t *testing.T) {
 			var orgID int64 = 2
 
 			bus.AddHandler("grafana-auth", func(query *models.LoginUserQuery) error {
+				encoded, err := util.EncodePassword(password, salt)
+				if err != nil {
+					return err
+				}
 				query.User = &models.User{
-					Password: util.EncodePassword(password, salt),
+					Password: encoded,
 					Salt:     salt,
 				}
 				return nil
@@ -85,8 +90,12 @@ func TestMiddlewareBasicAuth(t *testing.T) {
 			authLogin.Init()
 
 			bus.AddHandler("user-query", func(query *models.GetUserByLoginQuery) error {
+				encoded, err := util.EncodePassword(password, salt)
+				if err != nil {
+					return err
+				}
 				query.Result = &models.User{
-					Password: util.EncodePassword(password, salt),
+					Password: encoded,
 					Id:       id,
 					Salt:     salt,
 				}

pkg/middleware/middleware_test.go

@@ -142,7 +142,8 @@ func TestMiddlewareContext(t *testing.T) {
 		})
 
 		middlewareScenario(t, "Valid api key", func(sc *scenarioContext) {
-			keyhash := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd")
+			keyhash, err := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd")
+			So(err, ShouldBeNil)
 
 			bus.AddHandler("test", func(query *models.GetApiKeyByNameQuery) error {
 				query.Result = &models.ApiKey{OrgId: 12, Role: models.ROLE_EDITOR, Key: keyhash}
@@ -182,10 +183,10 @@ func TestMiddlewareContext(t *testing.T) {
 			mockGetTime()
 			defer resetGetTime()
 
-			keyhash := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd")
+			keyhash, err := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd")
+			So(err, ShouldBeNil)
 
 			bus.AddHandler("test", func(query *models.GetApiKeyByNameQuery) error {
-
 				// api key expired one second before
 				expires := getTime().Add(-1 * time.Second).Unix()
 				query.Result = &models.ApiKey{OrgId: 12, Role: models.ROLE_EDITOR, Key: keyhash,

pkg/middleware/render_auth.go

@@ -33,10 +33,14 @@ func initContextWithRenderAuth(ctx *m.ReqContext) bool {
 	return true
 }
 
-func AddRenderAuthKey(orgId int64, userId int64, orgRole m.RoleType) string {
+func AddRenderAuthKey(orgId int64, userId int64, orgRole m.RoleType) (string, error) {
 	renderKeysLock.Lock()
+	defer renderKeysLock.Unlock()
 
-	key := util.GetRandomString(32)
+	key, err := util.GetRandomString(32)
+	if err != nil {
+		return "", err
+	}
 
 	renderKeys[key] = &m.SignedInUser{
 		OrgId:   orgId,
@@ -44,13 +48,12 @@ func AddRenderAuthKey(orgId int64, userId int64, orgRole m.RoleType) string {
 		UserId:  userId,
 	}
 
-	renderKeysLock.Unlock()
-
-	return key
+	return key, nil
 }
 
 func RemoveRenderAuthKey(key string) {
 	renderKeysLock.Lock()
+	defer renderKeysLock.Unlock()
+
 	delete(renderKeys, key)
-	renderKeysLock.Unlock()
 }