security: address PR review - fix exception types to github.GithubException, expand token regex, remove unused requests import, fix spelling (fixes #288)

Author: GaneshPatil7517

contribute.py

@@ -1,9 +1,8 @@
 import github
 from github import Github
 import os,sys,platform,base64,time,re
-import requests
 
-# Intializing the Variables
+# Initializing the Variables
 BOT_TOKEN = os.environ.get('CONCORE_BOT_TOKEN', '')
 
 # Fix 1: Fail fast if token is missing
@@ -12,7 +11,7 @@
     sys.exit(1)
 
 # Fix 2: Token format validation
-token_pattern = r"^(ghp_|github_pat_)[A-Za-z0-9_]{20,}$"
+token_pattern = r"^((ghp_|github_pat_|ghs_)[A-Za-z0-9_]{20,}|[0-9a-fA-F]{40})$"
 if not re.match(token_pattern, BOT_TOKEN):
     print("Error: Invalid GitHub token format.")
     sys.exit(1)
@@ -32,25 +31,21 @@ def checkInputValidity():
         print("Please Provide necessary Inputs")
         exit(1)
     if not os.path.isdir(STUDY_NAME_PATH):
-        print("Directory doesnot Exists.Invalid Path")
+        print("Directory does not Exists.Invalid Path")
         exit(1)
 
-# Fix 5: Retry + backoff wrapper for GitHub API requests
-def github_request(method, url, headers=None, json=None, retries=3):
+# Fix 5: Retry + backoff wrapper for PyGithub operations
+def with_retry(operation, retries=3):
+    """Retry wrapper for PyGithub operations with exponential backoff."""
     for attempt in range(retries):
         try:
-            response = requests.request(method, url, headers=headers, json=json, timeout=30)
-            if response.status_code == 429 or response.status_code >= 500:
+            return operation()
+        except github.GithubException as e:
+            if (e.status == 429 or e.status >= 500) and attempt < retries - 1:
                 wait_time = 2 ** attempt
                 time.sleep(wait_time)
                 continue
-            return response
-        except requests.exceptions.ConnectionError:
-            print("Network error while contacting GitHub API.")
-            sys.exit(1)
-        except requests.exceptions.Timeout:
-            print("GitHub API request timed out.")
-            sys.exit(1)
+            raise
     print("Error: GitHub API request failed after retries.")
     sys.exit(1)
 
@@ -62,11 +57,11 @@ def anyOpenPR(upstream_repo):
     try:
         prs = upstream_repo.get_pulls(state='open', head=f'{BOT_ACCOUNT}:{BRANCH_NAME}')
         return prs[0] if prs.totalCount > 0 else None
-    except requests.exceptions.ConnectionError:
-        print("Network error while fetching PR status.")
-        exit(1)
-    except requests.exceptions.Timeout:
-        print("Request timed out while fetching PR status.")
+    except github.GithubException as e:
+        if e.status == 429 or e.status >= 500:
+            print("GitHub API rate limit or server error while fetching PR status.")
+        else:
+            print("Unable to fetch PR status. Try again later.")
         exit(1)
     except Exception:
         print("Unable to fetch PR status. Try again later.")
@@ -81,8 +76,8 @@ def commitAndUpdateRef(repo,tree_content,commit,branch):
             exit(1)
         ref = repo.get_git_ref("heads/"+branch.name)
         ref.edit(new_commit.sha,True)
-    except requests.exceptions.HTTPError as e:
-        print(f"GitHub API error: {e.response.status_code}")
+    except github.GithubException as e:
+        print(f"GitHub API error: {e.status}")
         exit(1)
     except Exception:
         print("Failed to upload your example. Please try after some time.",end="")
@@ -103,8 +98,8 @@ def runWorkflow(repo,upstream_repo):
                 inputs={'title': f"[BOT]: {PR_TITLE}", 'body': PR_BODY, 'upstreamRepo': UPSTREAM_ACCOUNT, 'botRepo': BOT_ACCOUNT, 'repo': REPO_NAME}
             )
             printPRStatus(upstream_repo)
-        except requests.exceptions.HTTPError as e:
-            print(f"GitHub API error while triggering workflow: {e.response.status_code}")
+        except github.GithubException as e:
+            print(f"GitHub API error while triggering workflow: {e.status}")
             exit(1)
         except Exception:
             print("Error triggering workflow. Try again later.")
@@ -161,11 +156,8 @@ def remove_prefix(text, prefix):
     except github.GithubException:
         print(f"No Branch is available with the name {BRANCH_NAME}")
         is_present = False
-except requests.exceptions.ConnectionError:
-    print("Network error during GitHub authentication.")
-    exit(1)
-except requests.exceptions.Timeout:
-    print("GitHub authentication request timed out.")
+except github.GithubException as e:
+    print(f"GitHub API error during authentication: {e.status}")
     exit(1)
 except Exception:
     print("Authentication failed", end="")
@@ -200,14 +192,8 @@ def remove_prefix(text, prefix):
             appendBlobInTree(repo,content,file_path,tree_content)
     commitAndUpdateRef(repo,tree_content,base_ref.commit,branch)
     runWorkflow(repo,upstream_repo)
-except requests.exceptions.HTTPError as e:
-    print(f"GitHub API error: {e.response.status_code}")
-    exit(1)
-except requests.exceptions.ConnectionError:
-    print("Network error while uploading study.")
-    exit(1)
-except requests.exceptions.Timeout:
-    print("Request timed out while uploading study.")
+except github.GithubException as e:
+    print(f"GitHub API error: {e.status}")
     exit(1)
 except Exception:
     print("Some error occurred. Please try again after some time.",end="")