fix: schemas for upload API (#29604)

This commit is contained in:
Beto Dealmeida 2024-07-16 15:53:25 -04:00 committed by GitHub
parent ec508a70a6
commit b66c0f8d30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 3 deletions

View File

@ -982,7 +982,7 @@ class Database(Model, AuditMixinNullable, ImportExportMixin): # pylint: disable
def get_schema_access_for_file_upload( # pylint: disable=invalid-name
self,
) -> list[str]:
) -> set[str]:
allowed_databases = self.get_extra().get("schemas_allowed_for_file_upload", [])
if isinstance(allowed_databases, str):
@ -993,7 +993,7 @@ class Database(Model, AuditMixinNullable, ImportExportMixin): # pylint: disable
self, g.user
)
allowed_databases += extra_allowed_databases
return sorted(set(allowed_databases))
return set(allowed_databases)
@property
def sqlalchemy_uri_decrypted(self) -> str:

View File

@ -2621,7 +2621,7 @@ class TestDashboardApi(ApiOwnersTestCaseMixin, InsertChartMixin, SupersetTestCas
# Clean up system tags
tag_list = [tag.id for tag in model.tags if tag.type == TagType.custom]
self.assertEqual(tag_list, new_tags)
self.assertEqual(sorted(tag_list), sorted(new_tags))
@pytest.mark.usefixtures("create_dashboard_with_tag")
def test_update_dashboard_remove_tags_can_write_on_tag(self):

View File

@ -461,3 +461,23 @@ def test_raw_connection_oauth(mocker: MockerFixture) -> None:
with database.get_raw_connection() as conn:
conn.cursor()
assert str(excinfo.value) == "You don't have permission to access the data."
def test_get_schema_access_for_file_upload() -> None:
"""
Test the `get_schema_access_for_file_upload` method.
"""
database = Database(
database_name="first-database",
sqlalchemy_uri="gsheets://",
extra=json.dumps(
{
"metadata_params": {},
"engine_params": {},
"metadata_cache_timeout": {},
"schemas_allowed_for_file_upload": '["public"]',
}
),
)
assert database.get_schema_access_for_file_upload() == {"public"}