bpo-42766 Fix 2 bugs in urllib.request.HTTPPasswordMgr.is_suburi

Lib/test/test_urllib2.py

@@ -145,6 +145,8 @@ def test_password_manager(self):
         mgr = urllib.request.HTTPPasswordMgr()
         add = mgr.add_password
         find_user_pass = mgr.find_user_password
+        is_suburi = mgr.is_suburi
+        reduce_uri = mgr.reduce_uri
 
         add("Some Realm", "http://example.com/", "joe", "password")
         add("Some Realm", "http://example.com/ni", "ni", "ni")
@@ -211,6 +213,25 @@ def test_password_manager(self):
         self.assertEqual(find_user_pass("Some Realm", "e.example.com:3128"),
                          ('5', 'e'))
 
+        # is_suburi
+
+        true = self.assertTrue
+        false = self.assertFalse
+        true(is_suburi(reduce_uri('http://example.com'),
+                       reduce_uri('http://example.com/sub_dir')))
+        true(is_suburi(reduce_uri('http://example.com/sub_dir'),
+                       reduce_uri('http://example.com/sub_dir/sub_dir')))
+        false(is_suburi(reduce_uri('http://example.com/sub_dir/sub_dir'),
+                        reduce_uri('http://example.com/sub_dir')))
+        false(is_suburi(reduce_uri('http://example.com/second_dir'),
+                        reduce_uri('http://example.com/first_dir/second_dir')))
+        false(is_suburi(reduce_uri('http://example.com/sub_dir'),
+                        reduce_uri('http://example.com/sub')))
+        false(is_suburi(reduce_uri('http://example.com/sub_dir'),
+                        reduce_uri('http://exmaple.com/sub_dir_diff')))
+        false(is_suburi(reduce_uri('http://example.com/sub_dir_diff'),
+                        reduce_uri('http://exmaple.com/sub_dir_second_diff')))
+
     def test_password_manager_default_port(self):
         """
         The point to note here is that we can't guess the default port if

Lib/urllib/request.py

@@ -881,15 +881,15 @@ def reduce_uri(self, uri, default_port=True):
         return authority, path
 
     def is_suburi(self, base, test):
-        """Check if test is below base in a URI tree
+        """Check if test is equal or below base in a URI tree
 
         Both args must be URIs in reduced form.
         """
         if base == test:
             return True
-        if base[0] != test[0]:
+        if base[0] != test[0] or len(test[1]) < len(base[1]):
             return False
-        common = posixpath.commonprefix((base[1], test[1]))
+        common = posixpath.commonpath((base[1], test[1]))
         if len(common) == len(base[1]):
             return True
         return False

Misc/ACKS

@@ -552,6 +552,7 @@ Stefan Franke
 Martin Franklin
 Kent Frazier
 Bruce Frederiksen
+Yair Frid
 Jason Fried
 Robin Friedrich
 Bradley Froehle

Misc/NEWS.d/next/Library/2021-01-09-22-36-01.bpo-42766.6ybdUr.rst

@@ -0,0 +1,3 @@
+Fixed 2 bugs in urllib.request.HTTPPasswordMgr.is_suburi, added some tests
+for it. :func:`urllib.request.HTTPPasswordMgr.is_suburi`. Patch by Yair
+Frid.`