RBAC: search v1 permission filter part 1 - cleanup & updating tests (#71913)

* update tests and remove some AC disabled checks

* remove test for old permission filter builder

pkg/services/sqlstore/permissions/dashboard.go

@@ -10,8 +10,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
 	"github.com/grafana/grafana/pkg/services/user"
 )
@@ -19,73 +17,6 @@ import (
 // maximum possible capacity for recursive queries array: one query for folder and one for dashboard actions
 const maximumRecursiveQueries = 2
 
-type DashboardPermissionFilter struct {
-	OrgRole         org.RoleType
-	Dialect         migrator.Dialect
-	UserId          int64
-	OrgId           int64
-	PermissionLevel dashboards.PermissionType
-}
-
-func (d DashboardPermissionFilter) Where() (string, []interface{}) {
-	if d.OrgRole == org.RoleAdmin {
-		return "", nil
-	}
-
-	okRoles := []interface{}{d.OrgRole}
-	if d.OrgRole == org.RoleEditor {
-		okRoles = append(okRoles, org.RoleViewer)
-	}
-
-	falseStr := d.Dialect.BooleanStr(false)
-
-	sql := `(
-		dashboard.id IN (
-			SELECT distinct DashboardId from (
-				SELECT d.id AS DashboardId
-					FROM dashboard AS d
-					LEFT JOIN dashboard_acl AS da ON
-						da.dashboard_id = d.id OR
-						da.dashboard_id = d.folder_id
-					WHERE
-						d.org_id = ? AND
-						da.permission >= ? AND
-						(
-							da.user_id = ? OR
-							da.team_id IN (SELECT team_id from team_member AS tm WHERE tm.user_id = ?) OR
-							da.role IN (?` + strings.Repeat(",?", len(okRoles)-1) + `)
-						)
-				UNION
-				SELECT d.id AS DashboardId
-					FROM dashboard AS d
-					LEFT JOIN dashboard AS folder on folder.id = d.folder_id
-					LEFT JOIN dashboard_acl AS da ON
-						(
-							-- include default permissions -->
-							da.org_id = -1 AND (
-							  (folder.id IS NOT NULL AND folder.has_acl = ` + falseStr + `) OR
-							  (folder.id IS NULL AND d.has_acl = ` + falseStr + `)
-							)
-						)
-					WHERE
-						d.org_id = ? AND
-						da.permission >= ? AND
-						(
-							da.user_id = ? OR
-							da.role IN (?` + strings.Repeat(",?", len(okRoles)-1) + `)
-						)
-			) AS a
-		)
-	)
-	`
-
-	params := []interface{}{d.OrgId, d.PermissionLevel, d.UserId, d.UserId}
-	params = append(params, okRoles...)
-	params = append(params, d.OrgId, d.PermissionLevel, d.UserId)
-	params = append(params, okRoles...)
-	return sql, params
-}
-
 type clause struct {
 	string
 	params []interface{}

pkg/services/sqlstore/searchstore/search_test.go

@@ -113,43 +113,6 @@ func TestBuilder_Pagination(t *testing.T) {
 	assert.Equal(t, "P", resPg2[0].Title, "page 2 should start with the 16th dashboard")
 }
 
-func TestBuilder_Permissions(t *testing.T) {
-	user := &user.SignedInUser{
-		UserID:  1,
-		OrgID:   1,
-		OrgRole: org.RoleViewer,
-	}
-
-	store := setupTestEnvironment(t)
-	createDashboards(t, store, 0, 1, user.OrgID)
-
-	level := dashboards.PERMISSION_EDIT
-
-	builder := &searchstore.Builder{
-		Filters: []interface{}{
-			searchstore.OrgFilter{OrgId: user.OrgID},
-			searchstore.TitleSorter{},
-			permissions.DashboardPermissionFilter{
-				Dialect:         store.GetDialect(),
-				OrgRole:         user.OrgRole,
-				OrgId:           user.OrgID,
-				UserId:          user.UserID,
-				PermissionLevel: level,
-			},
-		},
-		Dialect: store.GetDialect(),
-	}
-
-	res := []dashboards.DashboardSearchProjection{}
-	err := store.WithDbSession(context.Background(), func(sess *db.Session) error {
-		sql, params := builder.ToSQL(limit, page)
-		return sess.SQL(sql, params...).Find(&res)
-	})
-	require.NoError(t, err)
-
-	assert.Len(t, res, 0)
-}
-
 func TestBuilder_RBAC(t *testing.T) {
 	testsCases := []struct {
 		desc            string