troubadix 25.1.0__py3-none-any.whl → 25.1.2__py3-none-any.whl

troubadix/__version__.py

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

troubadix/plugins/overlong_description_lines.py

@@ -32,6 +32,14 @@ IGNORE_TAGS = [
     "script_name",
     "script_xref",
     "script_add_preference",
+    # nb: Various variants of URLs in comments which we can't / shouldn't
+    # trim down
+    "  # http://",
+    "  # https://",
+    "  # - http://",
+    "  # - https://",
+    "  # > http://",
+    "  # > https://",
     # nb: Special cases we should ignore (at least for now) as these are
     # commonly used like this and is only two chars "too long".
     'script_tag(name:"vuldetect", value:"Checks if a vulnerable version is '

troubadix/plugins/valid_oid.py

@@ -58,6 +58,7 @@ class CheckValidOID(FileContentPlugin):
 
         security_template = "Security Advisory"
         family_template = "Local Security Checks"
+        windows_family_template = "Windows : Microsoft Bulletins"
         is_using_reserved = "is using an OID that is reserved for"
         invalid_oid = "is using an invalid OID"
 
@@ -81,22 +82,20 @@ class CheckValidOID(FileContentPlugin):
             )
             return
 
-        # Vendor-specific OIDs
-        if "1.3.6.1.4.1.25623.1.1." in oid:
-            family_pattern = get_special_script_tag_pattern(
-                SpecialScriptTag.FAMILY
+        family_pattern = get_special_script_tag_pattern(SpecialScriptTag.FAMILY)
+        family_match = family_pattern.search(file_content)
+
+        if family_match is None or family_match.group("value") is None:
+            yield LinterError(
+                "VT is missing a script family!",
+                file=nasl_file,
+                plugin=self.name,
             )
-            family_match = family_pattern.search(file_content)
-            if family_match is None or family_match.group("value") is None:
-                yield LinterError(
-                    "VT is missing a script family!",
-                    file=nasl_file,
-                    plugin=self.name,
-                )
-                return
+            return
 
+        # Vendor-specific OIDs
+        if "1.3.6.1.4.1.25623.1.1." in oid:
             family = family_match.group("value")
-
             vendor_number_match = re.search(
                 r"^1\.3\.6\.1\.4\.1\.25623\.1\.1\.([0-9]+)\.", oid
             )
@@ -324,6 +323,15 @@ class CheckValidOID(FileContentPlugin):
                         plugin=self.name,
                     )
                     return
+            elif vendor_number == "18":
+                if family != f"openSUSE {family_template}":
+                    yield LinterError(
+                        f"script_oid() {is_using_reserved} openSUSE "
+                        f"'{str(oid)}'",
+                        file=nasl_file,
+                        plugin=self.name,
+                    )
+                    return
 
             else:
                 yield LinterError(
@@ -338,8 +346,8 @@ class CheckValidOID(FileContentPlugin):
 
         # product-specific OIDs
         if "1.3.6.1.4.1.25623.1.2." in oid:
-            name_patter = get_special_script_tag_pattern(SpecialScriptTag.NAME)
-            name_match = name_patter.search(file_content)
+            name_pattern = get_special_script_tag_pattern(SpecialScriptTag.NAME)
+            name_match = name_pattern.search(file_content)
             if not name_match or not name_match.group("value"):
                 yield LinterError(
                     "VT is missing a script name!",
@@ -378,6 +386,32 @@ class CheckValidOID(FileContentPlugin):
 
                 return
 
+        # Fixed OID-scheme for Windows OIDs
+        if "1.3.6.1.4.1.25623.1.3." in oid:
+            if family_match.group("value") != windows_family_template:
+                yield LinterError(
+                    f"script_oid() {is_using_reserved} 'Windows' ("
+                    f"{str(oid)})",
+                    file=nasl_file,
+                    plugin=self.name,
+                )
+                return
+
+            windows_oid_match = re.search(
+                r"^1\.3\.6\.1\.4\.1\.25623\.1\.3\.\d+\.\d+\.\d+\.\d+",
+                oid,
+            )
+            if not windows_oid_match:
+                yield LinterError(
+                    f"script_oid() {invalid_oid} '{str(oid)}' "
+                    "(Windows pattern: 1.3.6.1.4.1.25623.1.3."
+                    "[product_id].[platform_id].[kb_article_id].[fixed_build_number])",
+                    file=nasl_file,
+                    plugin=self.name,
+                )
+                return
+            return
+
         oid_digit_match = re.search(
             r"^1\.3\.6\.1\.4\.1\.25623\.1\.0\.([0-9]+)", oid
         )

troubadix/standalone_plugins/deprecate_vts.py

@@ -81,7 +81,7 @@ def _finalize_content(content: str) -> str:
     content_to_keep = content.split("exit(0);")[0]
     return content_to_keep + (
         'script_tag(name:"deprecated", value:TRUE);'
-        "\n\nexit(0);\n}\n\nexit(66);\n"
+        "\n\n  exit(0);\n}\n\nexit(66);\n"
     )
 
 

{troubadix-25.1.0.dist-info → troubadix-25.1.2.dist-info}/METADATA

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: troubadix
-Version: 25.1.0
+Version: 25.1.2
 Summary: A linting and QA check tool for NASL files
-Home-page: https://github.com/greenbone/troubadix
 License: GPL-3.0-or-later
 Author: Greenbone
 Author-email: info@greenbone.net
@@ -22,9 +21,10 @@ Requires-Dist: chardet (>=4,<6)
 Requires-Dist: charset-normalizer (>=3.2.0,<4.0.0)
 Requires-Dist: codespell (>=2.0.0,<3.0.0)
 Requires-Dist: gitpython (>=3.1.31,<4.0.0)
-Requires-Dist: pontos (>=22.7,<25.0)
+Requires-Dist: pontos (>=22.7,<26.0)
 Requires-Dist: python-magic (>=0.4.25,<0.5.0)
 Requires-Dist: validators (>=0.34.0,<0.35.0)
+Project-URL: Homepage, https://github.com/greenbone/troubadix
 Project-URL: Repository, https://github.com/greenbone/troubadix
 Description-Content-Type: text/markdown
 

{troubadix-25.1.0.dist-info → troubadix-25.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 troubadix/__init__.py,sha256=K7sIXXDrC7YRb7BvIpdQ6ZfG_QkT0qUH_wAlHROVRfM,716
-troubadix/__version__.py,sha256=PTCuktvqFn_OwS3R-mZjoqzJ98AVAHDE3wA7jrDJ98s,103
+troubadix/__version__.py,sha256=b9icRZhD9n_klOTCA2Qs3aV1DBh96Z_ep6dI2tY8PBE,103
 troubadix/argparser.py,sha256=YAo8cGJt0k2GMICXrDj3Z124GrM8oRwgNm2Bn3J_gYI,7001
 troubadix/codespell/codespell.additions,sha256=NAYnQF79kdk4YhU_h8fpjAVVkqBm778aPHPPP7FEkZY,504
 troubadix/codespell/codespell.exclude,sha256=W38XK8hoWWgLDCCJ7USj0YPhqzW68UN7va7bGA2n5eg,145449
@@ -36,7 +36,7 @@ troubadix/plugins/missing_desc_exit.py,sha256=GAd4FXhjX1ZEkb4hz3HqqDQVSxfuXVtuKK
 troubadix/plugins/missing_tag_solution.py,sha256=iO7_6Us3w12AVPuiGK3AUU3S62K1lcZvcGK_-fvvQtk,2828
 troubadix/plugins/multiple_re_parameters.py,sha256=9NugrcdHBmX2UO9mOuWiqxbIX1sXniZ2AhSW2pguSBE,1422
 troubadix/plugins/newlines.py,sha256=aEQOzkzd3rl9DjEi7q0EOB1M8h41WXr0O5Qf4jMFEvM,2788
-troubadix/plugins/overlong_description_lines.py,sha256=dF7UQ7tphkWuiXeLj4-y0zi86RumkwCCPCn2My1SIDo,3130
+troubadix/plugins/overlong_description_lines.py,sha256=qBGlZpZn-WToJQhBpPMkHLvHjXpPtasvKS3PrtqtBOc,3345
 troubadix/plugins/overlong_script_tags.py,sha256=LKJQxX9s2fkExkM0MOIqYZGOKbEe9eth7DEcxFo3A8k,2356
 troubadix/plugins/prod_svc_detect_in_vulnvt.py,sha256=AnHF5jPNz4wEr-etZ2fkJNqqMH2he-9ofOdzWJyPeK4,4292
 troubadix/plugins/qod.py,sha256=OMEjZR3fbimLX4F3LsMZZn4IZi32j4soMYp1uQFv5Sc,4164
@@ -64,7 +64,7 @@ troubadix/plugins/tabs.py,sha256=7zXaTZe4cZoZvrLyqntVfTeNN_W3D8dfQl67QevXxtc,131
 troubadix/plugins/todo_tbd.py,sha256=MN5fFwBhPmt3JDQ2Hx20B8yUy1vz7LIZC3rDIOzfW9M,1758
 troubadix/plugins/trailing_spaces_tabs.py,sha256=nMly8ZsmGprxHvwCDclKBDRB0eq6JEkjERYKvtStkY4,1873
 troubadix/plugins/using_display.py,sha256=Hd-eysbXlkQb4M-ywzSd784k3aBSiG_sO6Ou0JdbyJA,4046
-troubadix/plugins/valid_oid.py,sha256=vKU6EA8bIepFpE3iqbEVFge3Hi2NKMo1e5NKPdAAqx8,16629
+troubadix/plugins/valid_oid.py,sha256=uW7dmU2iEEh9_X_GzhalevrL1BK6bwZHn-MiiXLQWwA,17998
 troubadix/plugins/valid_script_tag_names.py,sha256=6uMJsBdV-Zx-k1F2_MWmQPHXNo1u0ifuosbftbg-27E,3447
 troubadix/plugins/variable_assigned_in_if.py,sha256=NNz8iuzyQ4rSM6My4WYC1s5TABQqgs7us15PkDA-VV0,3285
 troubadix/plugins/variable_redefinition_in_foreach.py,sha256=SfaA70TkpD9dsvNbhwJEA3eLAHWvj4YwksN-qeBMowg,2470
@@ -87,14 +87,14 @@ troubadix/standalone_plugins/changed_packages/marker/dropped_architecture.py,sha
 troubadix/standalone_plugins/changed_packages/marker/marker.py,sha256=7uZXR2Ds_8soB_2wugCkOSz_3hoX03KMh2NAW0G5Dzg,1278
 troubadix/standalone_plugins/changed_packages/package.py,sha256=Pcr2tcwiPTzD3jB0iteqA7-TajL-dl5Onh1dvC_H9xk,2743
 troubadix/standalone_plugins/common.py,sha256=PkScV-lisNY4WyrzwjV3dK1DF26hJv5JXTcREblJ0v0,1028
-troubadix/standalone_plugins/deprecate_vts.py,sha256=WjhJb9YkUp_5TScE9wKI856tfi7ZZ6mBQQdrE-BqQE0,7889
+troubadix/standalone_plugins/deprecate_vts.py,sha256=iRYHA1_Uf1zRs0ExwNfo7Z6Jt6eSP4WBKwM6s2GyqeQ,7891
 troubadix/standalone_plugins/file_extensions.py,sha256=QLQt02WIc4SWLDTKKnG8q2g-atC7Mgus-opuXf_SX1A,2630
 troubadix/standalone_plugins/last_modification.py,sha256=oYzQq7xV3YzSvi6ZtuHuupXsJwBtO93tKfbwaIeqiJI,4616
 troubadix/standalone_plugins/no_solution.py,sha256=81r20kP8otRob2NTaCea-sgVRIM6ARvhddFdibsG6Ao,8877
 troubadix/standalone_plugins/version_updated.py,sha256=RlzVuXgFOvcjrRTOhiTYlmzV4vvcn7ntCz0lDTjePMU,4316
 troubadix/troubadix.py,sha256=foA7Loi67cCKieN3ea4s3QOfOWOkgwQVR1H-pNXtXn0,6041
-troubadix-25.1.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-troubadix-25.1.0.dist-info/METADATA,sha256=CEPP_4BwEn8y7qGtqyd4rZrWuSZWp5bo7Fz20lM48Ds,4416
-troubadix-25.1.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-troubadix-25.1.0.dist-info/entry_points.txt,sha256=LplOk4nzKrS4B8Jz0SPkQLPlIDesdraCO8Vp_eoycpc,737
-troubadix-25.1.0.dist-info/RECORD,,
+troubadix-25.1.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+troubadix-25.1.2.dist-info/METADATA,sha256=Erh1zWb-N3T_kyJyytFxjtWVL5HYcr-R6t7854XByJk,4428
+troubadix-25.1.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+troubadix-25.1.2.dist-info/entry_points.txt,sha256=LplOk4nzKrS4B8Jz0SPkQLPlIDesdraCO8Vp_eoycpc,737
+troubadix-25.1.2.dist-info/RECORD,,

{troubadix-25.1.0.dist-info → troubadix-25.1.2.dist-info}/WHEEL

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