forked from apache/superset
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: check type of url before performing string actions (apache#19569)
* ensure url is a string * return url if param is a url (cherry picked from commit aa419b8)
- Loading branch information
1 parent
8c8b254
commit e067c3f
Showing
2 changed files
with
52 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# 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. | ||
|
||
from sqlalchemy.engine.url import make_url | ||
from sqlalchemy.orm.session import Session | ||
|
||
from superset.databases.utils import make_url_safe | ||
|
||
|
||
def test_make_url_safe_string(app_context: None, session: Session) -> None: | ||
""" | ||
Test converting a string to a safe uri | ||
""" | ||
uri_string = "postgresql+psycopg2://superset:***@127.0.0.1:5432/superset" | ||
uri_safe = make_url_safe(uri_string) | ||
assert str(uri_safe) == uri_string | ||
assert uri_safe == make_url(uri_string) | ||
|
||
|
||
def test_make_url_safe_url(app_context: None, session: Session) -> None: | ||
""" | ||
Test converting a url to a safe uri | ||
""" | ||
uri = make_url("postgresql+psycopg2://superset:***@127.0.0.1:5432/superset") | ||
uri_safe = make_url_safe(uri) | ||
assert uri_safe == uri |