Use authenticated requests for GitHub REST API calls

Signed-off-by: Keshav Priyadarshi <[email protected]>

Author: keshav-space

src/fetchcode/package_util.py

@@ -55,7 +55,7 @@ def get_default_package(cls, purl):
         namespace = purl.namespace
         base_path = "https://api.github.com/repos"
         api_url = f"{base_path}/{namespace}/{name}"
-        response = utils.get_response(api_url)
+        response = utils.get_github_rest(api_url)
         homepage_url = response.get("homepage")
         vcs_url = response.get("git_url")
         github_url = "https://github.com"
@@ -123,7 +123,7 @@ def _get_github_packages(purl, version_regex, ignored_tag_regex, default_package
         else:
             version = tag
 
-        version = version.strip("Vv").strip()
+        version = version.strip("Vv").strip().replace("_", ".")
         if not version or not version[0].isdigit():
             continue
 
@@ -227,7 +227,7 @@ def get_package_info(cls, gh_purl):
             package_dict["type"] = "openssl"
             package_dict["namespace"] = None
             package_dict["name"] = "openssl"
-            package_dict["version"] = package_dict["version"].replace("_", ".")
+            package_dict["version"] = package_dict["version"]
 
             yield package_from_dict(package_dict)
 
@@ -251,7 +251,7 @@ def get_package_info(cls, gh_purl):
             package_dict["type"] = "generic"
             package_dict["namespace"] = None
             package_dict["name"] = "erofs-utils"
-            package_dict["version"] = package_dict["version"].replace("_", ".")
+            package_dict["version"] = package_dict["version"]
 
             yield package_from_dict(package_dict)
 
@@ -279,7 +279,7 @@ def get_package_info(cls, gh_purl, package_name):
             package_dict["type"] = "generic"
             package_dict["namespace"] = None
             package_dict["name"] = package_name
-            package_dict["version"] = package_dict["version"].replace("_", ".")
+            package_dict["version"] = package_dict["version"]
 
             yield package_from_dict(package_dict)
 

src/fetchcode/utils.py

@@ -117,14 +117,18 @@ class GitHubTokenError(Exception):
 class GraphQLError(Exception):
     pass
 
-
-def github_response(graphql_query):
+def get_github_token():
     gh_token = os.environ.get("GH_TOKEN", None)
     if not gh_token:
         from dotenv import load_dotenv
 
         load_dotenv()
         gh_token = os.environ.get("GH_TOKEN", None)
+    return gh_token
+
+
+def github_response(graphql_query):
+    gh_token = get_github_token()
 
     if not gh_token:
         msg = (
@@ -148,12 +152,21 @@ def github_response(graphql_query):
 
     return response
 
+def get_github_rest(url):
+    headers = None
+    if gh_token := get_github_token():
+        headers = {
+            "Authorization": f"Bearer {gh_token}",
+        }
+
+    return get_response(url, headers)
+
 
-def get_response(url):
+def get_response(url, headers=None):
     """
     Generate `Package` object for a `url` string
     """
-    resp = requests.get(url)
+    resp = requests.get(url, headers=headers)
     if resp.status_code == 200:
         return resp.json()