Skip to content

bpo-5038: Use iterable objects in case of mmap file source #11904

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

Closed
ghost wants to merge 5 commits into from
Closed

bpo-5038: Use iterable objects in case of mmap file source #11904

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d69c77
Introduce iterable objects for Basic and Digest authentication
kctherookie Feb 16, 2019
964d244
Introduce iterable objects for Basic and Digest authentication
kctherookie Feb 17, 2019
5d9c60b
add proper Transfer-Encoding chunked handling for post requests
kctherookie Feb 17, 2019
521d703
make AuthHandlerFileReiterator class private
kctherookie Feb 17, 2019
17f1e9c
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 17, 2019
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
Prev Previous commit
Next Next commit
add proper Transfer-Encoding chunked handling for post requests
  • Loading branch information
@kctherookie
kctherookie committed Feb 17, 2019
commit 5d9c60b604571e4a06ed8cb58b23f9fa55131097
86 changes: 59 additions & 27 deletions Lib/test/test_urllib2_localnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,25 @@ def _return_auth_challenge(self, request_handler):
request_handler.wfile.write(b"Proxy Authentication Required.")
return False

def _read_post_body(self, request_handler):
encoding = request_handler.headers.get("Transfer-Encoding")
if encoding is None:
length = int(request_handler.headers.get("Content-Length"))
if encoding == "chunked":
request = b""
while True:
line = request_handler.rfile.readline()
length = int(line, 16)
if length == 0:
request_handler.rfile.readline()
break
request = request + request_handler.rfile.read(length)
request_handler.rfile.read(2)
else:
request = self.rfile.read(length)

return request

def handle_request(self, request_handler):
"""Performs digest authentication on the given HTTP request
handler. Returns True if authentication was successful, False
Expand All @@ -163,6 +182,9 @@ def handle_request(self, request_handler):
disabled and this method will always return True.
"""

if request_handler.is_POST == True:
request_handler.post_body = self._read_post_body(request_handler)

if len(self._users) == 0:
return True

Expand Down Expand Up @@ -240,28 +262,38 @@ def do_GET(self):
self.do_AUTHHEAD()

def do_POST(self):
if not self.headers.get("Authorization", ""):
self.do_AUTHHEAD()
self.wfile.write(b"No Auth header received")
elif self.headers.get(
"Authorization", "") == "Basic " + self.ENCODED_AUTH:
encoding = self.headers.get("Transfer-Encoding")
if encoding is None:
length = int(self.headers.get("Content-Length"))
else:
assert encoding == "chunked"
length = int(self.rfile.readline(), 16)
encoding = self.headers.get("Transfer-Encoding")
if encoding is None:
length = int(self.headers.get("Content-Length"))
if encoding == "chunked":
request = b""
while True:
line = self.rfile.readline()
length = int(line, 16)
if length == 0:
self.rfile.readline()
break
request = request + self.rfile.read(length)
self.rfile.read(2)
length = len(request)
else:
request = self.rfile.read(length)
assert len(request) == length
if length > 0:
if length > 0:
if not self.headers.get("Authorization", ""):
self.do_AUTHHEAD()
self.wfile.write(b"No Auth header received")
return
elif self.headers.get(
"Authorization", "") == "Basic " + self.ENCODED_AUTH:
self.send_response(200, "OK")
self.end_headers()
self.wfile.write(request)
else:
self.send_response(400, "Empty request data")
self.end_headers()
self.do_AUTHHEAD()
return
else:
self.do_AUTHHEAD()
self.send_response(400, "Empty request data")
self.end_headers()

# Proxy test infrastructure

Expand All @@ -287,6 +319,7 @@ def do_GET(self):
(scm, netloc, path, params, query, fragment) = urllib.parse.urlparse(
self.path, "http")
self.short_path = path
self.is_POST = False
if self.digest_auth_handler.handle_request(self):
self.send_response(200, "OK")
self.send_header("Content-Type", "text/html")
Expand All @@ -300,16 +333,10 @@ def do_POST(self):
(scm, netloc, path, params, query, fragment) = urllib.parse.urlparse(
self.path, "http")
self.short_path = path
self.is_POST = True
if self.digest_auth_handler.handle_request(self):
encoding = self.headers.get("Transfer-Encoding")
if encoding is None:
length = int(self.headers.get("Content-Length"))
else:
assert encoding == "chunked"
length = int(self.rfile.readline(), 16)
request = self.rfile.read(length)
assert len(request) == length
if length > 0:
request = self.post_body
if len(request) > 0:
self.send_response(200, "OK")
self.send_header("Content-Type", "text/plain")
self.end_headers()
Expand Down Expand Up @@ -368,8 +395,12 @@ def test_basic_auth_mmap_post(self):
user=self.USER, passwd=self.PASSWD)
opener = urllib.request.build_opener(auth_handler)
urllib.request.install_opener(opener)
response = opener.open(self.server_url, mem)
self.assertEqual(response.read(), data)
try:
response = urllib.request.urlopen(self.server_url, mem)
except urllib.error.HTTPError:
self.fail("Basic auth failed for the url: %s" % self.server_url)
response_data = response.read()
self.assertEqual(response_data, data)

class ProxyAuthTests(unittest.TestCase):
URL = "http://localhost"
Expand Down Expand Up @@ -457,6 +488,7 @@ def test_proxy_auth_mmap_post(self):
response = self.opener.open(self.URL, mem)
self.assertEqual(response.read(), data)


def GetRequestHandler(responses):

class FakeHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
Expand Down