From a615b78f8a17b193e802628f58a6ff92f6fc63b1 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Thu, 14 Mar 2019 12:18:07 +0100
Subject: [PATCH] permissions: removes global access to bus from MakeUserAdmin.

---
 pkg/api/dashboard.go                   | 2 +-
 pkg/api/folder.go                      | 2 +-
 pkg/api/team.go                        | 4 ++--
 pkg/services/dashboards/acl_service.go | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index e7fcf5d4355..c47e8f31ccc 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -279,7 +279,7 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
 
 	if hs.Cfg.EditorsCanAdmin && newDashboard {
 		inFolder := cmd.FolderId > 0
-		err := dashboards.MakeUserAdmin(cmd.OrgId, cmd.UserId, dashboard.Id, !inFolder)
+		err := dashboards.MakeUserAdmin(hs.Bus, cmd.OrgId, cmd.UserId, dashboard.Id, !inFolder)
 		if err != nil {
 			hs.log.Error("Could not make user admin", "dashboard", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
 			return Error(500, "Failed to make user admin of dashboard", err)
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 4b64fc1139f..0a9a2671071 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -62,7 +62,7 @@ func (hs *HTTPServer) CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) R
 	}
 
 	if hs.Cfg.EditorsCanAdmin {
-		if err := dashboards.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id, true); err != nil {
+		if err := dashboards.MakeUserAdmin(hs.Bus, c.OrgId, c.SignedInUser.UserId, cmd.Result.Id, true); err != nil {
 			hs.log.Error("Could not make user admin", "folder", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
 			return Error(500, "Failed to make user admin of folder", err)
 		}
diff --git a/pkg/api/team.go b/pkg/api/team.go
index cb0ff2f25a0..ecfd8028c1b 100644
--- a/pkg/api/team.go
+++ b/pkg/api/team.go
@@ -16,7 +16,7 @@ func (hs *HTTPServer) CreateTeam(c *m.ReqContext, cmd m.CreateTeamCommand) Respo
 		return Error(403, "Not allowed to create team.", nil)
 	}
 
-	if err := bus.Dispatch(&cmd); err != nil {
+	if err := hs.Bus.Dispatch(&cmd); err != nil {
 		if err == m.ErrTeamNameTaken {
 			return Error(409, "Team name taken", err)
 		}
@@ -31,7 +31,7 @@ func (hs *HTTPServer) CreateTeam(c *m.ReqContext, cmd m.CreateTeamCommand) Respo
 			Permission: m.PERMISSION_ADMIN,
 		}
 
-		if err := bus.Dispatch(&addMemberCmd); err != nil {
+		if err := hs.Bus.Dispatch(&addMemberCmd); err != nil {
 			c.Logger.Error("Could not add creator to team.", "error", err)
 		}
 	}
diff --git a/pkg/services/dashboards/acl_service.go b/pkg/services/dashboards/acl_service.go
index 6158b190d68..864fbb80a6b 100644
--- a/pkg/services/dashboards/acl_service.go
+++ b/pkg/services/dashboards/acl_service.go
@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-func MakeUserAdmin(orgId int64, userId int64, dashboardId int64, setViewAndEditPermissions bool) error {
+func MakeUserAdmin(bus bus.Bus, orgId int64, userId int64, dashboardId int64, setViewAndEditPermissions bool) error {
 	rtEditor := models.ROLE_EDITOR
 	rtViewer := models.ROLE_VIEWER