mirror of
https://github.com/python/cpython.git
synced 2025-07-29 22:24:49 +00:00
[Patch #1574068 by Scott Dial] urllib and urllib2 were using
base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers.
This commit is contained in:
parent
6d72b0e1f8
commit
872dba4253
2 changed files with 6 additions and 6 deletions
|
@ -674,7 +674,7 @@ class ProxyHandler(BaseHandler):
|
|||
proxy_type = orig_type
|
||||
if user and password:
|
||||
user_pass = '%s:%s' % (unquote(user), unquote(password))
|
||||
creds = base64.encodestring(user_pass).strip()
|
||||
creds = base64.b64encode(user_pass).strip()
|
||||
req.add_header('Proxy-authorization', 'Basic ' + creds)
|
||||
hostport = unquote(hostport)
|
||||
req.set_proxy(hostport, proxy_type)
|
||||
|
@ -798,7 +798,7 @@ class AbstractBasicAuthHandler:
|
|||
user, pw = self.passwd.find_user_password(realm, host)
|
||||
if pw is not None:
|
||||
raw = "%s:%s" % (user, pw)
|
||||
auth = 'Basic %s' % base64.encodestring(raw).strip()
|
||||
auth = 'Basic %s' % base64.b64encode(raw).strip()
|
||||
if req.headers.get(self.auth_header, None) == auth:
|
||||
return None
|
||||
req.add_header(self.auth_header, auth)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue