Skip to content
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

Jump to bottom

Fixes issue #55561 #62966

Closed
wants to merge 1 commit into from
Closed

Fixes issue #55561 #62966

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions salt/utils/url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import re
import sys
from urllib.parse import urlparse, urlunparse
from urllib.parse import urlparse, urlunparse, quote

import salt.utils.data
import salt.utils.path
Expand Down Expand Up @@ -158,11 +158,11 @@ def add_http_basic_auth(url, user=None, password=None, https_only=False):
if https_only and urltuple.scheme != "https":
raise ValueError("Basic Auth only supported for HTTPS")
if password is None:
netloc = "{}@{}".format(user, urltuple.netloc)
netloc = "{}@{}".format(quote(user, ""), urltuple.netloc)
urltuple = urltuple._replace(netloc=netloc)
return urlunparse(urltuple)
else:
netloc = "{}:{}@{}".format(user, password, urltuple.netloc)
netloc = "{}:{}@{}".format(quote(user, ""), quote(password, ""), urltuple.netloc)
urltuple = urltuple._replace(netloc=netloc)
return urlunparse(urltuple)

Expand Down