mirror of https://github.com/apache/superset.git
fix: remove encryption from db params (#16214)
* 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>
This commit is contained in:
parent
a1e18ed110
commit
67c4c0116e
|
@ -1410,7 +1410,8 @@ class BasicParametersMixin:
|
||||||
parameters: BasicParametersType,
|
parameters: BasicParametersType,
|
||||||
encryted_extra: Optional[Dict[str, str]] = None,
|
encryted_extra: Optional[Dict[str, str]] = None,
|
||||||
) -> str:
|
) -> 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 parameters.get("encryption"):
|
||||||
if not cls.encryption_parameters:
|
if not cls.encryption_parameters:
|
||||||
raise Exception("Unable to build a URL with encryption enabled")
|
raise Exception("Unable to build a URL with encryption enabled")
|
||||||
|
@ -1433,6 +1434,11 @@ class BasicParametersMixin:
|
||||||
cls, uri: str, encrypted_extra: Optional[Dict[str, Any]] = None
|
cls, uri: str, encrypted_extra: Optional[Dict[str, Any]] = None
|
||||||
) -> BasicParametersType:
|
) -> BasicParametersType:
|
||||||
url = make_url(uri)
|
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(
|
encryption = all(
|
||||||
item in url.query.items() for item in cls.encryption_parameters.items()
|
item in url.query.items() for item in cls.encryption_parameters.items()
|
||||||
)
|
)
|
||||||
|
@ -1442,7 +1448,7 @@ class BasicParametersMixin:
|
||||||
"host": url.host,
|
"host": url.host,
|
||||||
"port": url.port,
|
"port": url.port,
|
||||||
"database": url.database,
|
"database": url.database,
|
||||||
"query": url.query,
|
"query": query,
|
||||||
"encryption": encryption,
|
"encryption": encryption,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue