troubadix 25.4.2__tar.gz → 25.5.1__tar.gz

{troubadix-25.4.2 → troubadix-25.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: troubadix
-Version: 25.4.2
+Version: 25.5.1
 Summary: A linting and QA check tool for NASL files
 License: GPL-3.0-or-later
 Author: Greenbone

{troubadix-25.4.2 → troubadix-25.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "troubadix"
-version = "25.4.2"
+version = "25.5.1"
 description = "A linting and QA check tool for NASL files"
 authors = ["Greenbone <info@greenbone.net>"]
 license = "GPL-3.0-or-later"

{troubadix-25.4.2 → troubadix-25.5.1}/tests/plugins/test_grammar.py

@@ -260,6 +260,32 @@ class CheckNewlinesTestCase(PluginTestCase):
             results[0].message,
         )
 
+    def test_grammar9(self):
+        nasl_file = Path(__file__).parent / "test.nasl"
+        content = (
+            '  script_tag(name:"cvss_base", value:"4.0");\n'
+            '  script_tag(name:"solution", value:"Update to version to version '
+            ' 1.2.3 or later.");\n'
+            '  script_tag(name:"solution_type", value:"VendorFix");\n'
+            '  script_tag(name:"solution", value:"meh");\n'
+        )
+
+        fake_context = self.create_file_plugin_context(
+            nasl_file=nasl_file, file_content=content
+        )
+        plugin = CheckGrammar(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            "VT/Include has the following grammar problem:   "
+            'script_tag(name:"solution", value:"Update to version to version '
+            ' 1.2.3 or later.");',
+            results[0].message,
+        )
+
     def test_grammar_fp(self):
         nasl_file = Path(__file__).parent / "test.nasl"
         content = (

{troubadix-25.4.2 → troubadix-25.5.1}/troubadix/__version__.py

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

{troubadix-25.4.2 → troubadix-25.5.1}/troubadix/plugins/grammar.py

@@ -174,11 +174,15 @@ def get_grammer_pattern() -> re.Pattern:
         # server-site template injection -> server-side template injection
         r"cross[\s-]+side[\s-]+(request[\s-]+forgery|scripting)|"
         r"server[\s-]+site[\s-]+(request[\s-]+forgery|template)[\s-]+injection|"
-        # nb: Next two could happen when copy'n'paste some text parts around
+        # nb: Next few could happen when copy'n'paste some text parts around
         # like e.g.:
         # is prone to a to a remote denial-of-service vulnerability
         # CVE-2022-31702: Command injection in the in the vRNI REST API
-        r"in the in the|to an? to a|"
+        # MariaDB versions prior to prior to 10.3.32, 10.4.x prior to
+        # Update to update to version 1.2.3
+        # Update to version to version 1.2.3
+        r"in the in the|to an? to a|prior to prior to|to version to version|"
+        r"update to update to|"
         # e.g. "is prone to a security bypass vulnerabilities"
         r"is\s+prone\s+to\s+an?\s+[^\s]+\s+([^\s]+\s+)?vulnerabilities" r").*",
         re.IGNORECASE,

{troubadix-25.4.2 → troubadix-25.5.1}/troubadix/plugins/valid_oid.py

@@ -450,10 +450,7 @@ class CheckValidOID(FileContentPlugin):
 
         if (
             (10000 <= oid_digit <= 29999)
-            or (50000 <= oid_digit <= 118999)
-            or (120000 <= oid_digit <= 129999)
-            or (130000 <= oid_digit <= 169999)
-            or (170000 <= oid_digit <= 179999)
+            or (50000 <= oid_digit <= 179999)
             or (200000 <= oid_digit <= 209999)
             or (700000 <= oid_digit <= 919999)
             or (1020000 <= oid_digit <= 1029999)