Skip to content

Commit

Permalink
fix(rls api): Add missing init file (#23817)
Browse files Browse the repository at this point in the history
  • Loading branch information
jfrag1 committed Apr 25, 2023
1 parent 60c2e70 commit ae00686
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
16 changes: 16 additions & 0 deletions superset/row_level_security/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
4 changes: 2 additions & 2 deletions superset/row_level_security/commands/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from superset.commands.utils import populate_roles
from superset.connectors.sqla.models import SqlaTable
from superset.dao.exceptions import DAOCreateFailedError
from superset.extensions import appbuilder, db, security_manager
from superset.extensions import db
from superset.row_level_security.dao import RLSDAO

logger = logging.getLogger(__name__)
Expand All @@ -42,7 +42,7 @@ def run(self) -> Any:
rule = RLSDAO.create(self._properties)
except DAOCreateFailedError as ex:
logger.exception(ex.exception)
raise DAOCreateFailedError
raise ex

return rule

Expand Down
4 changes: 2 additions & 2 deletions superset/row_level_security/commands/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from superset.commands.utils import populate_roles
from superset.connectors.sqla.models import RowLevelSecurityFilter, SqlaTable
from superset.dao.exceptions import DAOUpdateFailedError
from superset.extensions import appbuilder, db, security_manager
from superset.extensions import db
from superset.row_level_security.commands.exceptions import RLSRuleNotFoundError
from superset.row_level_security.dao import RLSDAO

Expand All @@ -45,7 +45,7 @@ def run(self) -> Any:
rule = RLSDAO.update(self._model, self._properties)
except DAOUpdateFailedError as ex:
logger.exception(ex.exception)
raise DAOUpdateFailedError
raise ex

return rule

Expand Down
4 changes: 4 additions & 0 deletions superset/row_level_security/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@
id_description = "Unique if of rls filter"
name_description = "Name of rls filter"
description_description = "Detailed description"
# pylint: disable=line-too-long
filter_type_description = "Regular filters add where clauses to queries if a user belongs to a role referenced in the filter, base filters apply filters to all queries except the roles defined in the filter, and can be used to define what users can see if no RLS filters within a filter group apply to them."
tables_description = "These are the tables this filter will be applied to."
# pylint: disable=line-too-long
roles_description = "For regular filters, these are the roles this filter will be applied to. For base filters, these are the roles that the filter DOES NOT apply to, e.g. Admin if admin should see all data."
# pylint: disable=line-too-long
group_key_description = "Filters with the same group key will be ORed together within the group, while different filter groups will be ANDed together. Undefined group keys are treated as unique groups, i.e. are not grouped together. For example, if a table has three filters, of which two are for departments Finance and Marketing (group key = 'department'), and one refers to the region Europe (group key = 'region'), the filter clause would apply the filter (department = 'Finance' OR department = 'Marketing') AND (region = 'Europe')."
# pylint: disable=line-too-long
clause_description = "This is the condition that will be added to the WHERE clause. For example, to only return rows for a particular client, you might define a regular filter with the clause `client_id = 9`. To display no rows unless a user belongs to a RLS filter role, a base filter can be created with the clause `1 = 0` (always false)."

get_delete_ids_schema = {"type": "array", "items": {"type": "integer"}}
Expand Down

0 comments on commit ae00686

Please sign in to comment.