testit-cli 2.4.8__tar.gz → 2.4.10__tar.gz

{testit_cli-2.4.8 → testit_cli-2.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-cli
-Version: 2.4.8
+Version: 2.4.10
 Summary: This tool is the command line wrapper of Test IT allowing you to upload the test results in real time to Test IT
 Home-page: https://pypi.org/project/testit-cli/
 Author: Integration team
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: testit-api-client==6.1.1
+Requires-Dist: testit-api-client==6.2.0
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4

{testit_cli-2.4.8 → testit_cli-2.4.10}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "2.4.8"
+VERSION = "2.4.10"
 
 setup(
     name='testit-cli',
@@ -26,7 +26,7 @@ setup(
     py_modules=['testit_cli'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['testit-api-client==6.1.1', 'validators', 'tqdm', 'click~=8.0.4'],
+    install_requires=['testit-api-client==6.2.0', 'validators', 'tqdm', 'click~=8.0.4'],
     entry_points={
         'console_scripts': [
             'testit = testit_cli.__main__:console_main'

{testit_cli-2.4.8 → testit_cli-2.4.10}/src/testit_cli/apiclient.py

@@ -11,6 +11,7 @@ from testit_api_client.models import TestResultShortResponse
 
 from .converter import Converter
 from .models.testrun import TestRun
+from .html_escape_utils import HtmlEscapeUtils
 
 
 class ApiClient:
@@ -34,6 +35,7 @@ class ApiClient:
     def create_test_run(self, project_id: str, name: str) -> TestRun:
         """Function creates test run and returns test run id."""
         model = CreateEmptyTestRunApiModel(project_id=project_id, name=name)
+        model = HtmlEscapeUtils.escape_html_in_object(model)
         logging.debug(f"Creating test run with model: {model}")
 
         test_run = self.__test_run_api.create_empty(model)
@@ -46,6 +48,7 @@ class ApiClient:
     def update_test_run(self, test_run: TestRun):
         """Function updates test run."""
         model = Converter.test_run_to_update_empty_request(test_run)
+        model = HtmlEscapeUtils.escape_html_in_object(model)
         logging.debug(f"Updating test run with model: {model}")
 
         self.__test_run_api.update_empty(model)
@@ -86,6 +89,8 @@ class ApiClient:
 
     def create_autotest(self, model: Converter.test_result_to_create_autotest_request):
         """Function creates autotest and returns autotest id."""
+        model = HtmlEscapeUtils.escape_html_in_object(model)
+
         logging.debug(f"Creating autotest {model}")
 
         response = self.__autotest_api.create_auto_test(auto_test_post_model=model)
@@ -97,6 +102,8 @@ class ApiClient:
     def update_autotest(self, model: Converter.test_result_to_update_autotest_request):
         """Function updates autotest"""
         try:
+            model = HtmlEscapeUtils.escape_html_in_object(model)
+
             logging.debug(f"Updating autotest {model}")
 
             self.__autotest_api.update_auto_test(auto_test_put_model=model)
@@ -110,6 +117,8 @@ class ApiClient:
     ):
         """Function sends autotest result to test run"""
         try:
+            model = HtmlEscapeUtils.escape_html_in_object(model)
+
             logging.debug(f"Adding autotest results to testrun {testrun_id}: {model}")
 
             self.__test_run_api.set_auto_test_results_for_test_run(
@@ -127,16 +136,15 @@ class ApiClient:
 
         for attachment in attachments:
             if os.path.isfile(attachment):
-                with open(attachment, "rb+") as file:
-                    try:
-                        attachment_response = self.__attachments_api.api_v2_attachments_post(
-                            file=(file.name, file.read()))
+                try:
+                    attachment_response = self.__attachments_api.api_v2_attachments_post(
+                        file=attachment)
 
-                        attachment_ids.append(AssignAttachmentApiModel(id=attachment_response.id))
+                    attachment_ids.append(AssignAttachmentApiModel(id=attachment_response.id))
 
-                        logging.debug(f'Attachment "{attachment}" was uploaded')
-                    except Exception as exc:
-                        logging.error(f'Upload attachment "{attachment}" status: {exc}')
+                    logging.debug(f'Attachment "{attachment}" was uploaded')
+                except Exception as exc:
+                    logging.error(f'Upload attachment "{attachment}" status: {exc}')
             else:
                 logging.error(f'File "{attachment}" was not found!')
 

testit_cli-2.4.10/src/testit_cli/html_escape_utils.py

@@ -0,0 +1,212 @@
+import os
+import re
+import logging
+from typing import Any, List, Optional
+from datetime import datetime, date, time, timedelta
+from decimal import Decimal
+from uuid import UUID
+
+
+class HtmlEscapeUtils:
+    """
+    HTML escape utilities for preventing XSS attacks.
+    Escapes HTML tags in strings and objects using reflection.
+    """
+
+    NO_ESCAPE_HTML_ENV_VAR = "NO_ESCAPE_HTML"
+
+    # Regex pattern to detect HTML tags (requires at least one non-whitespace character after <)
+    # This ensures empty <> brackets are not considered HTML tags
+    _HTML_TAG_PATTERN = re.compile(r'<\S.*?(?:>|/>)')
+
+    # Regex patterns to escape only non-escaped characters
+    # Using negative lookbehind to avoid double escaping
+    _LESS_THAN_PATTERN = re.compile(r'(?<!\\)<')
+    _GREATER_THAN_PATTERN = re.compile(r'(?<!\\)>')
+
+    @staticmethod
+    def escape_html_tags(text: Optional[str]) -> Optional[str]:
+        """
+        Escapes HTML tags to prevent XSS attacks.
+        First checks if the string contains HTML tags using regex pattern.
+        Only performs escaping if HTML tags are detected.
+        Escapes all < as \\< and > as \\> only if they are not already escaped.
+        Uses regex with negative lookbehind to avoid double escaping.
+
+        Args:
+            text: The text to escape
+
+        Returns:
+            Escaped text or original text if escaping is disabled
+        """
+        if text is None:
+            return None
+
+        # Check if escaping is disabled via environment variable
+        no_escape_html = os.environ.get(HtmlEscapeUtils.NO_ESCAPE_HTML_ENV_VAR, "").lower()
+        if no_escape_html == "true":
+            return text
+
+        # First check if the string contains HTML tags
+        if not HtmlEscapeUtils._HTML_TAG_PATTERN.search(text):
+            return text  # No HTML tags found, return original string
+
+        # Use regex with negative lookbehind to escape only non-escaped characters
+        result = HtmlEscapeUtils._LESS_THAN_PATTERN.sub(r'\\<', text)
+        result = HtmlEscapeUtils._GREATER_THAN_PATTERN.sub(r'\\>', result)
+
+        return result
+
+    @staticmethod
+    def escape_html_in_object(obj: Any) -> Any:
+        """
+        Escapes HTML tags in all string attributes of an object using reflection.
+        Also processes list attributes: if list of objects - calls escape_html_in_object_list,
+        if list of strings - escapes each string.
+        Can be disabled by setting NO_ESCAPE_HTML environment variable to "true".
+
+        Args:
+            obj: The object to process
+
+        Returns:
+            The processed object with escaped strings
+        """
+        if obj is None:
+            return None
+
+        # Check if escaping is disabled via environment variable
+        no_escape_html = os.environ.get(HtmlEscapeUtils.NO_ESCAPE_HTML_ENV_VAR, "").lower()
+        if no_escape_html == "true":
+            return obj
+
+        try:
+            HtmlEscapeUtils._process_object_attributes(obj)
+        except Exception as e:
+            # Silently ignore reflection errors
+            logging.debug(f"Error processing object attributes: {e}")
+
+        return obj
+
+    @staticmethod
+    def escape_html_in_object_list(obj_list: Optional[List[Any]]) -> Optional[List[Any]]:
+        """
+        Escapes HTML tags in all string attributes of objects in a list using reflection.
+        Can be disabled by setting NO_ESCAPE_HTML environment variable to "true".
+
+        Args:
+            obj_list: The list of objects to process
+
+        Returns:
+            The processed list with escaped strings in all objects
+        """
+        if obj_list is None:
+            return None
+
+        # Check if escaping is disabled via environment variable
+        no_escape_html = os.environ.get(HtmlEscapeUtils.NO_ESCAPE_HTML_ENV_VAR, "").lower()
+        if no_escape_html == "true":
+            return obj_list
+
+        for obj in obj_list:
+            HtmlEscapeUtils.escape_html_in_object(obj)
+
+        return obj_list
+
+    @staticmethod
+    def _process_object_attributes(obj: Any) -> None:
+        """
+        Process all attributes of an object for HTML escaping.
+        """
+        # Handle dictionary-like objects (common in API models)
+        if hasattr(obj, '__dict__'):
+            for attr_name in dir(obj):
+                # Skip private/protected attributes and methods
+                if attr_name.startswith('_') or callable(getattr(obj, attr_name, None)):
+                    continue
+
+                try:
+                    value = getattr(obj, attr_name)
+                    HtmlEscapeUtils._process_attribute_value(obj, attr_name, value)
+                except Exception as e:
+                    # Silently ignore attribute errors
+                    logging.debug(f"Error processing attribute {attr_name}: {e}")
+
+        # Handle dictionary objects
+        elif isinstance(obj, dict):
+            for key, value in obj.items():
+                if isinstance(value, str):
+                    obj[key] = HtmlEscapeUtils.escape_html_tags(value)
+                elif isinstance(value, list):
+                    HtmlEscapeUtils._process_list(value)
+                elif not HtmlEscapeUtils._is_simple_type(type(value)):
+                    HtmlEscapeUtils.escape_html_in_object(value)
+
+    @staticmethod
+    def _process_attribute_value(obj: Any, attr_name: str, value: Any) -> None:
+        """
+        Process a single attribute value for HTML escaping.
+        """
+        if isinstance(value, str):
+            # Escape string attributes
+            try:
+                setattr(obj, attr_name, HtmlEscapeUtils.escape_html_tags(value))
+            except AttributeError:
+                # Attribute might be read-only
+                pass
+        elif isinstance(value, list):
+            HtmlEscapeUtils._process_list(value)
+        elif value is not None and not HtmlEscapeUtils._is_simple_type(type(value)):
+            # Process nested objects (but not simple types)
+            HtmlEscapeUtils.escape_html_in_object(value)
+
+    @staticmethod
+    def _process_list(lst: List[Any]) -> None:
+        """
+        Process a list for HTML escaping.
+        """
+        if not lst:
+            return
+
+        first_element = lst[0]
+
+        if isinstance(first_element, str):
+            # List of strings - escape each string
+            for i, item in enumerate(lst):
+                if isinstance(item, str):
+                    lst[i] = HtmlEscapeUtils.escape_html_tags(item)
+        elif first_element is not None:
+            # List of objects - process each object
+            for item in lst:
+                HtmlEscapeUtils.escape_html_in_object(item)
+
+    @staticmethod
+    def _is_simple_type(obj_type: type) -> bool:
+        """
+        Checks if a type is a simple type that doesn't need HTML escaping.
+
+        Args:
+            obj_type: Type to check
+
+        Returns:
+            True if it's a simple type
+        """
+        simple_types = {
+            # Basic types
+            bool, int, float, complex, bytes, bytearray,
+            # String type (handled separately)
+            str,
+            # Date/time types
+            datetime, date, time, timedelta,
+            # Other common types
+            Decimal, UUID,
+            # None type
+            type(None)
+        }
+
+        return (
+            obj_type in simple_types or
+            # Check for enums
+            (hasattr(obj_type, '__bases__') and any(
+                base.__name__ == 'Enum' for base in obj_type.__bases__
+            ))
+        )

{testit_cli-2.4.8 → testit_cli-2.4.10}/src/testit_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-cli
-Version: 2.4.8
+Version: 2.4.10
 Summary: This tool is the command line wrapper of Test IT allowing you to upload the test results in real time to Test IT
 Home-page: https://pypi.org/project/testit-cli/
 Author: Integration team
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: testit-api-client==6.1.1
+Requires-Dist: testit-api-client==6.2.0
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4

{testit_cli-2.4.8 → testit_cli-2.4.10}/src/testit_cli.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/testit_cli/converter.py
 src/testit_cli/dir_worker.py
 src/testit_cli/file_worker.py
 src/testit_cli/filter_factory.py
+src/testit_cli/html_escape_utils.py
 src/testit_cli/importer.py
 src/testit_cli/logger.py
 src/testit_cli/parser.py

{testit_cli-2.4.8 → testit_cli-2.4.10}/src/testit_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-testit-api-client==6.1.1
+testit-api-client==6.2.0
 validators
 tqdm
 click~=8.0.4