Skip to content

Revert "Fix issues around Database permissions (#7009)" #7267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xtinec merged 1 commit into from
Apr 10, 2019
Merged

Revert "Fix issues around Database permissions (#7009)" #7267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions superset/security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,8 @@ def can_access(self, permission_name, view_name):
return self._has_view_access(user, permission_name, view_name)

def all_datasource_access(self):
return self.can_access('all_datasource_access', 'all_datasource_access')

def all_database_access(self):
return self.can_access('all_database_access', 'all_database_access')
return self.can_access(
'all_datasource_access', 'all_datasource_access')

def database_access(self, database):
return (
Expand Down Expand Up @@ -411,12 +409,8 @@ def set_perm(self, mapper, connection, target): # noqa
.values(perm=target.get_perm()),
)

permission_name = 'datasource_access'
from superset.models.core import Database
if mapper.class_ == Database:
permission_name = 'database_access'

# add to view menu if not already exists
permission_name = 'datasource_access'
view_menu_name = target.get_perm()
permission = self.find_permission(permission_name)
view_menu = self.find_view_menu(view_menu_name)
Expand Down
9 changes: 0 additions & 9 deletions superset/views/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,6 @@ def check_slice_perms(self, slice_id):
security_manager.assert_datasource_permission(viz_obj.datasource)


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


class SliceFilter(SupersetFilter):
def apply(self, query, func): # noqa
if security_manager.all_datasource_access():
Expand Down Expand Up @@ -311,7 +303,6 @@ class DatabaseView(SupersetModelView, DeleteMixin, YamlExportMixin): # noqa
'allow_multi_schema_metadata_fetch': _('Allow Multi Schema Metadata Fetch'),
'backend': _('Backend'),
}
base_filters = [['id', DatabaseFilter, lambda: []]]

def pre_add(self, db):
self.check_extra(db)
Expand Down