socketsecurity 0.0.92__tar.gz → 0.0.93__tar.gz

{socketsecurity-0.0.92/socketsecurity.egg-info → socketsecurity-0.0.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socketsecurity
-Version: 0.0.92
+Version: 0.0.93
 Summary: Socket Security CLI for CI/CD
 Author-email: Douglas Coburn <douglas@socket.dev>
 Maintainer-email: Douglas Coburn <douglas@socket.dev>

{socketsecurity-0.0.92 → socketsecurity-0.0.93}/socketsecurity/__init__.py

@@ -1,2 +1,2 @@
 __author__ = 'socket.dev'
-__version__ = '0.0.92'
+__version__ = '0.0.93'

{socketsecurity-0.0.92 → socketsecurity-0.0.93}/socketsecurity/core/__init__.py

@@ -64,10 +64,11 @@ def do_request(
         payload: [dict, str] = None,
         files: list = None,
         method: str = "GET",
+        base_url: str = None,
 ) -> requests.request:
     """
     do_requests is the shared function for making HTTP calls
-
+    :param base_url:
     :param path: Required path for the request
     :param headers: Optional dictionary of headers. If not set will use a default set
     :param payload: Optional dictionary or string of the payload to pass
@@ -75,8 +76,13 @@ def do_request(
     :param method: Optional method to use, defaults to GET
     :return:
     """
-    if encoded_key is None or encoded_key == "":
-        raise APIKeyMissing
+
+    if base_url is not None:
+        url = f"{base_url}/{path}"
+    else:
+        if encoded_key is None or encoded_key == "":
+            raise APIKeyMissing
+        url = f"{api_url}/{path}"
 
     if headers is None:
         headers = {
@@ -84,7 +90,6 @@ def do_request(
             'User-Agent': f'SocketPythonCLI/{__version__}',
             "accept": "application/json"
         }
-    url = f"{api_url}/{path}"
     response = requests.request(
         method.upper(),
         url,
@@ -93,8 +98,8 @@ def do_request(
         files=files,
         timeout=timeout
     )
-    output_headers = headers
-    output_headers['Authorization'] = "Basic API_KEY_REDACTED"
+    output_headers = headers.copy()
+    output_headers['Authorization'] = "API_KEY_REDACTED"
     output = {
         "url": url,
         "headers": output_headers,
@@ -108,14 +113,7 @@ def do_request(
     if response.status_code <= 399:
         return response
     elif response.status_code == 400:
-        print(f"url={url}")
-        print(f"payload={payload}")
-        print(f"files={files}")
-        error = {
-            "msg": "bad request",
-            "error": response.text
-        }
-        raise APIFailure(error)
+        raise APIFailure(output)
     elif response.status_code == 401:
         raise APIAccessDenied("Unauthorized")
     elif response.status_code == 403:

{socketsecurity-0.0.92 → socketsecurity-0.0.93}/socketsecurity/core/github.py

@@ -58,7 +58,6 @@ headers = {
     'User-Agent': 'SocketPythonScript/0.0.1',
     "accept": "application/json"
 }
-base_url = f"{github_api_url}/"
 
 
 class Github:
@@ -149,22 +148,22 @@ class Github:
     @staticmethod
     def post_comment(body: str) -> None:
         repo = github_repository.rsplit("/", 1)[1]
-        path = f"{base_url}repos/{github_repository_owner}/{repo}/issues/{pr_number}/comments"
+        path = f"repos/{github_repository_owner}/{repo}/issues/{pr_number}/comments"
         payload = {
             "body": body
         }
         payload = json.dumps(payload)
-        do_request(path, payload=payload, method="POST", headers=headers)
+        do_request(path, payload=payload, method="POST", headers=headers, base_url=github_api_url)
 
     @staticmethod
     def update_comment(body: str, comment_id: str) -> None:
         repo = github_repository.rsplit("/", 1)[1]
-        path = f"{base_url}repos/{github_repository_owner}/{repo}/issues/comments/{comment_id}"
+        path = f"repos/{github_repository_owner}/{repo}/issues/comments/{comment_id}"
         payload = {
             "body": body
         }
         payload = json.dumps(payload)
-        do_request(path, payload=payload, method="PATCH", headers=headers)
+        do_request(path, payload=payload, method="PATCH", headers=headers, base_url=github_api_url)
 
     @staticmethod
     def write_new_env(name: str, content: str) -> None:
@@ -175,8 +174,8 @@ class Github:
 
     @staticmethod
     def get_comments_for_pr(repo: str, pr: str) -> dict:
-        path = f"{base_url}repos/{github_repository_owner}/{repo}/issues/{pr}/comments"
-        raw_comments = do_request(path, headers=headers)
+        path = f"repos/{github_repository_owner}/{repo}/issues/{pr}/comments"
+        raw_comments = Comments.process_response(do_request(path, headers=headers, base_url=github_api_url))
         comments = {}
         if "error" not in raw_comments:
             for item in raw_comments:

{socketsecurity-0.0.92 → socketsecurity-0.0.93}/socketsecurity/core/gitlab.py

@@ -1,3 +1,4 @@
+import json
 import os
 from socketsecurity.core import log, do_request
 from socketsecurity.core.scm_comments import Comments
@@ -46,14 +47,12 @@ for env in gitlab_variables:
         value = globals()[var_name]
         log.debug(f"{env}={value}")
 
-base_url = f"{ci_api_v4_url}/"
 headers = {
     'Authorization': f"Bearer {gitlab_token}",
     'User-Agent': 'SocketPythonScript/0.0.1',
     "accept": "application/json"
 }
 
-
 class Gitlab:
     commit_sha: str
     api_url: str
@@ -141,24 +140,24 @@ class Gitlab:
 
     @staticmethod
     def post_comment(body: str) -> None:
-        path = f"{base_url}projects/{ci_merge_request_project_id}/merge_requests/{ci_merge_request_iid}/notes"
+        path = f"projects/{ci_merge_request_project_id}/merge_requests/{ci_merge_request_iid}/notes"
         payload = {
             "body": body
         }
-        do_request(path, payload=payload, method="POST", headers=headers)
+        do_request(path, payload=payload, method="POST", headers=headers, base_url=ci_api_v4_url)
 
     @staticmethod
     def update_comment(body: str, comment_id: str) -> None:
-        path = f"{base_url}projects/{ci_merge_request_project_id}/merge_requests/{ci_merge_request_iid}/notes/{comment_id}"
+        path = f"projects/{ci_merge_request_project_id}/merge_requests/{ci_merge_request_iid}/notes/{comment_id}"
         payload = {
             "body": body
         }
-        do_request(path, payload=payload, method="PUT", headers=headers)
+        do_request(path, payload=payload, method="PUT", headers=headers, base_url=ci_api_v4_url)
 
     @staticmethod
     def get_comments_for_pr(repo: str, pr: str) -> dict:
-        path = f"{base_url}projects/{ci_merge_request_project_id}/merge_requests/{ci_merge_request_iid}/notes"
-        raw_comments = do_request(path, headers=headers)
+        path = f"projects/{ci_merge_request_project_id}/merge_requests/{ci_merge_request_iid}/notes"
+        raw_comments = Comments.process_response(do_request(path, headers=headers, base_url=ci_api_v4_url))
         comments = {}
         if "message" not in raw_comments:
             for item in raw_comments:

{socketsecurity-0.0.92 → socketsecurity-0.0.93}/socketsecurity/core/scm_comments.py

@@ -1,7 +1,25 @@
 from socketsecurity.core.classes import Comment, Issue
+from socketsecurity.core import log
+from requests import Response
+import json
 
 
 class Comments:
+    @staticmethod
+    def process_response(response: Response) -> dict:
+        output = {}
+        try:
+            output = response.json()
+        except Exception as error:
+            log.debug("Unable to parse comment response json, trying as text")
+            log.debug(error)
+            try:
+                output = json.loads(response.text)
+            except Exception as error:
+                log.error("Unable to process comment data, unable to get previous comment data")
+                log.error(error)
+        return output
+
     @staticmethod
     def remove_alerts(comments: dict, new_alerts: list) -> list:
         alerts = []

{socketsecurity-0.0.92 → socketsecurity-0.0.93}/socketsecurity/socketcli.py

@@ -169,7 +169,8 @@ def main_code():
     arguments = parser.parse_args()
     debug = arguments.enable_debug
     if debug:
-        logging.basicConfig(level=logging.DEBUG)
+        log.setLevel(logging.DEBUG)
+        log.debug("Debug logging enabled")
     repo = arguments.repo
     branch = arguments.branch
     commit_message = arguments.commit_message

{socketsecurity-0.0.92 → socketsecurity-0.0.93/socketsecurity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socketsecurity
-Version: 0.0.92
+Version: 0.0.93
 Summary: Socket Security CLI for CI/CD
 Author-email: Douglas Coburn <douglas@socket.dev>
 Maintainer-email: Douglas Coburn <douglas@socket.dev>