Skip to content

Fix remove_url_auth leaving username-only credentials in URLs #2417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shubham-Padkonde wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix remove_url_auth leaving username-only credentials in URLs #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pygeoapi/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,9 @@ def remove_url_auth(url: str) -> str:
"""

u = urlparse(url)
auth = f'{u.username}:{u.password}@'
return url.replace(auth, '')
if '@' not in u.netloc:
return url
return u._replace(netloc=u.netloc.rpartition('@')[2]).geturl()


def is_request_allowed(url: str, allow_internal: bool = False) -> bool:
Expand Down
12 changes: 12 additions & 0 deletions tests/other/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,18 @@ def test_json_serial():
util.json_serial('foo')


@pytest.mark.parametrize('url,expected', [
['https://user:pw@example.org/x', 'https://example.org/x'],
['https://token@example.org/x', 'https://example.org/x'],
['mqtt://user:@broker:1883', 'mqtt://broker:1883'],
['postgresql://u:p@ss@db:5432/x?a=b', 'postgresql://db:5432/x?a=b'],
['https://example.org/x?email=a@b.c', 'https://example.org/x?email=a@b.c'],
['https://example.org/x', 'https://example.org/x'],
])
def test_remove_url_auth(url, expected):
assert util.remove_url_auth(url) == expected


def test_mimetype():
assert util.get_mimetype('file.xml') == 'application/xml'
assert util.get_mimetype('file.yml') == 'text/plain'
Expand Down
Loading