Skip to content
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.

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

feat(datasets): security perm simplification #12000

Merged
merged 12 commits into from
Dec 16, 2020
Next Next commit
feat(datasets): security perm simplification
  • Loading branch information
dpgaspar committed Dec 10, 2020
commit b00cb3dcc371b802734ca39f445ab29717a693d1
8 changes: 4 additions & 4 deletions superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
refreshData();
};

const canEdit = hasPerm('can_edit');
const canDelete = hasPerm('can_delete');
const canCreate = hasPerm('can_add');
const canExport = hasPerm('can_mulexport');
const canEdit = hasPerm('can_write');
const canDelete = hasPerm('can_write');
const canCreate = hasPerm('can_write');
const canExport = hasPerm('can_read');

const initialSort = [{ id: 'changed_on_delta_humanized', desc: true }];

Expand Down
8 changes: 7 additions & 1 deletion superset/connectors/sqla/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from superset import app, db, is_feature_enabled
from superset.connectors.base.views import DatasourceModelView
from superset.connectors.sqla import models
from superset.constants import RouteMethod
from superset.constants import MODEL_VIEW_RW_METHOD_PERMISSION_MAP, RouteMethod
from superset.typing import FlaskResponse
from superset.utils import core as utils
from superset.views.base import (
Expand All @@ -55,6 +55,8 @@ class TableColumnInlineView( # pylint: disable=too-many-ancestors
):
datamodel = SQLAInterface(models.TableColumn)
# TODO TODO, review need for this on related_views
class_permission_name = "Dataset"
method_permission_name = MODEL_VIEW_RW_METHOD_PERMISSION_MAP
include_route_methods = RouteMethod.RELATED_VIEW_SET | RouteMethod.API_SET

list_title = _("Columns")
Expand Down Expand Up @@ -174,6 +176,8 @@ class SqlMetricInlineView( # pylint: disable=too-many-ancestors
CompactCRUDMixin, SupersetModelView
):
datamodel = SQLAInterface(models.SqlMetric)
class_permission_name = "Dataset"
method_permission_name = MODEL_VIEW_RW_METHOD_PERMISSION_MAP
include_route_methods = RouteMethod.RELATED_VIEW_SET | RouteMethod.API_SET

list_title = _("Metrics")
Expand Down Expand Up @@ -327,6 +331,8 @@ class TableModelView( # pylint: disable=too-many-ancestors
DatasourceModelView, DeleteMixin, YamlExportMixin
):
datamodel = SQLAInterface(models.SqlaTable)
class_permission_name = "Dataset"
method_permission_name = MODEL_VIEW_RW_METHOD_PERMISSION_MAP
include_route_methods = RouteMethod.CRUD_SET

list_title = _("Tables")
Expand Down
3 changes: 3 additions & 0 deletions superset/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class RouteMethod: # pylint: disable=too-few-public-methods
"list": "read",
"muldelete": "write",
"show": "read",
"yaml_export": "read",
}

MODEL_API_RW_METHOD_PERMISSION_MAP = {
Expand All @@ -95,4 +96,6 @@ class RouteMethod: # pylint: disable=too-few-public-methods
"post": "write",
"put": "write",
"related": "read",
"refresh": "read",
"related_objects": "read",
}
5 changes: 3 additions & 2 deletions superset/datasets/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from superset.commands.exceptions import CommandInvalidError
from superset.commands.importers.v1.utils import remove_root
from superset.connectors.sqla.models import SqlaTable
from superset.constants import RouteMethod
from superset.constants import MODEL_API_RW_METHOD_PERMISSION_MAP, RouteMethod
from superset.databases.filters import DatabaseFilter
from superset.datasets.commands.bulk_delete import BulkDeleteDatasetCommand
from superset.datasets.commands.create import CreateDatasetCommand
Expand Down Expand Up @@ -79,7 +79,8 @@ class DatasetRestApi(BaseSupersetModelRestApi):

resource_name = "dataset"
allow_browser_login = True
class_permission_name = "TableModelView"
class_permission_name = "Dataset"
method_permission_name = MODEL_API_RW_METHOD_PERMISSION_MAP
include_route_methods = RouteMethod.REST_MODEL_VIEW_CRUD_SET | {
RouteMethod.EXPORT,
RouteMethod.IMPORT,
Expand Down
14 changes: 14 additions & 0 deletions tests/datasets/api_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,20 @@ def test_get_dataset_info(self):
rv = self.get_assert_metric(uri, "info")
assert rv.status_code == 200

def test_info_security_chart(self):
"""
Dataset API: Test info security
"""
self.login(username="admin")
params = {"keys": ["permissions"]}
uri = f"api/v1/dataset/_info?q={prison.dumps(params)}"
rv = self.get_assert_metric(uri, "info")
data = json.loads(rv.data.decode("utf-8"))
assert rv.status_code == 200
assert "can_read" in data["permissions"]
assert "can_write" in data["permissions"]
assert len(data["permissions"]) == 2

def test_create_dataset_item(self):
"""
Dataset API: Test create dataset item
Expand Down