Kaydet (Commit) d274b3f1 authored tarafından Martin Panter's avatar Martin Panter

Issue #26657: Fix Windows directory traversal vulnerability with http.server

Based on patch by Philipp Hagemeister.  This fixes a regression caused by
revision f4377699fd47.
üst 6aafbd43
...@@ -774,9 +774,9 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): ...@@ -774,9 +774,9 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
words = filter(None, words) words = filter(None, words)
path = os.getcwd() path = os.getcwd()
for word in words: for word in words:
drive, word = os.path.splitdrive(word) if os.path.dirname(word) or word in (os.curdir, os.pardir):
head, word = os.path.split(word) # Ignore components that are not a simple file/directory name
if word in (os.curdir, os.pardir): continue continue
path = os.path.join(path, word) path = os.path.join(path, word)
if trailing_slash: if trailing_slash:
path += '/' path += '/'
......
...@@ -12,6 +12,7 @@ import os ...@@ -12,6 +12,7 @@ import os
import sys import sys
import re import re
import base64 import base64
import ntpath
import shutil import shutil
import urllib.parse import urllib.parse
import html import html
...@@ -918,6 +919,24 @@ class SimpleHTTPRequestHandlerTestCase(unittest.TestCase): ...@@ -918,6 +919,24 @@ class SimpleHTTPRequestHandlerTestCase(unittest.TestCase):
path = self.handler.translate_path('//filename?foo=bar') path = self.handler.translate_path('//filename?foo=bar')
self.assertEqual(path, self.translated) self.assertEqual(path, self.translated)
def test_windows_colon(self):
with support.swap_attr(server.os, 'path', ntpath):
path = self.handler.translate_path('c:c:c:foo/filename')
path = path.replace(ntpath.sep, os.sep)
self.assertEqual(path, self.translated)
path = self.handler.translate_path('\\c:../filename')
path = path.replace(ntpath.sep, os.sep)
self.assertEqual(path, self.translated)
path = self.handler.translate_path('c:\\c:..\\foo/filename')
path = path.replace(ntpath.sep, os.sep)
self.assertEqual(path, self.translated)
path = self.handler.translate_path('c:c:foo\\c:c:bar/filename')
path = path.replace(ntpath.sep, os.sep)
self.assertEqual(path, self.translated)
class MiscTestCase(unittest.TestCase): class MiscTestCase(unittest.TestCase):
def test_all(self): def test_all(self):
......
...@@ -107,6 +107,10 @@ Core and Builtins ...@@ -107,6 +107,10 @@ Core and Builtins
Library Library
------- -------
- Issue #26657: Fix directory traversal vulnerability with http.server on
Windows. This fixes a regression that was introduced in 3.3.4rc1 and
3.4.0rc1. Based on patch by Philipp Hagemeister.
- Issue #26717: Stop encoding Latin-1-ized WSGI paths with UTF-8. Patch by - Issue #26717: Stop encoding Latin-1-ized WSGI paths with UTF-8. Patch by
Anthony Sottile. Anthony Sottile.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment