saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #26127 from garethgreenaway/2015_5_24106

Browse source 
Fixes to salt.utils.http related to cp.get_file_str bug.
This commit is contained in:
Mike Place 2015-08-10 08:38:25 -06:00
commit 9e6b0d6165
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/utils/http.py
View file

@ -201,10 +201,14 @@ def query(url,
continue
header_dict[comps[0].strip()] = comps[1].strip()
if username and password:
auth = (username, password)
if not auth:
if username and password:
auth = (username, password)
else:
auth = None
else:
auth = None
if not username and not password and isinstance(auth, tuple):
(username, password) = auth # pylint: disable=W0633
if requests_lib is True:
sess = requests.Session()
@ -214,6 +218,11 @@ def query(url,
sess_cookies = sess.cookies
sess.verify = verify_ssl
else:
if auth:
password_mgr = urllib_request.HTTPPasswordMgrWithDefaultRealm()
password_mgr.add_password(None, url, username, password)
else:
password_mgr = None
sess_cookies = None
if cookies is not None:
@ -275,6 +284,8 @@ def query(url,
urllib_request.HTTPHandler,
urllib_request.HTTPCookieProcessor(sess_cookies)
]
if password_mgr:
handlers.append(urllib_request.HTTPBasicAuthHandler(password_mgr))
if url.startswith('https') or port == 443:
if not HAS_MATCHHOSTNAME: