mirror of
https://github.com/python/cpython.git
synced 2025-12-31 04:23:37 +00:00
[3.14] gh-133889: Only show the path of the URL in the SimpleHTTPRequestHandler page (GH-134135) (GH-134190)
The query and fragment are ambiguous and not used.
(cherry picked from commit 5cbc8c632e)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
76957eb8cc
commit
70735878ab
3 changed files with 15 additions and 8 deletions
|
|
@ -840,11 +840,14 @@ def list_directory(self, path):
|
|||
return None
|
||||
list.sort(key=lambda a: a.lower())
|
||||
r = []
|
||||
displaypath = self.path
|
||||
displaypath = displaypath.split('#', 1)[0]
|
||||
displaypath = displaypath.split('?', 1)[0]
|
||||
try:
|
||||
displaypath = urllib.parse.unquote(self.path,
|
||||
displaypath = urllib.parse.unquote(displaypath,
|
||||
errors='surrogatepass')
|
||||
except UnicodeDecodeError:
|
||||
displaypath = urllib.parse.unquote(self.path)
|
||||
displaypath = urllib.parse.unquote(displaypath)
|
||||
displaypath = html.escape(displaypath, quote=False)
|
||||
enc = sys.getfilesystemencoding()
|
||||
title = f'Directory listing for {displaypath}'
|
||||
|
|
|
|||
|
|
@ -628,13 +628,14 @@ def test_list_dir_escape_filename(self):
|
|||
self.check_list_dir_filename(filename)
|
||||
os_helper.unlink(os.path.join(self.tempdir, filename))
|
||||
|
||||
def test_undecodable_parameter(self):
|
||||
# sanity check using a valid parameter
|
||||
def test_list_dir_with_query_and_fragment(self):
|
||||
prefix = f'listing for {self.base_url}/</'.encode('latin1')
|
||||
response = self.request(self.base_url + '/#123').read()
|
||||
self.assertIn(prefix + b'title>', response)
|
||||
self.assertIn(prefix + b'h1>', response)
|
||||
response = self.request(self.base_url + '/?x=123').read()
|
||||
self.assertRegex(response, rf'listing for {self.base_url}/\?x=123'.encode('latin1'))
|
||||
# now the bogus encoding
|
||||
response = self.request(self.base_url + '/?x=%bb').read()
|
||||
self.assertRegex(response, rf'listing for {self.base_url}/\?x=\xef\xbf\xbd'.encode('latin1'))
|
||||
self.assertIn(prefix + b'title>', response)
|
||||
self.assertIn(prefix + b'h1>', response)
|
||||
|
||||
def test_get_dir_redirect_location_domain_injection_bug(self):
|
||||
"""Ensure //evil.co/..%2f../../X does not put //evil.co/ in Location.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
The generated directory listing page in
|
||||
:class:`http.server.SimpleHTTPRequestHandler` now only shows the decoded
|
||||
path component of the requested URL, and not the query and fragment.
|
||||
Loading…
Add table
Add a link
Reference in a new issue