t-bug-catcher 0.6.2__tar.gz → 0.6.4__tar.gz

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t_bug_catcher
-Version: 0.6.2
+Version: 0.6.4
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful
@@ -14,7 +14,6 @@ Requires-Python: >=3.9
 Requires-Dist: requests<3.0.0,>=2.31.0
 Requires-Dist: bugsnag>=4.6.1
 Requires-Dist: retry~=0.9.2
-Requires-Dist: whispers>=2.2.1
 
 t-bug-catcher
 ==============

t_bug_catcher-0.6.2/t_bug_catcher.egg-info/requires.txt → t_bug_catcher-0.6.4/requirements.txt

@@ -1,4 +1,3 @@
 requests<3.0.0,>=2.31.0
 bugsnag>=4.6.1
-retry~=0.9.2
-whispers>=2.2.1
+retry~=0.9.2

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.2
+current_version = 0.6.4
 commit = True
 tag = False
 

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/setup.py

@@ -26,7 +26,7 @@ setup(
     packages=find_packages(include=["t_bug_catcher", "t_bug_catcher.*"]),
     test_suite="tests",
     url="https://www.thoughtful.ai/",
-    version="0.6.2",
+    version="0.6.4",
     zip_safe=False,
     install_requires=install_requirements,
     include_package_data=True,

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/t_bug_catcher/__init__.py

@@ -3,7 +3,7 @@
 __author__ = """Thoughtful"""
 __email__ = "support@thoughtful.ai"
 # fmt: off
-__version__ = '0.6.2'
+__version__ = '0.6.4'
 # fmt: on
 
 from .bug_catcher import (

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/t_bug_catcher/config.py

@@ -32,6 +32,20 @@ class Config:
     BC_BOARD = "BC"
 
     KEYS_TO_REMOVE = ["credential", "password"]
+
+    SENSITIVE_KEYS = [
+        r"user(?:name|_name)?",
+        r"id",
+        r"uid",
+        r"otp",
+        r"api(?:[_]?key|[_]?token)",
+        r"\w+api(?:[_]?key|[_]?token)",
+        r"key",
+        r"account",
+        r"client_(?:id|secret)",
+    ]
+    PARTIAL_MATCH_KEYS = [r"login", r"password", r"token", r"secret"]
+
     BUILD_INFO_FILE = "commit_info.json"
 
     HOST = socket.gethostname() if os.name.lower() == "nt" else None

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/t_bug_catcher/jira.py

@@ -1155,7 +1155,7 @@ class Jira:
                 else []
             )
 
-        if len(issue.get("fields", {}).get("comment", [])) >= CONFIG.LIMITS.COMMENT_LIMIT:
+        if len(issue.get("fields", {}).get("comment", {}).get("comments", [])) >= CONFIG.LIMITS.COMMENT_LIMIT:
             logger.warning(
                 f"Comments for '{issue.get('key')}' were not posted due to exceeding JIRA comments limit "
                 f"({CONFIG.LIMITS.COMMENT_LIMIT})."
@@ -1355,10 +1355,6 @@ class Jira:
             group_id = self.generate_group_id(group_by)
 
             all_issues = self.get_issues()["issues"]
-            existing_ticket = self.filter_tickets(
-                all_tickets=all_issues,
-                error_id=error_id,
-            )
 
             if group_id:
                 existing_tickets = [
@@ -1376,6 +1372,11 @@ class Jira:
             else:
                 summary = self.__create_summary(type(exception), exception, exception.__traceback__)
 
+            existing_ticket = self.filter_tickets(
+                all_tickets=all_issues,
+                error_id=error_id,
+            )
+
             if existing_ticket:
                 self.__update_existing_ticket(
                     existing_ticket=existing_ticket,

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/t_bug_catcher/stack_saver.py

@@ -3,12 +3,9 @@ import linecache
 import re
 import sys
 from datetime import datetime
-from pathlib import Path
 from types import FunctionType, ModuleType
 from typing import Optional
 
-import whispers
-
 from .config import CONFIG
 from .utils import logger
 from .utils.common import Encoder, convert_keys_to_primitives, strip_path
@@ -74,31 +71,46 @@ class StackSaver:
         Returns:
             None
         """
+        partial_match_pattern = re.compile(
+            r"(['\"])([^'\"]*?(%s)[^'\"]*?)(['\"])\s*([:,])\s*(['\"])([^'\"]*)(['\"])"
+            % (r"|".join(CONFIG.PARTIAL_MATCH_KEYS)),
+            re.IGNORECASE,
+        )
+
+        full_match_pattern = re.compile(
+            r"(['\"])(%s)(['\"])\s*([:,])\s*(['\"])([^'\"]*)(['\"])" % (r"|".join(CONFIG.SENSITIVE_KEYS)), re.IGNORECASE
+        )
+
         with open(file_path, "r") as f:
-            filedata = f.readlines()
+            filedata = f.read()
 
-        config_path = Path(__file__).parent.resolve().as_posix() + "/resources/whispers_config.yml"
+        partial_replace = self.mask_data((1, 2, 5))
+        full_replace = self.mask_data((1, 2, 4))
 
-        args = f"-c {config_path} {file_path}"
+        masked_data = partial_match_pattern.sub(partial_replace, filedata)
+        masked_data = full_match_pattern.sub(full_replace, masked_data)
 
-        secrets = [secret for secret in whispers.secrets(args)]
+        with open(file_path, "w") as file:
+            file.write(masked_data)
 
-        for index, line in enumerate(filedata):
-            if not secrets:
-                break
+    def mask_data(self, indicates: tuple):
+        """A method to mask the data.
 
-            for secret in secrets:
-                if secret.key in line and secret.value in line:
-                    filedata[index] = line.replace(secret.value, secret.value[:1] + "***")
-                    secrets.pop(secrets.index(secret))
-                    break
+        Args:
+            indicates (tuple): The indicates of the data to be masked.
 
-        if secrets:
-            logger.warning("Failed to mask credentials")
-            raise Exception("Failed to mask credentials")
+        Returns:
+            function: The function to mask the data.
+        """
 
-        with open(file_path, "w") as file:
-            file.writelines(filedata)
+        def mask_sensitive(match):
+            if match.group(2):
+                quote = match.group(indicates[0])
+                key_part = match.group(indicates[1])
+                delimiter = match.group(indicates[2])
+                return f"{quote}{key_part}{quote}{delimiter} {quote}***{quote}"
+
+        return mask_sensitive
 
     def save_stack_trace(self, exception: Optional[Exception] = None):
         """A method to save the stack trace.

{t_bug_catcher-0.6.2 → t_bug_catcher-0.6.4}/t_bug_catcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t_bug_catcher
-Version: 0.6.2
+Version: 0.6.4
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful
@@ -14,7 +14,6 @@ Requires-Python: >=3.9
 Requires-Dist: requests<3.0.0,>=2.31.0
 Requires-Dist: bugsnag>=4.6.1
 Requires-Dist: retry~=0.9.2
-Requires-Dist: whispers>=2.2.1
 
 t-bug-catcher
 ==============

t_bug_catcher-0.6.2/requirements.txt → t_bug_catcher-0.6.4/t_bug_catcher.egg-info/requires.txt

@@ -1,4 +1,3 @@
 requests<3.0.0,>=2.31.0
 bugsnag>=4.6.1
 retry~=0.9.2
-whispers>=2.2.1