troubadix 25.2.3__tar.gz → 25.3.0__tar.gz

{troubadix-25.2.3 → troubadix-25.3.0}/PKG-INFO

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

{troubadix-25.2.3 → troubadix-25.3.0}/pyproject.toml

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

{troubadix-25.2.3 → troubadix-25.3.0}/tests/plugins/test_creation_date.py

@@ -153,3 +153,43 @@ class CheckCreationDateTestCase(PluginTestCase):
             "False or incorrectly formatted creation_date.",
             results[0].message,
         )
+
+    def test_creation_date_greater_than_last_modification(self):
+        path = Path("some/file.nasl")
+        content = (
+            '  script_tag(name:"creation_date", value:"2025-01-01 00:00:01 '
+            '+0200 (Wed, 01 Jan 2025)");\n'
+            '  script_tag(name:"last_modification", value:"2025-01-01 00:00:00 '
+            '+0200 (Wed, 01 Jan 2025)");\n'
+        )
+        fake_context = self.create_file_plugin_context(
+            nasl_file=path, file_content=content
+        )
+        plugin = CheckCreationDate(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            "The creation_date must not be greater than the last modification date.",
+            results[0].message,
+        )
+
+    def test_creation_date_equal_last_modification(self):
+        path = Path("some/file.nasl")
+        content = (
+            '  script_tag(name:"creation_date", value:"2025-01-01 00:00:00 '
+            '+0200 (Wed, 01 Jan 2025)");\n'
+            '  script_tag(name:"last_modification", value:"2025-01-01 00:00:00 '
+            '+0200 (Wed, 01 Jan 2025)");\n'
+        )
+        fake_context = self.create_file_plugin_context(
+            nasl_file=path, file_content=content
+        )
+        plugin = CheckCreationDate(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 0)

{troubadix-25.2.3 → troubadix-25.3.0}/tests/plugins/test_encoding.py

@@ -70,11 +70,11 @@ class CheckEncodingTestCase(PluginTestCase):
                 results[0].message,
             )
             self.assertEqual(
-                "Found invalid character",
+                "Found invalid character in line: 1",
                 results[1].message,
             )
             self.assertEqual(
-                "Found invalid character",
+                "Found invalid character in line: 2",
                 results[2].message,
             )
 

{troubadix-25.2.3 → troubadix-25.3.0}/troubadix/__version__.py

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

{troubadix-25.2.3 → troubadix-25.3.0}/troubadix/plugins/creation_date.py

@@ -52,45 +52,59 @@ class CheckCreationDate(FileContentPlugin):
         # Example: "2017-11-29 13:56:41 +0100 (Wed, 29 Nov 2017)"
         match = tag_pattern.search(file_content)
 
-        if match:
-            try:
-                date_left = datetime.strptime(
-                    match.group("value")[:25], "%Y-%m-%d %H:%M:%S %z"
-                )
-                # 2017-11-29 13:56:41 +0100 (error if no timezone)
-                date_right = datetime.strptime(
-                    match.group("value")[27:43], "%a, %d %b %Y"
-                )
-                week_day_parsed = date_right.strftime("%a")
-            except ValueError:
-                yield LinterError(
-                    "False or incorrectly formatted creation_date.",
-                    file=nasl_file,
-                    plugin=self.name,
-                )
-                return
+        if not match:
+            yield LinterError(
+                "False or incorrectly formatted creation_date.",
+                file=nasl_file,
+                plugin=self.name,
+            )
+            return
 
-            week_day_str = match.group("value")[27:30]
-            # Wed, 29 Nov 2017
-            if date_left.date() != date_right.date():
-                yield LinterError(
-                    "The creation_date consists of two different dates.",
-                    file=nasl_file,
-                    plugin=self.name,
-                )
-            # Check correct weekday
-            elif week_day_str != week_day_parsed:
-                formatted_date = week_day_parsed
-                yield LinterError(
-                    f"Wrong day of week. Please change it from '{week_day_str}"
-                    f"' to '{formatted_date}'.",
-                    file=nasl_file,
-                    plugin=self.name,
-                )
-        else:
+        try:
+            date_left = datetime.strptime(
+                match.group("value")[:25], "%Y-%m-%d %H:%M:%S %z"
+            )
+            # 2017-11-29 13:56:41 +0100 (error if no timezone)
+            date_right = datetime.strptime(
+                match.group("value")[27:43], "%a, %d %b %Y"
+            )
+            week_day_parsed = date_right.strftime("%a")
+        except ValueError:
             yield LinterError(
                 "False or incorrectly formatted creation_date.",
                 file=nasl_file,
                 plugin=self.name,
             )
             return
+
+        week_day_str = match.group("value")[27:30]
+        # Wed, 29 Nov 2017
+        if date_left.date() != date_right.date():
+            yield LinterError(
+                "The creation_date consists of two different dates.",
+                file=nasl_file,
+                plugin=self.name,
+            )
+        # Check correct weekday
+        elif week_day_str != week_day_parsed:
+            formatted_date = week_day_parsed
+            yield LinterError(
+                f"Wrong day of week. Please change it from '{week_day_str}"
+                f"' to '{formatted_date}'.",
+                file=nasl_file,
+                plugin=self.name,
+            )
+
+        last_modification_pattern = get_script_tag_pattern(
+            ScriptTag.LAST_MODIFICATION
+        )
+        if match := last_modification_pattern.search(file_content):
+            last_modification = datetime.strptime(
+                match.group("value")[:25], "%Y-%m-%d %H:%M:%S %z"
+            )
+            if date_left > last_modification:
+                yield LinterError(
+                    "The creation_date must not be greater than the last modification date.",
+                    file=nasl_file,
+                    plugin=self.name,
+                )

{troubadix-25.2.3 → troubadix-25.3.0}/troubadix/plugins/encoding.py

@@ -26,7 +26,7 @@ from troubadix.plugin import LineContentPlugin, LinterError, LinterResult
 # Only the ASCII and extended ASCII for now... # https://www.ascii-code.com/
 # CHAR_SET = r"[^\x00-\xFF]"
 # Temporary only check for chars in between 7f-9f, like in the old Feed-QA...
-CHAR_SET = r"[\x7F-\x9F]"
+INVALID_CHAR_PATTERN = re.compile(r"[\x7F-\x9F]")
 
 ALLOWED_ENCODINGS = ["ascii", "latin_1"]
 
@@ -52,10 +52,10 @@ class CheckEncoding(LineContentPlugin):
             )
 
         for index, line in enumerate(lines, 1):
-            encoding = re.search(CHAR_SET, line)
-            if encoding is not None:
+            encoding = INVALID_CHAR_PATTERN.search(line)
+            if encoding:
                 yield LinterError(
-                    "Found invalid character",
+                    f"Found invalid character in line: {index}",
                     file=nasl_file,
                     plugin=self.name,
                     line=index,