troubadix 25.9.1__py3-none-any.whl → 25.10.7__py3-none-any.whl

troubadix/__version__.py

@@ -2,4 +2,4 @@
 
 # THIS IS AN AUTOGENERATED FILE. DO NOT TOUCH!
 
-__version__ = "25.9.1"
+__version__ = "25.10.7"

troubadix/plugins/badwords.py

@@ -43,6 +43,7 @@ _IGNORE_FILES = [
     "http_func.inc",
     "misc_func.inc",
     "OpenVAS_detect.nasl",
+    "gb_greenbone_os_consolidation.nasl",
 ]
 
 EXCEPTIONS = [
@@ -79,6 +80,8 @@ EXCEPTIONS = [
     "OpenVAS / Greenbone Vulnerability Manager",
     "openvas_1808149858",
     "OSPD-OpenVAS",
+    "OPENVAS SCAN",
+    "openvas_scan",
     "evil.zip -> openvas.jsp",
     'url = "/openvas.jsp";',
     'if( "OpenVAS RCE Test" >< buf )',

troubadix/plugins/grammar.py

@@ -110,6 +110,8 @@ exceptions = [
     # The default has been changed to prompt the user each time a website
     # requests a client certificate.
     TextCheck("a website requests a client certificate"),
+    # This is actually a given name
+    TextCheck("and Or Cohen"),
 ]
 
 
@@ -208,14 +210,23 @@ class CheckGrammar(FilePlugin):
 
         for match in pattern.finditer(self.context.file_content):
             if match:
+
+                # nb: No strip() here for so that the exclusions can be handled
+                # more strict with e.g. leading or trailing newlines.
+                full_line = match.group(0)
+
                 if handle_linguistic_checks(
-                    str(self.context.nasl_file), match.group(0), exceptions
+                    str(self.context.nasl_file), full_line, exceptions
                 ):
                     continue
 
+                stripped_line = full_line.strip()
+                stripped_hit = match.group(1).strip()
+
                 yield LinterError(
                     "VT/Include has the following grammar problem:"
-                    f" {match.group(0)}",
+                    f"\n- Hit: {stripped_hit}"
+                    f"\n- Full line: {stripped_line}",
                     file=self.context.nasl_file,
                     plugin=self.name,
                 )

troubadix/plugins/script_add_preference_type.py

@@ -17,6 +17,7 @@
 
 # pylint: disable=fixme
 
+import re
 from enum import Enum
 from pathlib import Path
 from typing import Iterator
@@ -27,6 +28,10 @@ from troubadix.helper.patterns import (
 )
 from troubadix.plugin import FileContentPlugin, LinterError, LinterResult
 
+TYPE_PATTERN = re.compile(
+    r'type\s*:\s*(?P<quote>[\'"])(?P<type>[^\'"]+)(?P=quote)'
+)
+
 
 class ValidType(Enum):
     CHECKBOX = "checkbox"
@@ -36,6 +41,9 @@ class ValidType(Enum):
     ENTRY = "entry"
 
 
+VALID_TYPES = {t.value for t in ValidType}
+
+
 class CheckScriptAddPreferenceType(FileContentPlugin):
     name = "check_script_add_preference_type"
 
@@ -65,30 +73,43 @@ class CheckScriptAddPreferenceType(FileContentPlugin):
         if "script_add_preference" not in file_content:
             return
 
+        # Primary regex to capture all script_add_preference calls
         preferences_matches = _get_special_script_tag_pattern(
             name=SpecialScriptTag.ADD_PREFERENCE.value,
-            value=r'type\s*:\s*(?P<quote>[\'"])(?P<type>[^\'"]+)'
-            r"(?P=quote)\s*[^)]*",
         ).finditer(file_content)
 
+        # Secondary regex to extract type from the captured value (parameter list)
         for preferences_match in preferences_matches:
-            if preferences_match:
-                pref_type = preferences_match.group("type")
-                if pref_type not in [t.value for t in ValidType]:
-                    # nb: This exists since years and it is currently
-                    # unclear if we can change it so
-                    # we're excluding it here for now.
-                    if (
-                        "ssh_authorization_init.nasl" in nasl_file.name
-                        and pref_type == "sshlogin"
-                    ):
-                        continue
-
-                    yield LinterError(
-                        "VT is using an invalid or misspelled string "
-                        f"({pref_type}) passed to the type parameter of "
-                        "script_add_preference in "
-                        f"'{preferences_match.group(0)}'",
-                        file=nasl_file,
-                        plugin=self.name,
-                    )
+            params_content = preferences_match.group("value")
+            type_match = TYPE_PATTERN.search(params_content)
+
+            if not type_match:
+                yield LinterError(
+                    "script_add_preference call is missing a 'type' "
+                    f"parameter in '{preferences_match.group(0)}'",
+                    file=nasl_file,
+                    plugin=self.name,
+                )
+                continue
+
+            pref_type = type_match.group("type")
+            if pref_type in VALID_TYPES:
+                continue
+
+            # nb: This exists since years and it is currently
+            # unclear if we can change it so
+            # we're excluding it here for now.
+            if (
+                "ssh_authorization_init.nasl" in nasl_file.name
+                and pref_type == "sshlogin"
+            ):
+                continue
+
+            yield LinterError(
+                "VT is using an invalid or misspelled type "
+                f"({pref_type}) in "
+                f"{preferences_match.group(0)} \n"
+                f"Allowed are: {sorted(VALID_TYPES)}",
+                file=nasl_file,
+                plugin=self.name,
+            )

{troubadix-25.9.1.dist-info → troubadix-25.10.7.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: troubadix
-Version: 25.9.1
+Version: 25.10.7
 Summary: A linting and QA check tool for NASL files
 License: GPL-3.0-or-later
+License-File: LICENSE
 Author: Greenbone
 Author-email: info@greenbone.net
 Requires-Python: >=3.10,<4.0
@@ -16,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: chardet (>=4,<6)
 Requires-Dist: charset-normalizer (>=3.2.0,<4.0.0)

{troubadix-25.9.1.dist-info → troubadix-25.10.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 troubadix/__init__.py,sha256=K7sIXXDrC7YRb7BvIpdQ6ZfG_QkT0qUH_wAlHROVRfM,716
-troubadix/__version__.py,sha256=3oX5p1i-9q60C9bDSplpSWaZz3WU19hZHfFsWF1me8A,103
+troubadix/__version__.py,sha256=URKTfluCYWyv6hpNgwKzTwfbDB-zbsbURt4HvY-BXM4,104
 troubadix/argparser.py,sha256=-H07Jhqh68_M4Mbjq9qJjTr3MShy_N2pxl2qHA6cfRU,7481
 troubadix/codespell/codespell.additions,sha256=SJPlIo8vEKEOTftY6ZBSXzcfyv6y9aFAXl9FdpcMxD0,561
 troubadix/codespell/codespell.exclude,sha256=W1dHEbKuXZbiLMRLhUPIzhCV1ptHqPLuaB6VsJLxn64,147965
@@ -14,7 +14,7 @@ troubadix/helper/remove_comments.py,sha256=zjhXPQXgKaEOparAdu4aBXcJlEul8LbNaP3uL
 troubadix/helper/text_utils.py,sha256=gBX0box9VtgA0CMfE0u2Vvi1IuOopxUfCQFYn_1wVjE,2543
 troubadix/plugin.py,sha256=3fQPj3Qe_hgwHerlYE4hbdzYMzRU557NxJ-UwtE9mOI,3525
 troubadix/plugins/__init__.py,sha256=7NqTzddmptQZJ_s1yxpamVo0Y8zohAWlEQU2lf103_Y,8745
-troubadix/plugins/badwords.py,sha256=euFH0pkmOBES1EcSUTJ2lD0NJ4OWh-E98_WR-mQmOh4,4932
+troubadix/plugins/badwords.py,sha256=ppTJT7yl6kPo51PT-mHxpbmuKMJpBgEKzLDU0sLktig,5014
 troubadix/plugins/copyright_text.py,sha256=jYsLWmTbT_A78XQQxQFK-5kMMHkh3xdvlh7mEF2dZGU,3583
 troubadix/plugins/copyright_year.py,sha256=XzM9MHVzOXwNLwHpfuaWj8PUOmswr56SBVOLBdvxjd4,5478
 troubadix/plugins/creation_date.py,sha256=PRM5z_7cgQhRQ7Kx7ufF8E8LzVNGP5hLSeH25UWJEn8,2403
@@ -30,7 +30,7 @@ troubadix/plugins/duplicated_script_tags.py,sha256=UPBR2jbU15JLKJlVk1e2GFREH5Wj5
 troubadix/plugins/encoding.py,sha256=zNzqNpP39TUwOklnc8OJ3OIUelAN_hvnuBYoa3Pz764,2104
 troubadix/plugins/forking_nasl_functions.py,sha256=IUtCrTK_sGDx79jAPS8lF_aN8zSG2AkzfC6duTMvJOw,6069
 troubadix/plugins/get_kb_on_services.py,sha256=oFmcjiF7ZD3x5tEbJEoZNn80y1qUzNgeSZNsogSqaZ0,3401
-troubadix/plugins/grammar.py,sha256=URT-7gtAFzDm-8lwW4Qb47N_ku3Lg046uvg04axL2o8,9809
+troubadix/plugins/grammar.py,sha256=hd5Qqamem9Iy64UMmdv5lEIfinS1vGDw_1CYNPmOsvg,10231
 troubadix/plugins/http_links_in_tags.py,sha256=F4fm74M3CbmWOJoCyDdEO-bKQahFsHL6vs4ZynhHEkc,7325
 troubadix/plugins/if_statement_syntax.py,sha256=5BRJwCCghvZn1AfvYzmk8l9S7aRqbVaLHhSKod_Q9zw,1429
 troubadix/plugins/illegal_characters.py,sha256=B6q_RU85AxCjLry56Oc-RhMSpnJU8mTrxclRzi1FVFU,4406
@@ -46,7 +46,7 @@ troubadix/plugins/overlong_script_tags.py,sha256=LKJQxX9s2fkExkM0MOIqYZGOKbEe9et
 troubadix/plugins/prod_svc_detect_in_vulnvt.py,sha256=AnHF5jPNz4wEr-etZ2fkJNqqMH2he-9ofOdzWJyPeK4,4292
 troubadix/plugins/qod.py,sha256=OMEjZR3fbimLX4F3LsMZZn4IZi32j4soMYp1uQFv5Sc,4164
 troubadix/plugins/reporting_consistency.py,sha256=yp4FQ8T6gVPzLDF5334mGG5m8n9x8c2I_ApfHzZpVRA,4024
-troubadix/plugins/script_add_preference_type.py,sha256=KhVYU24g-OJF1XqPOsqX1k8LU7-BciSXQ2EbCcnJezw,3193
+troubadix/plugins/script_add_preference_type.py,sha256=PHySUVWqI8dG51xI0CIzaB2a83GicCryPtbcugE8jgE,3643
 troubadix/plugins/script_calls_empty_values.py,sha256=XdtqTGWI3k_3eId-XAgxwXLxucENqC5CIQJG8Ncn1_M,2512
 troubadix/plugins/script_calls_recommended.py,sha256=GHnfCKBlmutfCXrkvvujvDR7TJDxr2Dx2KZDMa1z_TU,3180
 troubadix/plugins/script_category.py,sha256=EsFoR6fKjnJNNJb2gLkftwXDhJ3RCfa5g8796N-jxX8,2184
@@ -108,8 +108,8 @@ troubadix/standalone_plugins/no_solution.py,sha256=p_-az9Igl4GH6HnhLLYbYlWIiEP64
 troubadix/standalone_plugins/util.py,sha256=JTXGmi-_BJouTNe6QzEosLlXUt9jKW-3fz4db05RJJw,696
 troubadix/standalone_plugins/version_updated.py,sha256=6YHF0OjL5NWszQdsSh7XzlSji1e6Uaqwu_Y6m3R0mvI,4203
 troubadix/troubadix.py,sha256=5__Jz3bYSrya4aG6RCBWxqnsDepXfwXZ3v0bjCzEFi0,6039
-troubadix-25.9.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-troubadix-25.9.1.dist-info/METADATA,sha256=TsahJy0ufYfwtsK1AnoRJGSuKy1hhpJyJEV9yCEFwvo,4462
-troubadix-25.9.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-troubadix-25.9.1.dist-info/entry_points.txt,sha256=ETEPBi4fKv3o7hzkzceX4838G6g5_5wRdEddYot8N6A,920
-troubadix-25.9.1.dist-info/RECORD,,
+troubadix-25.10.7.dist-info/METADATA,sha256=BXZnOZiPoSlgxZB2ig4wxRvucT7ehJ-0tSynVzr2np4,4536
+troubadix-25.10.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+troubadix-25.10.7.dist-info/entry_points.txt,sha256=ETEPBi4fKv3o7hzkzceX4838G6g5_5wRdEddYot8N6A,920
+troubadix-25.10.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+troubadix-25.10.7.dist-info/RECORD,,

{troubadix-25.9.1.dist-info → troubadix-25.10.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any