mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #22165: SimpleHTTPRequestHandler now supports undecodable file names.

This commit is contained in:
Serhiy Storchaka 2014-08-17 08:24:49 +03:00
parent f9e227e5a9 cb5bc408ad
commit 41a08e557a
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/http/server.py
View File

@ -747,7 +747,12 @@ def list_directory(self, path):
return None return None
list.sort(key=lambda a: a.lower()) list.sort(key=lambda a: a.lower())
r = [] r = []
displaypath = html.escape(urllib.parse.unquote(self.path)) try:
displaypath = urllib.parse.unquote(self.path,
errors='surrogatepass')
except UnicodeDecodeError:
displaypath = urllib.parse.unquote(path)
displaypath = html.escape(displaypath)
enc = sys.getfilesystemencoding() enc = sys.getfilesystemencoding()
title = 'Directory listing for %s' % displaypath title = 'Directory listing for %s' % displaypath
r.append('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" ' r.append('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" '
@ -769,9 +774,11 @@ def list_directory(self, path):
displayname = name + "@" displayname = name + "@"
# Note: a link to a directory displays with @ and links with / # Note: a link to a directory displays with @ and links with /
r.append('<li><a href="%s">%s</a></li>' r.append('<li><a href="%s">%s</a></li>'
% (urllib.parse.quote(linkname), html.escape(displayname))) % (urllib.parse.quote(linkname,
errors='surrogatepass'),
html.escape(displayname)))
r.append('</ul>\n<hr>\n</body>\n</html>\n') r.append('</ul>\n<hr>\n</body>\n</html>\n')
encoded = '\n'.join(r).encode(enc) encoded = '\n'.join(r).encode(enc, 'surrogateescape')
f = io.BytesIO() f = io.BytesIO()
f.write(encoded) f.write(encoded)
f.seek(0) f.seek(0)
@ -794,7 +801,11 @@ def translate_path(self, path):
path = path.split('#',1)[0] path = path.split('#',1)[0]
# Don't forget explicit trailing slash when normalizing. Issue17324 # Don't forget explicit trailing slash when normalizing. Issue17324
trailing_slash = path.rstrip().endswith('/') trailing_slash = path.rstrip().endswith('/')
path = posixpath.normpath(urllib.parse.unquote(path)) try:
path = urllib.parse.unquote(path, errors='surrogatepass')
except UnicodeDecodeError:
path = urllib.parse.unquote(path)
path = posixpath.normpath(path)
words = path.split('/') words = path.split('/')
words = filter(None, words) words = filter(None, words)
path = os.getcwd() path = os.getcwd()

19
Lib/test/test_httpservers.py
View File

@ -14,6 +14,7 @@
import base64 import base64
import shutil import shutil
import urllib.parse import urllib.parse
import html
import http.client import http.client
import tempfile import tempfile
from io import BytesIO from io import BytesIO
@ -266,6 +267,24 @@ def check_status_and_reason(self, response, status, data=None):
self.assertIsNotNone(response.reason) self.assertIsNotNone(response.reason)
if data: if data:
self.assertEqual(data, body) self.assertEqual(data, body)
return body
@unittest.skipUnless(support.TESTFN_UNDECODABLE,
'need support.TESTFN_UNDECODABLE')
def test_undecodable_filename(self):
filename = os.fsdecode(support.TESTFN_UNDECODABLE) + '.txt'
with open(os.path.join(self.tempdir, filename), 'wb') as f:
f.write(support.TESTFN_UNDECODABLE)
response = self.request(self.tempdir_name + '/')
body = self.check_status_and_reason(response, 200)
quotedname = urllib.parse.quote(filename, errors='surrogatepass')
self.assertIn(('href="%s"' % quotedname)
.encode('utf-8', 'surrogateescape'), body)
self.assertIn(('>%s<' % html.escape(filename))
.encode('utf-8', 'surrogateescape'), body)
response = self.request(self.tempdir_name + '/' + quotedname)
self.check_status_and_reason(response, 200,
data=support.TESTFN_UNDECODABLE)
def test_get(self): def test_get(self):
#constructs the path relative to the root directory of the HTTPServer #constructs the path relative to the root directory of the HTTPServer

2
Misc/NEWS
View File

@ -118,6 +118,8 @@ Core and Builtins
Library Library
------- -------
- Issue #22165: SimpleHTTPRequestHandler now supports undecodable file names.
- Issue #15381: Optimized line reading in io.BytesIO. - Issue #15381: Optimized line reading in io.BytesIO.
- Issue #20729: Restored the use of lazy iterkeys()/itervalues()/iteritems() - Issue #20729: Restored the use of lazy iterkeys()/itervalues()/iteritems()