Merge pull request #11134 from q0w/revert-10998-handle-netrc

Revert "Prioritize url credentials over netrc"
pypa · May 31, 2022 · 70c9b36 · 70c9b36
1 parent 0799cea
commit 70c9b36
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 46 deletions.
diff --git a/news/10979.bugfix.rst b/news/10979.bugfix.rst
@@ -0,0 +1 @@
+Revert `#10979 <https://github.com/pypa/pip/issues/10979>`_ since it introduced a regression in certain edge cases.
diff --git a/src/pip/_internal/network/auth.py b/src/pip/_internal/network/auth.py
@@ -109,8 +109,7 @@ def _get_index_url(self, url: str) -> Optional[str]:
     def _get_new_credentials(
         self,
         original_url: str,
-        *,
-        allow_netrc: bool = False,
+        allow_netrc: bool = True,
         allow_keyring: bool = False,
     ) -> AuthInfo:
         """Find and return credentials for the specified URL."""
@@ -261,7 +260,7 @@ def handle_401(self, resp: Response, **kwargs: Any) -> Response:
         # Query the keyring for credentials:
         username, password = self._get_new_credentials(
             resp.url,
-            allow_netrc=True,
+            allow_netrc=False,
             allow_keyring=True,
         )
 

diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
@@ -415,46 +415,3 @@ def get_credential(url, username):
         assert "get_credential was called" in result.stderr
     else:
         assert "get_credential was called" not in result.stderr
-
-
-def test_prioritize_url_credentials_over_netrc(
-    script: PipTestEnvironment,
-    data: TestData,
-    cert_factory: CertFactory,
-) -> None:
-    cert_path = cert_factory()
-    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ctx.load_cert_chain(cert_path, cert_path)
-    ctx.load_verify_locations(cafile=cert_path)
-    ctx.verify_mode = ssl.CERT_REQUIRED
-
-    server = make_mock_server(ssl_context=ctx)
-    server.mock.side_effect = [
-        package_page(
-            {
-                "simple-3.0.tar.gz": "/files/simple-3.0.tar.gz",
-            }
-        ),
-        authorization_response(str(data.packages / "simple-3.0.tar.gz")),
-    ]
-
-    url = f"https://USERNAME:PASSWORD@{server.host}:{server.port}/simple"
-
-    netrc = script.scratch_path / ".netrc"
-    netrc.write_text(
-        f"machine {server.host} login wrongusername password wrongpassword"
-    )
-    with server_running(server):
-        script.environ["NETRC"] = netrc
-        script.pip(
-            "install",
-            "--no-cache-dir",
-            "--index-url",
-            url,
-            "--cert",
-            cert_path,
-            "--client-cert",
-            cert_path,
-            "simple",
-        )
-        script.assert_installed(simple="3.0")