Skip to content

Commit

Permalink
fix: remove encryption from db params (apache#16214)
Browse files Browse the repository at this point in the history
* remove encryption from db params

* Update superset/db_engine_specs/base.py

Co-authored-by: Beto Dealmeida <roberto@dealmeida.net>

Co-authored-by: Beto Dealmeida <roberto@dealmeida.net>
(cherry picked from commit 67c4c01)
  • Loading branch information
eschutho authored and Steven Uray committed Aug 12, 2021
1 parent 32f1dae commit 9ab34c9
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions superset/db_engine_specs/base.py
Expand Up @@ -1410,7 +1410,8 @@ def build_sqlalchemy_uri(
parameters: BasicParametersType,
encryted_extra: Optional[Dict[str, str]] = None,
) -> str:
query = parameters.get("query", {})
# make a copy so that we don't update the original
query = parameters.get("query", {}).copy()
if parameters.get("encryption"):
if not cls.encryption_parameters:
raise Exception("Unable to build a URL with encryption enabled")
Expand All @@ -1433,6 +1434,11 @@ def get_parameters_from_uri(
cls, uri: str, encrypted_extra: Optional[Dict[str, Any]] = None
) -> BasicParametersType:
url = make_url(uri)
query = {
key: value
for (key, value) in url.query.items()
if (key, value) not in cls.encryption_parameters.items()
}
encryption = all(
item in url.query.items() for item in cls.encryption_parameters.items()
)
Expand All @@ -1442,7 +1448,7 @@ def get_parameters_from_uri(
"host": url.host,
"port": url.port,
"database": url.database,
"query": url.query,
"query": query,
"encryption": encryption,
}

Expand Down

0 comments on commit 9ab34c9

Please sign in to comment.