troubadix 25.8.0__tar.gz → 25.8.1__tar.gz

{troubadix-25.8.0 → troubadix-25.8.1}/PKG-INFO

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

{troubadix-25.8.0 → troubadix-25.8.1}/pyproject.toml

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

{troubadix-25.8.0 → troubadix-25.8.1}/tests/plugins/test_badwords.py

@@ -67,7 +67,10 @@ class TestBadwords(PluginTestCase):
 
     def test_exception_ok(self):
         path = Path("some/include.inc")
-        content = '# HostDetails/NVT                 => "1.2.3.4"'
+        content = (
+            '# HostDetails/NVT                 => "1.2.3.4"\n'
+            "https://www.invt.com/software-download\n"
+        )
 
         fake_context = self.create_file_plugin_context(
             nasl_file=path, lines=content.splitlines()

{troubadix-25.8.0 → troubadix-25.8.1}/tests/plugins/test_copyright_text.py

@@ -28,13 +28,13 @@ from . import PluginTestCase
 
 WRONG_TEXTS = [
     "# Text descriptions are largely excerpted from the referenced\n"
-    "# advisory, and are Copyright (C) the respective author(s)\n",
+    + "# advisory, and are Copyright (C) the respective author(s)\n",
     "# Text descriptions are largely excerpted from the referenced\n"
-    "# advisory, and are Copyright (C) the respective author(s)\n",
+    + "# advisory, and are Copyright (C) the respective author(s)\n",
     "# Text descriptions are largely excerpted from the referenced\n"
-    "# advisory, and are Copyright (C) the respective author(s)\n",
+    + "# advisory, and are Copyright (C) the respective author(s)\n",
     "# Some text descriptions might be excerpted from the referenced\n"
-    "# advisories, and are Copyright (C) by the respective right holder(s)\n",
+    + "# advisories, and are Copyright (C) by the respective right holder(s)\n",
 ]
 
 

{troubadix-25.8.0 → troubadix-25.8.1}/tests/plugins/test_dependencies.py

@@ -53,13 +53,13 @@ class CheckDependenciesTestCase(PluginTestCase):
     def test_dependency_existing(self):
         with self.create_directory() as tmpdir:
             path = tmpdir / "file.nasl"
-            example = tmpdir / "common" / "example.inc"
+            example = tmpdir / "common" / "example.nasl"
             example.parent.mkdir(parents=True)
             example.touch()
             content = (
                 '  script_tag(name:"cvss_base", value:"4.0");\n'
                 '  script_tag(name:"summary", value:"Foo Bar...");\n'
-                '  script_dependencies("example.inc");\n'
+                '  script_dependencies("example.nasl");\n'
             )
             fake_context = self.create_file_plugin_context(
                 nasl_file=path, file_content=content, root=tmpdir
@@ -71,7 +71,7 @@ class CheckDependenciesTestCase(PluginTestCase):
             self.assertEqual(len(results), 0)
 
     def test_dependency_missing(self):
-        dependency = "example2.inc"
+        dependency = "example2.nasl"
         path = here / "file.nasl"
         content = (
             '  script_tag(name:"cvss_base", value:"4.0");\n'
@@ -93,16 +93,16 @@ class CheckDependenciesTestCase(PluginTestCase):
             results[0].message,
         )
 
-    def test_enterprise_dependency(self):
+    def test_gsf_dependency(self):
         with self.create_directory() as tmpdir:
             path = tmpdir / "file.nasl"
-            example = tmpdir / "common" / "enterprise" / "example.inc"
+            example = tmpdir / "common" / "gsf" / "example.nasl"
             example.parent.mkdir(parents=True)
             example.touch()
             content = (
                 '  script_tag(name:"cvss_base", value:"4.0");\n'
                 '  script_tag(name:"summary", value:"Foo Bar...");\n'
-                '  script_dependencies("enterprise/example.inc");\n'
+                '  script_dependencies("gsf/example.nasl");\n'
             )
             fake_context = self.create_file_plugin_context(
                 nasl_file=path, file_content=content, root=tmpdir
@@ -116,13 +116,13 @@ class CheckDependenciesTestCase(PluginTestCase):
     def test_policy_warning(self):
         with self.create_directory() as tmpdir:
             path = tmpdir / "file.nasl"
-            example = tmpdir / "common" / "Policy" / "example.inc"
+            example = tmpdir / "common" / "Policy" / "example.nasl"
             example.parent.mkdir(parents=True)
             example.touch()
             content = (
                 '  script_tag(name:"cvss_base", value:"4.0");\n'
                 '  script_tag(name:"summary", value:"Foo Bar...");\n'
-                '  script_dependencies("Policy/example.inc");\n'
+                '  script_dependencies("Policy/example.nasl");\n'
             )
             fake_context = self.create_file_plugin_context(
                 nasl_file=path, file_content=content, root=tmpdir
@@ -135,7 +135,7 @@ class CheckDependenciesTestCase(PluginTestCase):
 
             self.assertIsInstance(results[0], LinterWarning)
             self.assertEqual(
-                "The script dependency Policy/example.inc is in a "
+                "The script dependency Policy/example.nasl is in a "
                 "subdirectory, which might be misplaced.",
                 results[0].message,
             )
@@ -143,13 +143,13 @@ class CheckDependenciesTestCase(PluginTestCase):
     def test_error(self):
         with self.create_directory() as tmpdir:
             path = tmpdir / "file.nasl"
-            example = tmpdir / "common" / "foo" / "example.inc"
+            example = tmpdir / "common" / "foo" / "example.nasl"
             example.parent.mkdir(parents=True)
             example.touch()
             content = (
                 '  script_tag(name:"cvss_base", value:"4.0");\n'
                 '  script_tag(name:"summary", value:"Foo Bar...");\n'
-                '  script_dependencies("foo/example.inc");\n'
+                '  script_dependencies("foo/example.nasl");\n'
             )
             fake_context = self.create_file_plugin_context(
                 nasl_file=path, file_content=content, root=tmpdir
@@ -162,7 +162,7 @@ class CheckDependenciesTestCase(PluginTestCase):
 
             self.assertIsInstance(results[0], LinterError)
             self.assertEqual(
-                "The script dependency foo/example.inc is within a "
+                "The script dependency foo/example.nasl is within a "
                 "subdirectory, which is not allowed.",
                 results[0].message,
             )
@@ -170,13 +170,13 @@ class CheckDependenciesTestCase(PluginTestCase):
     def test_dependency_missing_newline(self):
         with self.create_directory() as tmpdir:
             path = tmpdir / "file.nasl"
-            example = tmpdir / "common" / "example.inc"
+            example = tmpdir / "common" / "example.nasl"
             example.parent.mkdir(parents=True)
             example.touch()
             content = (
                 '  script_tag(name:"cvss_base", value:"4.0");\n'
                 '  script_tag(name:"summary", value:"Foo Bar...");\n'
-                '  script_dependencies("example.inc", \n"example2.inc");\n'
+                '  script_dependencies("example.nasl", \n"example2.nasl");\n'
             )
             fake_context = self.create_file_plugin_context(
                 nasl_file=path, file_content=content, root=tmpdir
@@ -188,7 +188,7 @@ class CheckDependenciesTestCase(PluginTestCase):
             self.assertEqual(len(results), 1)
             self.assertIsInstance(results[0], LinterError)
             self.assertEqual(
-                "The script dependency example2.inc could "
+                "The script dependency example2.nasl could "
                 "not be found within the VTs.",
                 results[0].message,
             )

{troubadix-25.8.0 → troubadix-25.8.1}/tests/plugins/test_dependency_category_order.py

@@ -31,7 +31,7 @@ class CheckDependencyCategoryOrderTestCase(PluginTestCase):
         self.tempdir = TemporaryDirectory()
         self.dir = Path(self.tempdir) / "foo"
         self.dir.mkdir(parents=True)
-        self.dep = self.dir / "example.inc"
+        self.dep = self.dir / "example.nasl"
         self.dep.write_text(
             "  script_category(ACT_ATTACK);", encoding=CURRENT_ENCODING
         )
@@ -74,12 +74,12 @@ class CheckDependencyCategoryOrderTestCase(PluginTestCase):
         self.assertEqual(len(results), 0)
 
     def test_dependency_missing(self):
-        dependency = "example2.inc"
+        dependency = "example2.nasl"
         path = self.dir / "file.nasl"
         content = (
             '  script_tag(name:"cvss_base", value:"4.0");\n'
             '  script_tag(name:"summary", value:"Foo Bar...");\n'
-            '  script_dependencies("example2.inc");\n'
+            '  script_dependencies("example2.nasl");\n'
             "  script_category(ACT_SCANNER);\n"
         )
         fake_context = self.create_file_plugin_context(
@@ -102,7 +102,7 @@ class CheckDependencyCategoryOrderTestCase(PluginTestCase):
         content = (
             '  script_tag(name:"cvss_base", value:"4.0");\n'
             '  script_tag(name:"summary", value:"Foo Bar...");\n'
-            '  script_dependencies("example.inc");\n'
+            '  script_dependencies("example.nasl");\n'
             "  script_category(ACT_SCANNER);\n"
         )
         fake_context = self.create_file_plugin_context(
@@ -116,12 +116,12 @@ class CheckDependencyCategoryOrderTestCase(PluginTestCase):
         self.assertIsInstance(results[0], LinterError)
         self.assertEqual(
             "Script category ACT_SCANNER(1) is lower than the category "
-            "ACT_ATTACK(4) of the dependency example.inc.",
+            "ACT_ATTACK(4) of the dependency example.nasl.",
             results[0].message,
         )
 
     def test_category_missing(self):
-        dependency = "example.inc"
+        dependency = "example.nasl"
         path = self.dir / "file.nasl"
         content = (
             '  script_tag(name:"cvss_base", value:"4.0");\n'
@@ -147,7 +147,7 @@ class CheckDependencyCategoryOrderTestCase(PluginTestCase):
         content = (
             '  script_tag(name:"cvss_base", value:"4.0");\n'
             '  script_tag(name:"summary", value:"Foo Bar...");\n'
-            '  script_dependencies("example.inc");\n'
+            '  script_dependencies("example.nasl");\n'
             "  script_category(ACT_FOO);\n"
         )
         fake_context = self.create_file_plugin_context(

{troubadix-25.8.0 → troubadix-25.8.1}/tests/plugins/test_deprecated_dependency.py

@@ -29,7 +29,7 @@ class CheckDeprecatedDependencyTestCase(PluginTestCase):
         self.tempdir = TemporaryDirectory()
         self.dir = Path(self.tempdir) / "foo"
         self.dir.mkdir(parents=True)
-        self.dep = self.dir / "example.inc"
+        self.dep = self.dir / "example.nasl"
         self.dep.write_text(
             "  script_category(ACT_ATTACK);\n  exit(66);",
             encoding=CURRENT_ENCODING,
@@ -116,12 +116,12 @@ class CheckDeprecatedDependencyTestCase(PluginTestCase):
         self.assertEqual(len(results), 0)
 
     def test_dependency_missing(self):
-        dependency = "example2.inc"
+        dependency = "example2.nasl"
         path = self.dir / "file.nasl"
         content = (
             '  script_tag(name:"cvss_base", value:"4.0");\n'
             '  script_tag(name:"summary", value:"Foo Bar...");\n'
-            '  script_dependencies("example2.inc");\n'
+            '  script_dependencies("example2.nasl");\n'
             "  script_category(ACT_SCANNER);\n"
         )
 
@@ -145,7 +145,7 @@ class CheckDeprecatedDependencyTestCase(PluginTestCase):
         content = (
             '  script_tag(name:"cvss_base", value:"4.0");\n'
             '  script_tag(name:"summary", value:"Foo Bar...");\n'
-            '  script_dependencies("example.inc");\n'
+            '  script_dependencies("example.nasl");\n'
             "  script_category(ACT_SCANNER);\n"
         )
 
@@ -159,6 +159,6 @@ class CheckDeprecatedDependencyTestCase(PluginTestCase):
         self.assertEqual(len(results), 1)
         self.assertIsInstance(results[0], LinterError)
         self.assertEqual(
-            "VT depends on example.inc, which is marked as deprecated.",
+            "VT depends on example.nasl, which is marked as deprecated.",
             results[0].message,
         )

{troubadix-25.8.0 → troubadix-25.8.1}/tests/plugins/test_grammar.py

@@ -31,6 +31,10 @@ class CheckNewlinesTestCase(PluginTestCase):
             '  script_tag(name:"summary", value:"Foo Bar.");\n'
             '  script_tag(name:"vuldetect", value:"Sends multiple HTTP GET '
             'requests and checks the responses.");\n'
+            '  script_tag(name:"insight", value:"Determine which file systems '
+            "do not need to be supported based on the actual scenario and "
+            "disable mounting for these file systems through "
+            'configuration.");\n'
             '  script_tag(name:"solution_type", value:"VendorFix");\n'
             '  script_tag(name:"solution", value:"meh");\n'
         )

{troubadix-25.8.0 → troubadix-25.8.1}/tests/plugins/test_vt_placement.py

@@ -96,7 +96,7 @@ class CheckVTPlacementTestCase(PluginTestCase):
             content = (
                 '  script_tag(name:"cvss_base", value:"4.0");\n'
                 '  script_tag(name:"summary", value:"Foo Bar...");\n'
-                '  script_dependencies("example.inc");\n'
+                '  script_dependencies("example.nasl");\n'
             )
 
             fake_context = self.create_file_plugin_context(

{troubadix-25.8.0 → troubadix-25.8.1}/troubadix/__version__.py

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

{troubadix-25.8.0 → troubadix-25.8.1}/troubadix/plugins/badwords.py

@@ -96,6 +96,10 @@ EXCEPTIONS = [
     "firecracker",  # Valid package name on e.g. Fedora
     "Firecracker",  # Valid package name on e.g. Fedora
     "pcp-pmda-nutcracker",  # Valid package name on e.g. openSUSE or Arch Linux
+    # We should generally exclude http:// and https:// URLs as these are
+    # immutable and shouldn't be changed / require separate exclusions for each
+    "https://",
+    "http://",
 ]
 
 STARTS_WITH_EXCEPTIONS = [

{troubadix-25.8.0 → troubadix-25.8.1}/troubadix/plugins/grammar.py

@@ -56,7 +56,7 @@ exceptions = [
         r"these\s+error\s+(messages|reports|conditions)", re.IGNORECASE
     ),
     PatternCheck(
-        r"these\s+file\s+(permissions|overwrites|names|includes)",
+        r"these\s+file\s+(permissions|overwrites|names|includes|systems)",
         re.IGNORECASE,
     ),
     # nb: Valid sentence

{troubadix-25.8.0 → troubadix-25.8.1}/troubadix/plugins/script_xref_url.py

@@ -25,21 +25,21 @@ from troubadix.plugin import FileContentPlugin, LinterError, LinterResult
 
 ALLOWED_URLS = [
     "https://lists.apache.org/thread.html/e1ef853fc0079cdb55be"
-    "fbd2dac042934e49288b476d5f6a649e5da2@<announce.tomcat.apache.org>",
+    + "fbd2dac042934e49288b476d5f6a649e5da2@<announce.tomcat.apache.org>",
     "https://lists.apache.org/thread.html/e1ef853fc0079cdb55be"
-    "fbd2dac042934e49288b476d5f6a649e5da2@<announce.tomcat.apache.org>",
+    + "fbd2dac042934e49288b476d5f6a649e5da2@<announce.tomcat.apache.org>",
     "https://m0ze.ru/vulnerability/[2021-05-26]-[WordPress]-[C"
-    "WE-79]-WP-Reset-WordPress-Plugin-v1.86.txt",
+    + "WE-79]-WP-Reset-WordPress-Plugin-v1.86.txt",
     "http://yehg.net/lab/pr0js/advisories/joomla/core/[joomla_"
-    "1.0.x~15]_cross_site_scripting",
+    + "1.0.x~15]_cross_site_scripting",
     "http://yehg.net/lab/pr0js/advisories/eclipse/[eclipse_hel"
-    "p_server]_cross_site_scripting",
+    + "p_server]_cross_site_scripting",
     "http://core.yehg.net/lab/pr0js/advisories/dll_hijacking/["
-    "flash_player]_10.1.x_insecure_dll_hijacking_(dwmapi.dll)",
+    + "flash_player]_10.1.x_insecure_dll_hijacking_(dwmapi.dll)",
     "https://lists.apache.org/thread.html/773c93c2d8a6a52bbe9"
-    "7610c2b1c2ad205b970e1b8c04fb5b2fccad6@<general.hadoop.apache.org>",
+    + "7610c2b1c2ad205b970e1b8c04fb5b2fccad6@<general.hadoop.apache.org>",
     "http://mail-archives.apache.org/mod_mbox/perl-advocacy/2"
-    "00904.mbox/<ad28918e0904011458h273a71d4x408f1ed286c9dfbc@mail.gmail.com>",
+    + "00904.mbox/<ad28918e0904011458h273a71d4x408f1ed286c9dfbc@mail.gmail.com>",
     "http://yehg.net/lab/pr0js/advisories/[mybb1.6]_cross_site_scripting",
     "http://www.live555.com/liveMedia/public/changelog.txt#[2021.08.04]",
     "http://www.live555.com/liveMedia/public/changelog.txt#[2021.08.06]",

{troubadix-25.8.0 → troubadix-25.8.1}/troubadix/plugins/valid_oid.py

@@ -425,9 +425,7 @@ class CheckValidOID(FileContentPlugin):
         exceptions = [
             "ossim_server_detect.nasl",
             "gsf/2018/vmware/gb_vmware_fusion_vmxnet3_"
-            "stack_memory_usage_vuln_macosx.nasl",
-            "enterprise/2018/vmware/gb_vmware_fusion_vmxnet3_"
-            "stack_memory_usage_vuln_macosx.nasl",
+            + "stack_memory_usage_vuln_macosx.nasl",
             "2008/asterisk_sdp_header_overflow.nasl",
             "2008/cisco_ios_ftp_server_auth_bypass.nasl",
             "2008/qk_smtp_server_dos.nasl",