From df794406a8803e3d6062af8404d7564833f9af28 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 29 Dec 2020 04:46:05 -0800
Subject: [PATCH] Allow / character in username,password fields in _PROXY
 envvars. (GH-23973)

(cherry picked from commit 030a713183084594659aefd77b76fe30178e23c8)

Co-authored-by: Senthil Kumaran <senthil@uthcode.com>
---
 Lib/test/test_urllib2.py                               | 10 +++++++++-
 Lib/urllib/request.py                                  |  6 +++++-
 .../Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst   |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index b71be549d28..12c3f4dbd5b 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1849,9 +1849,17 @@ class MiscTests(unittest.TestCase):
              ('ftp', 'joe', 'password', 'proxy.example.com')),
             # Test for no trailing '/' case
             ('http://joe:password@proxy.example.com',
-             ('http', 'joe', 'password', 'proxy.example.com'))
+             ('http', 'joe', 'password', 'proxy.example.com')),
+            # Testcases with '/' character in username, password
+            ('http://user/name:password@localhost:22',
+             ('http', 'user/name', 'password', 'localhost:22')),
+            ('http://username:pass/word@localhost:22',
+             ('http', 'username', 'pass/word', 'localhost:22')),
+            ('http://user/name:pass/word@localhost:22',
+             ('http', 'user/name', 'pass/word', 'localhost:22')),
         ]
 
+
         for tc, expected in parse_proxy_test_cases:
             self.assertEqual(_parse_proxy(tc), expected)
 
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index a8c870b9778..57d991465a5 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -771,7 +771,11 @@ def _parse_proxy(proxy):
             raise ValueError("proxy URL with no authority: %r" % proxy)
         # We have an authority, so for RFC 3986-compliant URLs (by ss 3.
         # and 3.3.), path is empty or starts with '/'
-        end = r_scheme.find("/", 2)
+        if '@' in r_scheme:
+            host_separator = r_scheme.find('@')
+            end = r_scheme.find("/", host_separator)
+        else:
+            end = r_scheme.find("/", 2)
         if end == -1:
             end = None
         authority = r_scheme[2:end]
diff --git a/Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst b/Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst
new file mode 100644
index 00000000000..07b15d34e8d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst
@@ -0,0 +1 @@
+Allow / character in username, password fields on _PROXY envars.