pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-06 22:07:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(datasets): add support for removing owners (#16461)

Browse Source 
* fix(datasets): add support for removing owners

* default to current user
This commit is contained in:
Ville Brofeldt 2021-08-31 17:27:09 +03:00 committed by GitHub
parent 1f1e2dd29a
commit c5a5cf7db9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
superset/views/datasource/views.py
View File

@ -18,7 +18,7 @@ import json
from collections import Counter from collections import Counter
from typing import Any from typing import Any
from flask import request from flask import g, request
from flask_appbuilder import expose from flask_appbuilder import expose
from flask_appbuilder.api import rison from flask_appbuilder.api import rison
from flask_appbuilder.security.decorators import has_access_api from flask_appbuilder.security.decorators import has_access_api
@ -28,6 +28,7 @@ from sqlalchemy.exc import NoSuchTableError
from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm.exc import NoResultFound
from superset import app, db, event_logger from superset import app, db, event_logger
from superset.commands.utils import populate_owners
from superset.connectors.connector_registry import ConnectorRegistry from superset.connectors.connector_registry import ConnectorRegistry
from superset.connectors.sqla.utils import get_physical_table_metadata from superset.connectors.sqla.utils import get_physical_table_metadata
from superset.datasets.commands.exceptions import ( from superset.datasets.commands.exceptions import (
@ -35,6 +36,7 @@ from superset.datasets.commands.exceptions import (
DatasetNotFoundError, DatasetNotFoundError,
) )
from superset.exceptions import SupersetException, SupersetSecurityException from superset.exceptions import SupersetException, SupersetSecurityException
from superset.extensions import security_manager
from superset.models.core import Database from superset.models.core import Database
from superset.typing import FlaskResponse from superset.typing import FlaskResponse
from superset.views.base import ( from superset.views.base import (
@ -79,16 +81,28 @@ class Datasource(BaseSupersetView):
if "owners" in datasource_dict and orm_datasource.owner_class is not None: if "owners" in datasource_dict and orm_datasource.owner_class is not None:
# Check ownership # Check ownership
if app.config["OLD_API_CHECK_DATASET_OWNERSHIP"]: if app.config["OLD_API_CHECK_DATASET_OWNERSHIP"]:
# mimic the behavior of the new dataset command that
# checks ownership and ensures that non-admins aren't locked out
# of the object
try: try:
check_ownership(orm_datasource) check_ownership(orm_datasource)
except SupersetSecurityException as ex: except SupersetSecurityException as ex:
raise DatasetForbiddenError() from ex raise DatasetForbiddenError() from ex
user = security_manager.get_user_by_id(g.user.id)
datasource_dict["owners"] = ( datasource_dict["owners"] = populate_owners(
db.session.query(orm_datasource.owner_class) user, datasource_dict["owners"], default_to_user=False
.filter(orm_datasource.owner_class.id.in_(datasource_dict["owners"])) )
.all() else:
) # legacy behavior
datasource_dict["owners"] = (
db.session.query(orm_datasource.owner_class)
.filter(
orm_datasource.owner_class.id.in_(
datasource_dict["owners"] or []
)
)
.all()
)
duplicates = [ duplicates = [
name name