gulp-cli 1.1.6__tar.gz → 1.1.8__tar.gz

{gulp_cli-1.1.6/src/gulp_cli.egg-info → gulp_cli-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gulp-cli
-Version: 1.1.6
+Version: 1.1.8
 Summary: Command-line client for gULP
 Author-email: Mentat <info@mentat.is>
 Requires-Python: >=3.12

{gulp_cli-1.1.6 → gulp_cli-1.1.8}/src/gulp_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.1.6'
-__version_tuple__ = version_tuple = (1, 1, 6)
+__version__ = version = '1.1.8'
+__version_tuple__ = version_tuple = (1, 1, 8)
 
-__commit_id__ = commit_id = 'g8d034cc8b'
+__commit_id__ = commit_id = 'g6f1fa3720'

{gulp_cli-1.1.6 → gulp_cli-1.1.8}/src/gulp_cli/commands/ingest.py

@@ -280,6 +280,29 @@ def _resolve_glob_base(pattern_path: Path) -> Path:
     return base_dir.resolve()
 
 
+def _safe_archive_name(path: str) -> str:
+    """Return a ZIP entry path without roots or dot-directory components."""
+    return "/".join(
+        _zip_path_part(part)
+        for part in path.replace("\\", "/").split("/")
+        if part not in ("", ".", "..")
+    )
+
+
+def _zip_path_part(part: str) -> str:
+    if re.fullmatch(r"[A-Za-z]:", part):
+        return part[0]
+    return part
+
+
+def _preserved_archive_name(source_path: Path) -> str:
+    try:
+        absolute_path = source_path.resolve()
+    except OSError:
+        absolute_path = Path(os.path.abspath(source_path))
+    return _safe_archive_name(str(absolute_path))
+
+
 def _build_zip_from_sources(
     output_zip: Path,
     sources: list[tuple[Path, Path]],
@@ -299,16 +322,12 @@ def _build_zip_from_sources(
 
     def _archive_name_for_path(source_path: Path, base_dir: Path) -> str:
         if preserve_path:
-            try:
-                rel_path = os.path.relpath(source_path, Path.cwd())
-            except ValueError:
-                rel_path = source_path.name
-            return Path(rel_path).as_posix()
+            return _preserved_archive_name(source_path)
         try:
             rel_path = source_path.relative_to(base_dir)
         except ValueError:
             rel_path = source_path.name
-        return rel_path.as_posix()
+        return _safe_archive_name(rel_path.as_posix())
 
     planned_entries: list[tuple[Path, Path, str]] = []
     for source_path, base_dir in sources:

{gulp_cli-1.1.6 → gulp_cli-1.1.8/src/gulp_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gulp-cli
-Version: 1.1.6
+Version: 1.1.8
 Summary: Command-line client for gULP
 Author-email: Mentat <info@mentat.is>
 Requires-Python: >=3.12

{gulp_cli-1.1.6 → gulp_cli-1.1.8}/src/gulp_cli.egg-info/SOURCES.txt

@@ -33,6 +33,8 @@ src/gulp_cli.egg-info/SOURCES.txt
 src/gulp_cli.egg-info/dependency_links.txt
 src/gulp_cli.egg-info/entry_points.txt
 src/gulp_cli.egg-info/requires.txt
+src/gulp_cli.egg-info/scm_file_list.json
+src/gulp_cli.egg-info/scm_version.json
 src/gulp_cli.egg-info/top_level.txt
 src/gulp_cli/commands/__init__.py
 src/gulp_cli/commands/acl.py

gulp_cli-1.1.8/src/gulp_cli.egg-info/scm_file_list.json

@@ -0,0 +1,61 @@
+{
+  "files": [
+    "GULP_DUAL_LICENSE.txt",
+    "README.md",
+    "pyproject.toml",
+    "LICENSE.AGPL-3.0.txt",
+    "LICENSE.md",
+    "gulp-cli.spec",
+    ".gitignore",
+    "portable/launch-windows.bat",
+    "portable/launch-linux.sh",
+    "portable/launch-macos.sh",
+    "docs/troubleshooting-cli.md",
+    "docs/examples.md",
+    "docs/getting-started.md",
+    "docs/extensions.md",
+    "docs/resource-management.md",
+    "docs/portable.md",
+    "docs/command-reference.md",
+    "src/gulp_cli/__init__.py",
+    "src/gulp_cli/version.py",
+    "src/gulp_cli/extension_helpers.py",
+    "src/gulp_cli/output.py",
+    "src/gulp_cli/config.py",
+    "src/gulp_cli/utils.py",
+    "src/gulp_cli/client.py",
+    "src/gulp_cli/extensions.py",
+    "src/gulp_cli/cli.py",
+    "src/gulp_cli/__main__.py",
+    "src/gulp_cli/extension/query_sigma_zip.py",
+    "src/gulp_cli/extension/story.py",
+    "src/gulp_cli/extension/__init__.py",
+    "src/gulp_cli/commands/__init__.py",
+    "src/gulp_cli/commands/source.py",
+    "src/gulp_cli/commands/ingest.py",
+    "src/gulp_cli/commands/users.py",
+    "src/gulp_cli/commands/glyph.py",
+    "src/gulp_cli/commands/context.py",
+    "src/gulp_cli/commands/acl.py",
+    "src/gulp_cli/commands/user_group.py",
+    "src/gulp_cli/commands/utility.py",
+    "src/gulp_cli/commands/operations.py",
+    "src/gulp_cli/commands/auth.py",
+    "src/gulp_cli/commands/stats.py",
+    "src/gulp_cli/commands/enrich.py",
+    "src/gulp_cli/commands/query.py",
+    "src/gulp_cli/commands/enhance_map.py",
+    "src/gulp_cli/commands/storage.py",
+    "src/gulp_cli/commands/db.py",
+    "src/gulp_cli/commands/collab.py",
+    "src/gulp_cli/commands/mapping.py",
+    "src/gulp_cli/commands/plugin.py",
+    "tests/test_ingest_paths_file.py",
+    "tests/test_version.py",
+    "tests/test_enrich_live.py",
+    "tests/test_zip_create.py",
+    "tests/test_ingest_wait_log.py",
+    ".github/workflows/portable-bundles.yml",
+    ".github/workflows/python-package.yml"
+  ]
+}

gulp_cli-1.1.8/src/gulp_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.1.8",
+  "distance": 0,
+  "node": "g6f1fa372096bd3824cc9172417c6b33f5fcebbc1",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-06-24"
+}

{gulp_cli-1.1.6 → gulp_cli-1.1.8}/tests/test_zip_create.py

@@ -12,6 +12,7 @@ import typer
 from gulp_cli.commands.ingest import (
     _build_zip_from_sources,
     _expand_source_patterns,
+    _safe_archive_name,
     ingest_zip_create,
 )
 from gulp_cli.config import set_runtime_config_dir
@@ -87,11 +88,53 @@ def test_build_zip_from_sources_preserves_path_when_requested(
     )
 
     assert archived_count == 1
-    assert archived_entries == ["samples/nested/data.json"]
+    assert archived_entries == [_safe_archive_name(str(source_file.resolve()))]
     assert len(created_archives) == 1
 
     with zipfile.ZipFile(created_archives[0]) as archive:
-        assert archive.namelist() == ["samples/nested/data.json"]
+        assert archive.namelist() == archived_entries
+
+
+@pytest.mark.parametrize(
+    ("path", "expected"),
+    [
+        ("./samples/nested/data.json", "samples/nested/data.json"),
+        (".\\samples\\nested\\data.json", "samples/nested/data.json"),
+        ("../../../samples/nested/data.json", "samples/nested/data.json"),
+        ("C:\\samples\\nested\\data.json", "C/samples/nested/data.json"),
+        ("\\\\server\\share\\samples\\nested\\data.json", "server/share/samples/nested/data.json"),
+    ],
+)
+def test_safe_archive_name_strips_roots_and_dot_paths(
+    path: str, expected: str
+) -> None:
+    assert _safe_archive_name(path) == expected
+
+
+def test_build_zip_from_sources_strips_parent_paths_when_preserving(
+    tmp_path: Path, monkeypatch
+) -> None:
+    source_dir = tmp_path / "samples" / "win_evtx"
+    source_dir.mkdir(parents=True)
+    source_file = source_dir / "2-system-Microsoft-Windows-LiveId%4Operational.evtx"
+    source_file.write_text("payload", encoding="utf-8")
+    cwd = tmp_path / "a" / "b" / "c"
+    cwd.mkdir(parents=True)
+    monkeypatch.chdir(cwd)
+
+    output_zip = tmp_path / "out.zip"
+    archived_count, archived_entries, created_archives = _build_zip_from_sources(
+        output_zip,
+        [(source_file, source_dir.parent)],
+        preserve_path=True,
+    )
+
+    expected = _safe_archive_name(str(source_file.resolve()))
+    assert archived_count == 1
+    assert archived_entries == [expected]
+
+    with zipfile.ZipFile(created_archives[0]) as archive:
+        assert archive.namelist() == [expected]
 
 
 def test_build_zip_from_sources_prints_file_progress(