Make _get_redirect_url() into a method.

Possible that someone could override this so a method is nicer.
python · nascheme · Jun 16, 2022 · Jun 16, 2022 · Jun 16, 2022 · Jun 16, 2022
commit f1f94aea419921860153853a7b568ee07659ea7e
diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -664,6 +664,23 @@ def do_HEAD(self):
        if f:
            f.close()

+    def _get_redirect_url_for_dir(self):
+        """Returns URL with trailing slash on path, if required.  If not
+        required, returns None.
+        """
+        # Previous versions of this class used urllib.parse.urlsplit() here.
+        # However, the 'path' is being treated as a local filesystem path and
+        # it can't have a scheme or netloc.  We need to avoid parsing it
+        # incorrectly.  For example, as reported in gh-87389, a path starting
+        # with a double slash should not be treated as a relative URI.  Also, a
+        # path with a colon in the first component could also be parsed
+        # wrongly.
+        parts = urllib.parse.pathsplit(self.path)
+        if parts.path.endswith('/'):
+            return None  # already has slash, no redirect needed
+        return urllib.parse.urlunsplit(('', '', parts.path + '/', parts.query,
+                                        parts.fragment))
+
    def send_head(self):
        """Common code for GET and HEAD commands.

@@ -678,7 +695,7 @@ def send_head(self):
        path = self.translate_path(self.path)
        f = None
        if os.path.isdir(path):
-            new_url = _get_redirect_url(self.path)
+            new_url = self._get_redirect_url_for_dir()
            if new_url:
                # redirect browser - doing basically what apache does
                self.send_response(HTTPStatus.MOVED_PERMANENTLY)
@@ -877,23 +894,6 @@ def guess_type(self, path):
        return 'application/octet-stream'


-def _get_redirect_url(path):
-    """Returns URL with trailing slash on path, if required.  If not required,
-    returns None.
-    """
-    # Previous versions of this module used urllib.parse.urlsplit() here.
-    # However, the 'path' is not truly a URI in that it can't have a scheme or
-    # netloc.  We need to avoid parsing it incorrectly.  For example, as
-    # reported in gh-87389, a path starting with a double slash should not be
-    # treated as a relative URI.  Also, a path with a colon in the first
-    # component could also be parsed wrongly.
-    parts = urllib.parse.pathsplit(path)
-    if parts.path.endswith('/'):
-        return None  # already has slash, no redirect needed
-    return urllib.parse.urlunsplit(('', '', parts.path + '/', parts.query,
-                                    parts.fragment))
-
-
 # Utilities for CGIHTTPRequestHandler

 def _url_collapse_path(path):