Merge commit from fork

Signed-off-by: degenaro <lou.degenaro@gmail.com>

Author: degenaro

tests/trestle/utils/fs_test.py

@@ -621,6 +621,13 @@ def test_is_hidden_windows(tmp_path) -> None:
         ('component-definitions', False),
         ('hello.world', False),
         ('component-definitions/hello', False),
+        # Path traversal attack vectors (CVE-2026-46345 fix)
+        ('/tmp/pwned', False),  # Absolute path
+        ('/etc/passwd', False),  # Absolute path
+        ('../../tmp/pwned', False),  # Leading .. traversal
+        ('subdir/../../../tmp/pwned', False),  # Non-leading .. traversal
+        ('subdir/../../etc/passwd', False),  # Non-leading .. traversal
+        ('normal/../path', False),  # Any .. component
     ],
 )
 def test_allowed_task_name(task_name: str, outcome: bool) -> None:

trestle/common/file_utils.py

@@ -105,6 +105,17 @@ def is_directory_name_allowed(name: str) -> bool:
     # Task must not self-interfere with a project
     pathed_name = pathlib.Path(name)
 
+    # Defense-in-depth: reject absolute paths
+    # Check both is_absolute() and if path starts with '/' to handle Unix-style paths on Windows
+    if pathed_name.is_absolute() or name.startswith('/'):
+        logger.warning('Task name must not be an absolute path')
+        return False
+
+    # Defense-in-depth: reject any path containing ".." components
+    if '..' in pathed_name.parts:
+        logger.warning('Task name must not contain ".." path traversal sequences')
+        return False
+
     root_path = pathed_name.parts[0]
     if root_path in const.MODEL_TYPE_TO_MODEL_DIR.values():
         logger.warning('Task name is the same as an OSCAL schema name.')

trestle/core/commands/author/catalog.py

@@ -34,6 +34,7 @@
 from trestle.core.commands.common.return_codes import CmdReturnCodes
 from trestle.core.control_context import ContextPurpose, ControlContext
 from trestle.core.models.file_content_type import FileContentType
+from trestle.core.remote.security import PathSecurityValidator
 from trestle.oscal import OSCAL_VERSION
 from trestle.oscal.catalog import Catalog
 
@@ -89,6 +90,9 @@ def _run(self, args: argparse.Namespace) -> int:
 
             markdown_path = trestle_root / args.output
 
+            # Validate output path to prevent path traversal
+            PathSecurityValidator.validate_local_path(markdown_path, trestle_root)
+
             return self.generate_markdown(
                 trestle_root, catalog_path, markdown_path, yaml_header, args.overwrite_header_values
             )

trestle/core/commands/author/headers.py

@@ -315,7 +315,7 @@ def validate(
                 # Files in the root directory must be exclused
                 if path.is_file():
                     continue
-                if not file_utils.is_directory_name_allowed(path):
+                if not file_utils.is_directory_name_allowed(str(relative_path)):
                     continue
                 if str(relative_path).rstrip('/') in const.MODEL_DIR_LIST:
                     continue

trestle/core/commands/author/prof.py

@@ -43,6 +43,7 @@
 from trestle.common.load_validate import load_validate_model_name
 from trestle.common.model_utils import ModelUtils
 from trestle.core.catalog.catalog_api import CatalogAPI
+from trestle.core.remote.security import PathSecurityValidator
 from trestle.core.commands.author.common import AuthorCommonCommand
 from trestle.core.commands.common.cmd_utils import clear_folder
 from trestle.core.commands.common.return_codes import CmdReturnCodes
@@ -109,6 +110,9 @@ def _run(self, args: argparse.Namespace) -> int:
 
             markdown_path = trestle_root / args.output
 
+            # Validate output path to prevent path traversal
+            PathSecurityValidator.validate_local_path(markdown_path, trestle_root)
+
             return self.generate_markdown(
                 trestle_root,
                 profile_path,

trestle/core/commands/author/ssp.py

@@ -38,6 +38,7 @@
 from trestle.core.catalog.catalog_reader import CatalogReader
 from trestle.core.commands.author.common import AuthorCommonCommand
 from trestle.core.commands.author.component import ComponentAssemble
+from trestle.core.remote.security import PathSecurityValidator
 from trestle.core.commands.common.cmd_utils import clear_folder
 from trestle.core.commands.common.return_codes import CmdReturnCodes
 from trestle.core.control_context import ContextPurpose, ControlContext
@@ -110,6 +111,9 @@ def _run(self, args: argparse.Namespace) -> int:
 
             md_path = trestle_root / args.output
 
+            # Validate output path to prevent path traversal
+            PathSecurityValidator.validate_local_path(md_path, trestle_root)
+
             return self._generate_ssp_markdown(
                 trestle_root,
                 args.profile,

trestle/core/commands/create.py

@@ -28,6 +28,7 @@
 from trestle.common.model_utils import ModelUtils
 from trestle.core import generators
 from trestle.core.commands.add import Add
+from trestle.core.remote.security import PathSecurityValidator
 from trestle.core.commands.command_docs import CommandPlusDocs
 from trestle.core.commands.common.return_codes import CmdReturnCodes
 from trestle.core.models.actions import CreatePathAction, WriteFileAction
@@ -94,6 +95,9 @@ def create_object(cls, model_alias: str, object_type: Type[TopLevelOscalModel],
 
         desired_model_dir = trestle_root / plural_path / args.output
 
+        # Validate output path to prevent path traversal
+        PathSecurityValidator.validate_local_path(desired_model_dir, trestle_root)
+
         desired_model_path = desired_model_dir / (model_alias + '.' + args.extension)
 
         if desired_model_path.exists():

trestle/core/commands/replicate.py

@@ -24,6 +24,7 @@
 from trestle.core.commands.command_docs import CommandPlusDocs
 from trestle.core.commands.common.return_codes import CmdReturnCodes
 from trestle.core.models.actions import CreatePathAction, WriteFileAction
+from trestle.core.remote.security import PathSecurityValidator
 from trestle.core.models.elements import Element
 from trestle.core.models.file_content_type import FileContentType
 from trestle.core.models.plans import Plan
@@ -90,6 +91,9 @@ def replicate_object(cls, model_alias: str, args: argparse.Namespace) -> int:
             trestle_root / plural_path / args.output / (model_alias + FileContentType.to_file_extension(content_type))
         )
 
+        # Validate output path to prevent path traversal
+        PathSecurityValidator.validate_local_path(rep_model_path, trestle_root)
+
         if rep_model_path.exists():
             raise TrestleError(f'OSCAL file to be replicated here: {rep_model_path} exists.')