pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Using self.get_session in security manager (#10146) 

Co-authored-by: John Bodley <john.bodley@airbnb.com>
This commit is contained in:
John Bodley 2020-07-04 13:04:06 -07:00 committed by GitHub
parent b181e48f5c
commit 33584a8095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
superset/security/manager.py
View File

@ -401,15 +401,15 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
if not conf.get("PUBLIC_ROLE_LIKE_GAMMA", False):
return None
from superset import db
return db.session.query(self.role_model).filter_by(name="Public").first()
return (
self.get_session.query(self.role_model)
.filter_by(name="Public")
.one_or_none()
)
def user_view_menu_names(self, permission_name: str) -> Set[str]:
from superset import db
base_query = (
db.session.query(self.viewmenu_model.name)
self.get_session.query(self.viewmenu_model.name)
.join(self.permissionview_model)
.join(self.permission_model)
.join(assoc_permissionview_role)
@ -450,7 +450,6 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
:returns: The list of accessible SQL schemas
"""
from superset import db
from superset.connectors.sqla.models import SqlaTable
if hierarchical and self.can_access_database(database):
@ -467,7 +466,7 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
perms = self.user_view_menu_names("datasource_access")
if perms:
tables = (
db.session.query(SqlaTable.schema)
self.get_session.query(SqlaTable.schema)
.filter(SqlaTable.database_id == database.id)
.filter(SqlaTable.schema.isnot(None))
.filter(SqlaTable.schema != "")
@ -493,8 +492,6 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
:returns: The list of accessible SQL tables w/ schema
"""
from superset import db
if self.can_access_database(database):
return datasource_names
@ -506,7 +503,7 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
user_perms = self.user_view_menu_names("datasource_access")
schema_perms = self.user_view_menu_names("schema_access")
user_datasources = ConnectorRegistry.query_datasources_by_permissions(
db.session, database, user_perms, schema_perms
self.get_session, database, user_perms, schema_perms
)
if schema:
names = {d.table_name for d in user_datasources if d.schema == schema}
@ -552,7 +549,6 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
Creates missing FAB permissions for datasources, schemas and metrics.
"""
from superset import db
from superset.connectors.base.models import BaseMetric
from superset.models import core as models
@ -568,20 +564,20 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
self.add_permission_view_menu(view_menu, perm)
logger.info("Creating missing datasource permissions.")
datasources = ConnectorRegistry.get_all_datasources(db.session)
datasources = ConnectorRegistry.get_all_datasources(self.get_session)
for datasource in datasources:
merge_pv("datasource_access", datasource.get_perm())
merge_pv("schema_access", datasource.get_schema_perm())
logger.info("Creating missing database permissions.")
databases = db.session.query(models.Database).all()
databases = self.get_session.query(models.Database).all()
for database in databases:
merge_pv("database_access", database.perm)
logger.info("Creating missing metrics permissions")
metrics: List[BaseMetric] = []
for datasource_class in ConnectorRegistry.sources.values():
metrics += list(db.session.query(datasource_class.metric_class).all())
metrics += list(self.get_session.query(datasource_class.metric_class).all())
def clean_perms(self) -> None:
"""
@ -786,7 +782,7 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
"""
Set the datasource permissions.
:param mapper: The table mappper
:param mapper: The table mapper
:param connection: The DB-API connection
:param target: The mapped instance being persisted
"""
@ -943,7 +939,6 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
:returns: A list of filters
"""
if hasattr(g, "user") and hasattr(g.user, "id"):
from superset import db
from superset.connectors.sqla.models import (
RLSFilterRoles,
RLSFilterTables,
@ -951,22 +946,22 @@ class SupersetSecurityManager( # pylint: disable=too-many-public-methods
)
user_roles = (
db.session.query(assoc_user_role.c.role_id)
self.get_session.query(assoc_user_role.c.role_id)
.filter(assoc_user_role.c.user_id == g.user.id)
.subquery()
)
filter_roles = (
db.session.query(RLSFilterRoles.c.rls_filter_id)
self.get_session.query(RLSFilterRoles.c.rls_filter_id)
.filter(RLSFilterRoles.c.role_id.in_(user_roles))
.subquery()
)
filter_tables = (
db.session.query(RLSFilterTables.c.rls_filter_id)
self.get_session.query(RLSFilterTables.c.rls_filter_id)
.filter(RLSFilterTables.c.table_id == table.id)
.subquery()
)
query = (
db.session.query(
self.get_session.query(
RowLevelSecurityFilter.id, RowLevelSecurityFilter.clause
)
.filter(RowLevelSecurityFilter.id.in_(filter_tables))