iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This reverts commit f5274a9c7f.
This commit is contained in:
Beto Dealmeida 2019-04-09 20:39:24 -07:00 committed by Christine Chambers
parent 984b04d1e5
commit e505e326b2
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
superset/security.py
View File

@ -106,10 +106,8 @@ class SupersetSecurityManager(SecurityManager):
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 (
@ -411,12 +409,8 @@ class SupersetSecurityManager(SecurityManager):
.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)

9
superset/views/core.py
View File

@ -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():
@ -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)