troubadix 25.3.4__py3-none-any.whl → 25.4.0__py3-none-any.whl

troubadix/__version__.py

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

troubadix/codespell/codespell.additions

@@ -22,3 +22,5 @@ entreprise->enterprise
 entreprises->enterprises
 iit->it
 itt->it
+CSFR->CSRF
+XXS->XSS

troubadix/codespell/codespell.exclude

@@ -815,6 +815,8 @@ ofproto/bond: fix interal flow leak of tcp-balance bond
   of user-supplied input processed by Steam In-Home Streaming (IHS) Discovery
   of Wiesemann & Theis GmbH W&T OPC Server for Windows.");
 Ohter bug fixes:
+"olt",
+"olt/pages",
       # on e.g. newer releases of the NAM appliance we're even getting an 403/forbidden
 opc_req_header = raw_string("HEL",   # Message Type (Hello)
 opening a specially crafted CAF audio file, an attacker could execute

troubadix/plugins/grammar.py

@@ -174,6 +174,11 @@ 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
+        # 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|"
         # 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/standalone_plugins/dependency_graph/checks.py

@@ -17,12 +17,10 @@ def check_duplicates(scripts: list[Script]) -> Result:
     for script in scripts:
         counter = Counter(dep.name for dep in script.dependencies)
         duplicates = [dep for dep, count in counter.items() if count > 1]
-
         if duplicates:
-            msg = f"Duplicate dependencies in {script.name}: {', '.join(duplicates)}"
-            warnings.append(msg)
+            warnings.append(f"in {script.name}: {', '.join(duplicates)}")
 
-    return Result(name="check_duplicates", warnings=warnings)
+    return Result(name="duplicate dependency", warnings=warnings)
 
 
 def check_missing_dependencies(
@@ -34,20 +32,22 @@ def check_missing_dependencies(
     logs the scripts dependending on the missing script
     """
     errors = []
-    dependencies = {
+    dependency_names = {
         dep.name for script in scripts for dep in script.dependencies
     }
     script_names = {script.name for script in scripts}
-    missing_dependencies = dependencies - script_names
+    missing_dependencies = dependency_names - script_names
 
     for missing in missing_dependencies:
         depending_scripts = graph.predecessors(missing)
-        msg = f"missing dependency file: {missing}:"
-        for script in depending_scripts:
-            msg += f"\n  - used by: {script}"
-        errors.append(msg)
+        errors.append(
+            f"{missing}:"
+            + "".join(
+                f"\n  - used by: {script}" for script in depending_scripts
+            )
+        )
 
-    return Result(name="missing_dependencies", errors=errors)
+    return Result(name="missing dependency", errors=errors)
 
 
 def check_cycles(graph) -> Result:
@@ -59,8 +59,8 @@ def check_cycles(graph) -> Result:
 
     cycles = nx.simple_cycles(graph)
 
-    errors = [f"cyclic dependency: {cycle}" for cycle in cycles]
-    return Result(name="check_cycles", errors=errors)
+    errors = [str(cycle) for cycle in cycles]
+    return Result(name="cyclic dependency", errors=errors)
 
 
 def cross_feed_dependencies(
@@ -86,22 +86,19 @@ def check_cross_feed_dependencies(graph) -> Result:
     and if they are correctly contained within a is_enterprise_feed check.
     """
     gated_cfd = cross_feed_dependencies(graph, is_enterprise_checked=True)
-    warnings = [
-        f"cross-feed-dependency: {dependent}(community feed) "
-        f"depends on {dependency}(enterprise feed)"
+    infos = [
+        f"{dependent}(community feed) depends on {dependency}(enterprise feed)"
         for dependent, dependency in gated_cfd
     ]
 
     ungated_cfd = cross_feed_dependencies(graph, is_enterprise_checked=False)
     errors = [
-        f"unchecked cross-feed-dependency: {dependent}(community feed) "
-        f"depends on {dependency}(enterprise feed), but the current feed is not properly checked"
+        f"incorrect feed check in {dependent}(community feed) "
+        f"which depends on {dependency}(enterprise feed)"
         for dependent, dependency in ungated_cfd
     ]
 
-    return Result(
-        name="check_cross_feed_dependencies", warnings=warnings, errors=errors
-    )
+    return Result(name="cross-feed dependency", infos=infos, errors=errors)
 
 
 def check_category_order(graph) -> Result:
@@ -116,7 +113,7 @@ def check_category_order(graph) -> Result:
         f"{dependent} depends on {dependency} which has a lower category order"
         for dependent, dependency in problematic_edges
     ]
-    return Result(name="check_category_order", errors=errors)
+    return Result(name="category order", errors=errors)
 
 
 def check_deprecated_dependencies(graph) -> Result:
@@ -125,4 +122,4 @@ def check_deprecated_dependencies(graph) -> Result:
         for dependent, dependency in graph.edges()
         if graph.nodes[dependency].get("deprecated", False)
     ]
-    return Result(name="check_deprecated_dependencies", errors=errors)
+    return Result(name="deprecated dependency", errors=errors)

troubadix/standalone_plugins/dependency_graph/cli.py

@@ -3,7 +3,7 @@
 
 
 import os
-from argparse import ArgumentParser, ArgumentTypeError, Namespace
+from argparse import ArgumentParser, Namespace
 from pathlib import Path
 
 from troubadix.argparser import directory_type_existing
@@ -11,13 +11,6 @@ from troubadix.argparser import directory_type_existing
 from .models import Feed
 
 
-def feed_type(value: str) -> Feed:
-    try:
-        return Feed[value.upper()]
-    except KeyError:
-        raise ArgumentTypeError(f"Invalid Feed value: '{value}'")
-
-
 def parse_args() -> Namespace:
     parser = ArgumentParser(
         description="Tool for analysing the dependencies in the NASL repository.",
@@ -31,18 +24,18 @@ def parse_args() -> Namespace:
     parser.add_argument(
         "-f",
         "--feed",
-        type=feed_type,
+        type=Feed,
         choices=Feed,
-        nargs="+",
-        default=[Feed.FULL],
-        help="feed",
+        default=Feed.COMMON,
+        help="Feed selection",
     )
     parser.add_argument(
         "--log",
+        type=str.upper,
         default="WARNING",
-        help="Set the logging level (INFO, WARNING, ERROR)",
+        choices=["INFO", "WARNING", "ERROR"],
+        help="Set the logging level (default: WARNING)",
     )
-    parser.add_argument("-v", "--verbose", action="count", default=0)
 
     args = parser.parse_args()
 

troubadix/standalone_plugins/dependency_graph/dependency_graph.py

@@ -5,7 +5,6 @@
 import logging
 import re
 import sys
-from functools import reduce
 from pathlib import Path
 
 import networkx as nx
@@ -47,46 +46,23 @@ ENTERPRISE_FEED_CHECK_PATTERN = re.compile(
 
 
 class Reporter:
-    def __init__(self, verbosity) -> None:
-        self.verbosity = verbosity
+    def __init__(self) -> None:
+        self.logger = logging.getLogger(__name__)
 
     def report(self, results: list[Result]):
         for result in results:
-            if self.verbosity >= 2:
-                self.print_statistic(result)
-                self.print_divider()
-            if self.verbosity >= 1:
-                self.print_warnings(result)
-            self.print_errors(result)
-            if self.verbosity >= 2:
-                self.print_divider("=")
-
-    def print_divider(self, char="-", length=40):
-        print(char * length)
-
-    def print_statistic(self, result: Result):
-        print(
-            f"{result.name} - warnings: {len(result.warnings)}, errors: {len(result.errors)}"
-        )
-
-    def print_warnings(self, result: Result):
-        for warning in result.warnings:
-            print(f"warning: {warning}")
+            for error in result.errors:
+                self.logger.error(f"{result.name}: {error}")
+            for warning in result.warnings:
+                self.logger.warning(f"{result.name}: {warning}")
+            for info in result.infos:
+                self.logger.info(f"{result.name}: {info}")
 
-    def print_errors(self, result: Result):
-        for error in result.errors:
-            print(f"error: {error}")
 
-
-def get_feed(root, feeds: list[Feed]) -> list[Script]:
-    feed = reduce((lambda x, y: x | y), feeds)
-    scripts = []
-    if feed & Feed.COMMON:
-        scripts.extend(get_scripts(root / "common"))
-    if feed & Feed.FEED_21_04:
-        scripts.extend(get_scripts(root / "21.04"))
-    if feed & Feed.FEED_22_04:
-        scripts.extend(get_scripts(root / "22.04"))
+def get_feed(root: Path, feed: Feed) -> list[Script]:
+    scripts = get_scripts(root / "common")  # Always include common
+    if feed != Feed.COMMON:  # Add version-specific scripts if not just common
+        scripts.extend(get_scripts(root / feed.value))
 
     return scripts
 
@@ -197,7 +173,7 @@ def main():
         check_category_order(graph),
         check_deprecated_dependencies(graph),
     ]
-    reporter = Reporter(args.verbose)
+    reporter = Reporter()
     reporter.report(results)
 
     if any(result.errors for result in results):

troubadix/standalone_plugins/dependency_graph/models.py

@@ -2,18 +2,19 @@
 # SPDX-FileCopyrightText: 2025 Greenbone AG
 
 from dataclasses import dataclass, field
-from enum import Flag, auto
+from enum import Enum
 
 
-class Feed(Flag):
-    COMMON = auto()
-    FEED_21_04 = auto()
-    FEED_22_04 = auto()
-    FULL = COMMON | FEED_21_04 | FEED_22_04
+class Feed(str, Enum):
+    COMMON = "common"
+    FEED_21_04 = "21.04"
+    FEED_22_04 = "22.04"
 
-    def __str__(self):
-        # Make enum values user-friendly for argparse help
-        return self.name.lower()
+
+class OutputLevel(Enum):
+    ERROR = 1
+    WARNING = 2
+    INFO = 3
 
 
 @dataclass
@@ -35,6 +36,11 @@ class Script:
 
 @dataclass
 class Result:
+    """Holds the results of a single check.
+    A check can report a combination of errors, warnings and infos
+    """
+
     name: str
     warnings: list[str] = field(default_factory=list)
     errors: list[str] = field(default_factory=list)
+    infos: list[str] = field(default_factory=list)

{troubadix-25.3.4.dist-info → troubadix-25.4.0.dist-info}/METADATA

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

{troubadix-25.3.4.dist-info → troubadix-25.4.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 troubadix/__init__.py,sha256=K7sIXXDrC7YRb7BvIpdQ6ZfG_QkT0qUH_wAlHROVRfM,716
-troubadix/__version__.py,sha256=6B3bcxEjbrE40xqOYtLub3azpa0RnygbksMumocgszA,103
+troubadix/__version__.py,sha256=tBwIKM3lj8Q-OeDPH_A20MFR1-rIB7BcVcpYNmTniHU,103
 troubadix/argparser.py,sha256=-H07Jhqh68_M4Mbjq9qJjTr3MShy_N2pxl2qHA6cfRU,7481
-troubadix/codespell/codespell.additions,sha256=NAYnQF79kdk4YhU_h8fpjAVVkqBm778aPHPPP7FEkZY,504
-troubadix/codespell/codespell.exclude,sha256=RS0PH7Px2NRg40UpreuXfnInaC4veaeeDxP1FNac4ms,147431
+troubadix/codespell/codespell.additions,sha256=E62zoHJavUhcbMoyBqO2rOUe3OqIXikh7uAiGmNs5uw,524
+troubadix/codespell/codespell.exclude,sha256=8blBv8KRrKU4KQhneHOPth1tSCYdrEoOCI5kYRfhOEA,147451
 troubadix/codespell/codespell.ignore,sha256=2CP8u6O2VENcDpt2FfEDNmfa1Eh3D80yeYHT54GM1X4,1512
 troubadix/helper/__init__.py,sha256=tp2fPLzwGEA_2eiJbvuePiY6rjYSFxx7VUsCV4fSwvw,1110
 troubadix/helper/helper.py,sha256=GXapYLii2rLKwkX2ok31YoAdUSizBnyPjWz-aPP6HM8,3105
@@ -26,7 +26,7 @@ troubadix/plugins/duplicated_script_tags.py,sha256=UPBR2jbU15JLKJlVk1e2GFREH5Wj5
 troubadix/plugins/encoding.py,sha256=zNzqNpP39TUwOklnc8OJ3OIUelAN_hvnuBYoa3Pz764,2104
 troubadix/plugins/forking_nasl_functions.py,sha256=pYUebqPBWuqfLmnRYJgpGnrmx4YbnKIiRG8cmsIgmq4,6014
 troubadix/plugins/get_kb_on_services.py,sha256=oFmcjiF7ZD3x5tEbJEoZNn80y1qUzNgeSZNsogSqaZ0,3401
-troubadix/plugins/grammar.py,sha256=ITSpQ_ud4aeyHKslGhr4nrbXb7jpi1ftGkB_hNBvl-Y,9135
+troubadix/plugins/grammar.py,sha256=iEDFtQX-t1oLFeXiOTHM0NBHeY3X9WZrp1SNZPQT8vw,9411
 troubadix/plugins/http_links_in_tags.py,sha256=yKT5SgLo__TJKAfudfIHkoMF0g9VtOP4VI77dANj014,7221
 troubadix/plugins/illegal_characters.py,sha256=B6q_RU85AxCjLry56Oc-RhMSpnJU8mTrxclRzi1FVFU,4406
 troubadix/plugins/log_messages.py,sha256=COrnp3bXMG8PRIAD2x5Ka9hk-jI16We9ifXj6JBZI0c,2960
@@ -88,18 +88,18 @@ troubadix/standalone_plugins/changed_packages/marker/marker.py,sha256=7uZXR2Ds_8
 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/dependency_graph/__init__.py,sha256=SQSaQXWmpq5-5ozpqMgvnvoYTK8oj64A5kie1m_5bWQ,88
-troubadix/standalone_plugins/dependency_graph/checks.py,sha256=nrpY2cyQlRb-A6gbVq-1bQEYlanNdOJwfX4liwjiN6Q,4249
-troubadix/standalone_plugins/dependency_graph/cli.py,sha256=osTVMWknVo_jWmlaYtRM-qcE88c_YVcT1my-jnFdxiM,1510
-troubadix/standalone_plugins/dependency_graph/dependency_graph.py,sha256=TB54FTBFlt2iNDqLrlYj9AO04ntS7DN44ASMwfbJWy8,6257
-troubadix/standalone_plugins/dependency_graph/models.py,sha256=bEvj71inolH-_NLv1fEHMYF8tH9ck-T0jIlThR91uPM,918
+troubadix/standalone_plugins/dependency_graph/checks.py,sha256=O4KyiVKpKxrgdmADXiduKY794nZndyy7epilbbY7JLo,4074
+troubadix/standalone_plugins/dependency_graph/cli.py,sha256=RIyGeSm83XJ88N7Ati6z417hXkMajzzAtqdxnOg-urI,1305
+troubadix/standalone_plugins/dependency_graph/dependency_graph.py,sha256=G_Ilm_EENpVHTw8wItknbfytVPRuTnVN1OoZEYvlTaU,5613
+troubadix/standalone_plugins/dependency_graph/models.py,sha256=7kLrjFRdyReTRTgxte6-3KCBve4evg91AcqkX4I8VJU,1002
 troubadix/standalone_plugins/deprecate_vts.py,sha256=mLt2DV9Y1YAEuh6c4nFweZYIOprsBzO7115dihEn4lA,7602
 troubadix/standalone_plugins/file_extensions.py,sha256=fqswrhCcQqygIszcnobS9hFQmSpv3gDkvlufoaTckBg,2355
 troubadix/standalone_plugins/last_modification.py,sha256=ROzwVzzYilXJ0llVt4Lv0w8b9BJKoahl6YxPDiub614,4338
 troubadix/standalone_plugins/no_solution.py,sha256=p_-az9Igl4GH6HnhLLYbYlWIiEP64OTQLpX-z3JAshs,8760
 troubadix/standalone_plugins/version_updated.py,sha256=6YHF0OjL5NWszQdsSh7XzlSji1e6Uaqwu_Y6m3R0mvI,4203
 troubadix/troubadix.py,sha256=5__Jz3bYSrya4aG6RCBWxqnsDepXfwXZ3v0bjCzEFi0,6039
-troubadix-25.3.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-troubadix-25.3.4.dist-info/METADATA,sha256=YiQ1TIlcRGSKXKylM9ADwcIIMTar7pp-5E2Pmp1a2sA,4462
-troubadix-25.3.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-troubadix-25.3.4.dist-info/entry_points.txt,sha256=SnhEUe4W76P-ADmO9J355gRztTyHU_PTxRewKy3-e5o,832
-troubadix-25.3.4.dist-info/RECORD,,
+troubadix-25.4.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+troubadix-25.4.0.dist-info/METADATA,sha256=OGl9HWxYNgk0wTFIU5q5Q2Z6uf4VGcfg-YfSpQT87zo,4462
+troubadix-25.4.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+troubadix-25.4.0.dist-info/entry_points.txt,sha256=SnhEUe4W76P-ADmO9J355gRztTyHU_PTxRewKy3-e5o,832
+troubadix-25.4.0.dist-info/RECORD,,

{troubadix-25.3.4.dist-info → troubadix-25.4.0.dist-info}/WHEEL

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