Skip to content

Commit

Permalink
Add Filter on DatabaseView that filters DBs Based on Role Access
Browse files Browse the repository at this point in the history
  • Loading branch information
dflionis committed May 29, 2019
1 parent fc3b043 commit 461a8b2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
12 changes: 6 additions & 6 deletions superset/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ def all_datasource_access(self):
return self.can_access(
'all_datasource_access', 'all_datasource_access')

def database_access(self, database):
return (
self.can_access(
'all_database_access', 'all_database_access') or
self.can_access('database_access', database.perm)
)
def all_database_access(self, user=None):
return self.can_access(
'all_database_access', 'all_database_access', user=user)

def database_access(self, database, user=None):
return self.can_access('database_access', database.perm, user=user)

def schema_access(self, datasource):
return (
Expand Down
8 changes: 8 additions & 0 deletions superset/views/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ def apply(self, query, func): # noqa
return query.filter(self.model.perm.in_(perms))


class DatabaseFilter(SupersetFilter):
def apply(self, query, func): # noqa
if security_manager.all_database_access():
return query
perms = self.get_view_menus('database_access')
return query.filter(self.model.perm.in_(perms))

class DashboardFilter(SupersetFilter):

"""List dashboards for which users have access to at least one slice or are owners"""
Expand Down Expand Up @@ -287,6 +294,7 @@ class DatabaseView(SupersetModelView, DeleteMixin, YamlExportMixin): # noqa
'allow_csv_upload': _(
'If selected, please set the schemas allowed for csv upload in Extra.'),
}
base_filters = [['id', DatabaseFilter, lambda: []]]
label_columns = {
'expose_in_sqllab': _('Expose in SQL Lab'),
'allow_ctas': _('Allow CREATE TABLE AS'),
Expand Down

0 comments on commit 461a8b2

Please sign in to comment.