[3.10] gh-100474: Fix handling of dirs named index.html in http.server (GH-100504)

Co-authored-by: James Frost <git@frost.cx>

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 03dbaa51b798b750b009990a13b9d45ac91b1e4e..9c218d06acf5c5fafbfd6fc6435aa8cd584cc3e0 100644 (file)
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -709,7 +709,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
                 return None
             for index in "index.html", "index.htm":
                 index = os.path.join(path, index)
-                if os.path.exists(index):
+                if os.path.isfile(index):
                     path = index
                     break
             else:

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index ac8da494e9bb838325f47f424c8bcaa5f7cc0f8b..a5f787ff48c93b67e85e658eb84a7eed1903bb77 100644 (file)
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -488,6 +488,9 @@ class SimpleHTTPServerTestCase(BaseTestCase):
         self.check_status_and_reason(response, HTTPStatus.NOT_FOUND)
         response = self.request('/' + 'ThisDoesNotExist' + '/')
         self.check_status_and_reason(response, HTTPStatus.NOT_FOUND)
+        os.makedirs(os.path.join(self.tempdir, 'spam', 'index.html'))
+        response = self.request(self.base_url + '/spam/')
+        self.check_status_and_reason(response, HTTPStatus.OK)
 
         data = b"Dummy index file\r\n"
         with open(os.path.join(self.tempdir_name, 'index.html'), 'wb') as f:

diff --git a/Misc/NEWS.d/next/Library/2022-12-23-21-02-43.gh-issue-100474.gppA4U.rst b/Misc/NEWS.d/next/Library/2022-12-23-21-02-43.gh-issue-100474.gppA4U.rst
new file mode 100644 (file)
index 0000000..31abfb8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-12-23-21-02-43.gh-issue-100474.gppA4U.rst
@@ -0,0 +1,2 @@
+:mod:`http.server` now checks that an index page is actually a regular file before trying
+to serve it.  This avoids issues with directories named ``index.html``.