Fix incorrect netrc format assumption

According to the netrc specification (see [1] and [2]), the `machine`
part should not be a full URL, but only a host name.
Before, using the correct netrc format with only a host name did not
work for authentication purposes in Python Inspector.
Fix this by using urllib.parse to find the matching host name.

[1]: https://www.ibm.com/docs/en/aix/7.2.0?topic=formats-netrc-file-format-tcpip
[2]: https://docs.python.org/3/library/netrc.html#netrc.netrc.hosts

Resolves: #176.

Signed-off-by: Marcel Bochtler <[email protected]>

Author: MarcelBochtler

src/python_inspector/utils.py

@@ -16,18 +16,21 @@
 from typing import NamedTuple
 from typing import Optional
 
+from urllib.parse import urlparse
+
 import aiohttp
 import requests
 
 
 def get_netrc_auth(url, netrc):
     """
-    Return login and password if url is in netrc
+    Return login and password if the hostname is in netrc
     else return login and password as None
     """
+    hostname = urlparse(url).hostname
     hosts = netrc.hosts
-    if url in hosts:
-        url_auth = hosts.get(url)
+    if hostname in hosts:
+        url_auth = hosts.get(hostname)
         # netrc returns a tuple of (login, account, password)
         return (url_auth[0], url_auth[2])
     return (None, None)

tests/data/test-commented.netrc

@@ -1,2 +1,2 @@
-machine https://pyp2.org/simple login test password test123
-# machine https://pyp1.org/simple login test password test123
+machine pyp2.org login test password test123
+# machine pyp1.org login test password test123

tests/data/test.netrc

@@ -1 +1,2 @@
-machine https://pyp1.org/simple login test password test123
+machine pyp1.org login test password test123
+machine subdomain.example.com login subdomain-user password subdomain-secret

tests/test_utils.py

@@ -35,6 +35,25 @@ def test_get_netrc_auth():
     netrc_file = test_env.get_test_loc("test.netrc")
     parsed_netrc = netrc(netrc_file)
     assert get_netrc_auth(url="https://pyp1.org/simple", netrc=parsed_netrc) == ("test", "test123")
+    assert get_netrc_auth(url="https://pyp1.org/different/path", netrc=parsed_netrc) == (
+        "test",
+        "test123",
+    )
+    assert get_netrc_auth(url="https://pyp1.org", netrc=parsed_netrc) == ("test", "test123")
+
+
+def test_get_netrc_auth_with_ports_and_schemes():
+    netrc_file = test_env.get_test_loc("test.netrc")
+    parsed_netrc = netrc(netrc_file)
+
+    assert get_netrc_auth(url="https://pyp1.org:443/path", netrc=parsed_netrc) == (
+        "test",
+        "test123",
+    )
+    assert get_netrc_auth(url="http://pyp1.org:80/simple", netrc=parsed_netrc) == (
+        "test",
+        "test123",
+    )
 
 
 def test_get_commented_netrc_auth():
@@ -49,6 +68,20 @@ def test_get_netrc_auth_with_no_matching_url():
     assert get_netrc_auth(url="https://pypi2.org/simple", netrc=parsed_netrc) == (None, None)
 
 
+def test_get_netrc_auth_with_with_subdomains():
+    netrc_file = test_env.get_test_loc("test.netrc")
+    parsed_netrc = netrc(netrc_file)
+
+    assert get_netrc_auth(url="https://subdomain.example.com/simple", netrc=parsed_netrc) == (
+        "subdomain-user",
+        "subdomain-secret",
+    )
+    assert get_netrc_auth(url="https://another.example.com/simple", netrc=parsed_netrc) == (
+        None,
+        None,
+    )
+
+
 @pytest.mark.asyncio
 @pytest.mark.skipif(sys.version_info < (3, 8), reason="requires python3.8 or higher")
 @mock.patch("python_inspector.utils_pypi.CACHE.get")