troubadix 24.9.1__py3-none-any.whl → 24.9.2__py3-none-any.whl

troubadix/__version__.py

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

troubadix/plugins/qod.py

@@ -15,23 +15,24 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import re
 from typing import Iterator
 
 from troubadix.helper.patterns import ScriptTag, get_script_tag_pattern
 from troubadix.plugin import FilePlugin, LinterError, LinterResult
 
 VALID_QOD_NUM_VALUES = [
-    1,
-    30,
-    50,
-    70,
-    75,
-    80,
-    95,
-    97,
-    98,
-    99,
-    100,
+    "1",
+    "30",
+    "50",
+    "70",
+    "75",
+    "80",
+    "95",
+    "97",
+    "98",
+    "99",
+    "100",
 ]
 
 VALID_QOD_TYPES = [
@@ -51,6 +52,12 @@ VALID_QOD_TYPES = [
     "package_unreliable",
 ]
 
+# needed due to script_tag_pattern value not including the quotes
+QOD_WITH_QUOTES_PATTERN = re.compile(
+    r'script_tag\(\s*name\s*:\s*(?P<quote>[\'"])qod(?P=quote)\s*,'
+    r'\s*value\s*:\s*(?P<value_with_quotes>[\'"]?(?P<value>.+?)[\'"]?)\s*\)\s*;'
+)
+
 
 class CheckQod(FilePlugin):
     name = "check_qod"
@@ -68,10 +75,9 @@ class CheckQod(FilePlugin):
         if "# troubadix: disable=template_nd_test_files_fps" in file_content:
             return
 
-        qod_pattern = get_script_tag_pattern(ScriptTag.QOD)
         qod_type_pattern = get_script_tag_pattern(ScriptTag.QOD_TYPE)
 
-        match_qod = list(qod_pattern.finditer(file_content))
+        match_qod = list(QOD_WITH_QUOTES_PATTERN.finditer(file_content))
         match_qod_type = list(qod_type_pattern.finditer(file_content))
 
         num_matches = len(match_qod) + len(match_qod_type)
@@ -89,21 +95,25 @@ class CheckQod(FilePlugin):
             )
 
         for match in match_qod:
-            try:
-                qod = int(match.group("value"))
-                if qod not in VALID_QOD_NUM_VALUES:
+            full_match = match.group(0)
+            full_value = match.group("value_with_quotes")
+            value = match.group("value")
+
+            # Check if the value is enclosed in double quotes
+            if full_value.startswith('"') and full_value.endswith('"'):
+
+                # Compare against valid values
+                if value not in VALID_QOD_NUM_VALUES:
                     yield LinterError(
-                        f"{match.group(0)}: '{qod}' is an invalid QoD number"
-                        " value. Allowed are"
-                        f" {', '.join(str(x) for x in VALID_QOD_NUM_VALUES)}",
+                        f"Invalid QOD value '{value}' in {full_match}."
+                        " Allowed are"
+                        f" {', '.join(x for x in VALID_QOD_NUM_VALUES)}",
                         file=self.context.nasl_file,
                         plugin=self.name,
                     )
-            except ValueError:
+            else:
                 yield LinterError(
-                    f"{match.group(0)}: '{match.group('value')}' is an invalid"
-                    " QoD number value. Allowed are"
-                    f" {', '.join(str(x) for x in VALID_QOD_NUM_VALUES)}",
+                    f"QOD value not properly enclosed in double quotes in {full_match}",
                     file=self.context.nasl_file,
                     plugin=self.name,
                 )

{troubadix-24.9.1.dist-info → troubadix-24.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: troubadix
-Version: 24.9.1
+Version: 24.9.2
 Summary: A linting and QA check tool for NASL files
 Home-page: https://github.com/greenbone/troubadix
 License: GPL-3.0-or-later

{troubadix-24.9.1.dist-info → troubadix-24.9.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 troubadix/__init__.py,sha256=K7sIXXDrC7YRb7BvIpdQ6ZfG_QkT0qUH_wAlHROVRfM,716
-troubadix/__version__.py,sha256=ZDcSR0f7wqcHYyLlgRk4AVKxvoiWRm7FEU79mNRfj3k,103
+troubadix/__version__.py,sha256=MEfWYDaxHJ7AE6AmB08MD8l6RuK4byEL9BZ3UJ3ZoPg,103
 troubadix/argparser.py,sha256=YAo8cGJt0k2GMICXrDj3Z124GrM8oRwgNm2Bn3J_gYI,7001
 troubadix/codespell/codespell.additions,sha256=9hUrzjJF4Q8T5rVLx8CQa01oICvmsjzE6sCPjVRDOEU,418
 troubadix/codespell/codespell.exclude,sha256=qALEzLglEbPwcTRwGcobM_MTJzZyJekYRdJY3ws5yeM,138030
@@ -39,7 +39,7 @@ troubadix/plugins/newlines.py,sha256=aEQOzkzd3rl9DjEi7q0EOB1M8h41WXr0O5Qf4jMFEvM
 troubadix/plugins/overlong_description_lines.py,sha256=dF7UQ7tphkWuiXeLj4-y0zi86RumkwCCPCn2My1SIDo,3130
 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=u4VPFAjzidnnPrmwuSPZuK8KKMZBFi30XqaRGLcYPhc,3816
+troubadix/plugins/qod.py,sha256=OMEjZR3fbimLX4F3LsMZZn4IZi32j4soMYp1uQFv5Sc,4164
 troubadix/plugins/reporting_consistency.py,sha256=xBLd3ASa2zlPg61ONpBFSt_RtblTQ70vKWm05MS0tew,4027
 troubadix/plugins/script_add_preference_type.py,sha256=KhVYU24g-OJF1XqPOsqX1k8LU7-BciSXQ2EbCcnJezw,3193
 troubadix/plugins/script_calls_empty_values.py,sha256=XdtqTGWI3k_3eId-XAgxwXLxucENqC5CIQJG8Ncn1_M,2512
@@ -92,8 +92,8 @@ troubadix/standalone_plugins/last_modification.py,sha256=oYzQq7xV3YzSvi6ZtuHuupX
 troubadix/standalone_plugins/no_solution.py,sha256=81r20kP8otRob2NTaCea-sgVRIM6ARvhddFdibsG6Ao,8877
 troubadix/standalone_plugins/version_updated.py,sha256=dIGj81rbluyNjINn9kA1yPY2hUo6fqbNa-kg0Zi9Clc,4263
 troubadix/troubadix.py,sha256=foA7Loi67cCKieN3ea4s3QOfOWOkgwQVR1H-pNXtXn0,6041
-troubadix-24.9.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-troubadix-24.9.1.dist-info/METADATA,sha256=ZunmHinfrP5DbBKTWljuhyqXUzQrI58-6Iyj947GFTI,4357
-troubadix-24.9.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-troubadix-24.9.1.dist-info/entry_points.txt,sha256=LplOk4nzKrS4B8Jz0SPkQLPlIDesdraCO8Vp_eoycpc,737
-troubadix-24.9.1.dist-info/RECORD,,
+troubadix-24.9.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+troubadix-24.9.2.dist-info/METADATA,sha256=NMi0sb35_hF-MTp5NuaaxJYmzMTr_tGWxCykoHB2asg,4357
+troubadix-24.9.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+troubadix-24.9.2.dist-info/entry_points.txt,sha256=LplOk4nzKrS4B8Jz0SPkQLPlIDesdraCO8Vp_eoycpc,737
+troubadix-24.9.2.dist-info/RECORD,,