zhaoyongjie commented on a change in pull request #18064:
URL: https://github.com/apache/superset/pull/18064#discussion_r802575700
##########
File path: superset/databases/filters.py
##########
@@ -25,21 +25,27 @@
class DatabaseFilter(BaseFilter):
# TODO(bogdan): consider caching.
- def schema_access_databases(self) -> Set[str]: # noqa pylint:
disable=no-self-use
+
+ def can_access_databases( # noqa pylint: disable=no-self-use
+ self, view_menu_name: str,
+ ) -> Set[str]:
return {
- security_manager.unpack_schema_perm(vm)[0]
- for vm in security_manager.user_view_menu_names("schema_access")
+ security_manager.unpack_database_and_schema(vm).database
+ for vm in security_manager.user_view_menu_names(view_menu_name)
}
def apply(self, query: Query, value: Any) -> Query:
if security_manager.can_access_all_databases():
return query
database_perms =
security_manager.user_view_menu_names("database_access")
- # TODO(bogdan): consider adding datasource access here as well.
- schema_access_databases = self.schema_access_databases()
+ schema_access_databases = self.can_access_databases("schema_access")
+
+ datasource_access_databases =
self.can_access_databases("datasource_access")
+
return query.filter(
or_(
self.model.perm.in_(database_perms),
self.model.database_name.in_(schema_access_databases),
+ self.model.database_name.in_(datasource_access_databases),
Review comment:
```suggestion
self.model.database_name.in_([*schema_access_databases,
*datasource_access_databases]),
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@superset.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@superset.apache.org
For additional commands, e-mail: notifications-h...@superset.apache.org
