confpub-cli 1.4.2__tar.gz → 1.4.4__tar.gz

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confpub-cli
-Version: 1.4.2
+Version: 1.4.4
 Summary: Agent-first CLI to publish Markdown to Confluence
 Project-URL: Homepage, https://github.com/ThomasRohde/confpub-cli
 Project-URL: Repository, https://github.com/ThomasRohde/confpub-cli.git

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/confpub/__init__.py

@@ -1,3 +1,3 @@
 """confpub — Agent-first CLI to publish Markdown to Confluence."""
 
-__version__ = "1.4.2"
+__version__ = "1.4.4"

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/confpub/cli.py

@@ -13,11 +13,30 @@ from typing import Any, Iterator, Optional
 
 import typer
 
+import os
+
 from confpub import __version__
 from confpub.envelope import Envelope
 from confpub.errors import ConfpubError, exit_code_for, ERR_INTERNAL_SDK
 from confpub.output import emit_stderr, emit_stdout, is_compact, is_verbose, set_compact, set_quiet, set_verbose
 
+
+def _resolve_space(cli_space: str | None, required: bool = False) -> str | None:
+    """Resolve space from CLI flag or CONFPUB_SPACE env var, with validation."""
+    from confpub.config import ENV_SPACE
+    from confpub.errors import validate_space_key
+
+    space = cli_space or os.environ.get(ENV_SPACE)
+    if space is not None:
+        validate_space_key(space)
+        return space
+    if required:
+        raise ConfpubError(
+            "ERR_VALIDATION_REQUIRED",
+            "Space key is required. Use --space or set CONFPUB_SPACE.",
+        )
+    return None
+
 # ---------------------------------------------------------------------------
 # Subcommand group apps
 # ---------------------------------------------------------------------------
@@ -197,12 +216,14 @@ def command_context(command_name: str, target: dict[str, Any] | None = None) ->
 
 @page_app.command("list")
 def page_list(
-    space: str = typer.Option(..., "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     limit: int = typer.Option(25, "--limit", help="Maximum number of pages to return"),
     start: int = typer.Option(0, "--start", help="Starting offset for pagination"),
 ) -> None:
     """List pages in a Confluence space."""
-    with command_context("page.list", target={"space": space}) as ctx:
+    with command_context("page.list") as ctx:
+        space = _resolve_space(space, required=True)
+        ctx.target = {"space": space}
         from confpub.confluence import build_client, _slim_page
         client = build_client()
         ctx.client = client
@@ -218,7 +239,7 @@ def page_list(
 
 @page_app.command("inspect")
 def page_inspect(
-    space: str = typer.Option(None, "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: str = typer.Option(None, "--title", help="Page title"),
     page_id: str = typer.Option(None, "--page-id", help="Confluence page ID"),
     raw: bool = typer.Option(False, "--raw", help="Return full raw API response"),
@@ -226,6 +247,7 @@ def page_inspect(
 ) -> None:
     """Inspect a Confluence page."""
     with command_context("page.inspect", target={"space": space, "title": title, "page_id": page_id}) as ctx:
+        space = _resolve_space(space)
         from confpub.confluence import build_client, _slim_page
         client = build_client()
         ctx.client = client
@@ -258,7 +280,7 @@ def page_inspect(
 @page_app.command("publish")
 def page_publish(
     file: str = typer.Argument(..., help="Markdown file to publish"),
-    space: str = typer.Option(..., "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     parent: Optional[str] = typer.Option(None, "--parent", help="Parent page title"),
     title: Optional[str] = typer.Option(None, "--title", help="Page title (defaults to filename stem, hyphen/underscore→spaces, title-cased)"),
     title_from_h1: bool = typer.Option(False, "--title-from-h1", help="Derive title from first H1 heading in the Markdown file"),
@@ -274,6 +296,8 @@ def page_publish(
     if page_id:
         target["page_id"] = page_id
     with command_context("page.publish", target=target) as ctx:
+        space = _resolve_space(space, required=True)
+        ctx.target["space"] = space
         if not page_id and not parent:
             raise ConfpubError(
                 "ERR_VALIDATION_REQUIRED",
@@ -296,7 +320,7 @@ def page_publish(
 
 @page_app.command("pull")
 def page_pull(
-    space: str = typer.Option(None, "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: str = typer.Option(None, "--title", help="Page title"),
     page_id: str = typer.Option(None, "--page-id", help="Confluence page ID"),
     output: str = typer.Option(".", "--output", "-o", help="Output directory"),
@@ -307,8 +331,8 @@ def page_pull(
     manifest: bool = typer.Option(False, "--manifest", help="Generate confpub.yaml manifest"),
 ) -> None:
     """Pull Confluence pages to local Markdown files."""
-    target = {"space": space, "title": title, "page_id": page_id}
-    with command_context("page.pull", target=target) as ctx:
+    with command_context("page.pull", target={"space": space, "title": title, "page_id": page_id}) as ctx:
+        space = _resolve_space(space)
         from confpub.errors import ERR_VALIDATION_REQUIRED
         if not page_id and not (space and title):
             raise ConfpubError(
@@ -333,13 +357,14 @@ def page_pull(
 
 @page_app.command("delete")
 def page_delete(
-    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: Optional[str] = typer.Option(None, "--title", help="Page title"),
     page_id: Optional[str] = typer.Option(None, "--page-id", help="Confluence page ID"),
     cascade: bool = typer.Option(False, "--cascade", help="Also delete child pages"),
 ) -> None:
     """Delete a Confluence page."""
     with command_context("page.delete", target={"space": space, "title": title, "page_id": page_id}) as ctx:
+        space = _resolve_space(space)
         if not page_id and not (space and title):
             raise ConfpubError(
                 "ERR_VALIDATION_REQUIRED",
@@ -384,12 +409,13 @@ def page_delete(
 def page_move(
     page_id: str = typer.Option(..., "--page-id", help="Confluence page ID to move"),
     target_parent: Optional[str] = typer.Option(None, "--target-parent", help="Title of the new parent page"),
-    space: Optional[str] = typer.Option(None, "--space", help="Space key (required with --target-parent)"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     target_parent_id: Optional[str] = typer.Option(None, "--target-parent-id", help="Page ID of the new parent"),
 ) -> None:
     """Move a page under a new parent."""
     target = {"page_id": page_id}
     with command_context("page.move", target=target) as ctx:
+        space = _resolve_space(space)
         if not target_parent and not target_parent_id:
             raise ConfpubError(
                 "ERR_VALIDATION_REQUIRED",
@@ -460,11 +486,12 @@ def attachment_upload(
 def plan_create(
     manifest: str = typer.Option(..., "--manifest", help="Path to confpub.yaml manifest"),
     output: Optional[str] = typer.Option(None, "--output", help="Output path for plan artifact"),
-    space: Optional[str] = typer.Option(None, "--space", help="Override manifest space"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     parent: Optional[str] = typer.Option(None, "--parent", help="Override manifest parent"),
 ) -> None:
     """Generate a plan artifact from a manifest."""
     with command_context("plan.create", target={"manifest": manifest}) as ctx:
+        space = _resolve_space(space)
         from confpub.planner import create_plan
         result = create_plan(
             manifest_path=manifest,
@@ -668,7 +695,7 @@ def comment_add(
 @app.command("search")
 def search(
     cql: Optional[str] = typer.Option(None, "--cql", help="Raw CQL query"),
-    space: Optional[str] = typer.Option(None, "--space", help="Filter by space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: Optional[str] = typer.Option(None, "--title", help="Search by page title (fuzzy match)"),
     content_type: Optional[str] = typer.Option(None, "--type", help="Filter by content type (page, blogpost, etc.)"),
     limit: int = typer.Option(25, "--limit", help="Maximum results to return"),
@@ -677,8 +704,8 @@ def search(
     excerpt_length: int = typer.Option(200, "--excerpt-length", help="Max excerpt chars (0 = unlimited)"),
 ) -> None:
     """Search Confluence content using CQL."""
-    target = {"cql": cql, "space": space, "title": title, "type": content_type}
-    with command_context("search", target=target) as ctx:
+    with command_context("search", target={"cql": cql, "space": space, "title": title, "type": content_type}) as ctx:
+        space = _resolve_space(space)
         # Build effective CQL from flags
         fragments: list[str] = []
         if space:

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/confpub/config.py

@@ -22,6 +22,8 @@ CONFIG_FILE = CONFIG_DIR / "config.json"
 ENV_URL = "CONFPUB_URL"
 ENV_TOKEN = "CONFPUB_TOKEN"
 ENV_USER = "CONFPUB_USER"
+ENV_SSL_VERIFY = "CONFPUB_SSL_VERIFY"
+ENV_SPACE = "CONFPUB_SPACE"
 
 
 class ConfigModel(BaseModel):
@@ -30,6 +32,7 @@ class ConfigModel(BaseModel):
     base_url: Optional[str] = None
     user: Optional[str] = None
     token: Optional[str] = None
+    ssl_verify: Optional[str] = None
 
 
 class ResolvedConfig:
@@ -41,11 +44,13 @@ class ResolvedConfig:
         user: str | None = None,
         token: str | None = None,
         token_source: str | None = None,
+        ssl_verify: bool | str = False,
     ) -> None:
         self.base_url = base_url
         self.user = user
         self.token = token
         self.token_source = token_source
+        self.ssl_verify = ssl_verify
 
     @property
     def is_cloud(self) -> bool:
@@ -128,10 +133,28 @@ def _try_keyring(service: str, username: str) -> str | None:
         return None
 
 
+def _resolve_ssl_verify(raw: str | None) -> bool | str:
+    """Parse an ssl_verify value into bool or CA-bundle path.
+
+    Accepts "true"/"false" (case-insensitive) or a filesystem path.
+    Returns False (default) when *raw* is None or empty.
+    """
+    if not raw:
+        return False
+    lower = raw.strip().lower()
+    if lower == "true":
+        return True
+    if lower == "false":
+        return False
+    # Treat as CA bundle path
+    return raw.strip()
+
+
 def load_config(
     cli_url: str | None = None,
     cli_user: str | None = None,
     cli_token: str | None = None,
+    cli_ssl_verify: str | None = None,
 ) -> ResolvedConfig:
     """Resolve config using precedence: CLI → env → file → keychain."""
     file_cfg = _load_config_file()
@@ -143,6 +166,10 @@ def load_config(
     # Token
     token = cli_token or os.environ.get(ENV_TOKEN) or file_cfg.token
 
+    # SSL verification
+    ssl_raw = cli_ssl_verify or os.environ.get(ENV_SSL_VERIFY) or file_cfg.ssl_verify
+    ssl_verify = _resolve_ssl_verify(ssl_raw)
+
     # Determine source
     token_source = None
     if cli_token:
@@ -164,6 +191,7 @@ def load_config(
         user=user,
         token=token,
         token_source=token_source,
+        ssl_verify=ssl_verify,
     )
 
 
@@ -178,11 +206,13 @@ def set_config_value(key: str, value: str) -> None:
         cfg.user = value
     elif key == "token":
         cfg.token = value
+    elif key == "ssl_verify":
+        cfg.ssl_verify = value
     else:
         from confpub.errors import ERR_VALIDATION_REQUIRED, validation_error
         raise validation_error(
             ERR_VALIDATION_REQUIRED,
-            f"Unknown config key: {key}. Valid keys: base_url, user, token",
+            f"Unknown config key: {key}. Valid keys: base_url, user, token, ssl_verify",
         )
 
     CONFIG_FILE.write_text(json.dumps(cfg.model_dump(exclude_none=True), indent=2), encoding="utf-8")

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/confpub/confluence.py

@@ -48,6 +48,15 @@ class ConfluenceClient:
             kwargs["cloud"] = True
         else:
             kwargs["token"] = config.token
+
+        kwargs["verify_ssl"] = config.ssl_verify
+
+        # Suppress noisy per-request InsecureRequestWarning when SSL
+        # verification is disabled (common in corporate environments).
+        if not config.ssl_verify:
+            import urllib3
+            urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
         return Confluence(**kwargs)
 
     def _handle_error(self, exc: Exception, context: str = "") -> None:

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/confpub/errors.py

@@ -16,6 +16,7 @@ ERR_VALIDATION_ASSET_MISSING = "ERR_VALIDATION_ASSET_MISSING"
 ERR_VALIDATION_SPACE_MISMATCH = "ERR_VALIDATION_SPACE_MISMATCH"
 ERR_VALIDATION_NOT_FOUND = "ERR_VALIDATION_NOT_FOUND"
 ERR_VALIDATION_LABEL = "ERR_VALIDATION_LABEL"
+ERR_VALIDATION_SPACE_KEY = "ERR_VALIDATION_SPACE_KEY"
 
 # Auth (exit 20)
 ERR_AUTH_REQUIRED = "ERR_AUTH_REQUIRED"
@@ -169,6 +170,33 @@ def io_error(
     return ConfpubError(code, message, details=details if details else None)
 
 
+def validate_space_key(space: str | None) -> None:
+    """Reject space values that look like shell-expanded paths.
+
+    PowerShell expands unquoted ``~username`` to a Windows home path
+    (e.g. ``C:\\Users\\username``).  Catching this early gives the caller an
+    actionable error instead of a confusing Confluence API failure.
+    """
+    if space is None:
+        return
+    import re
+    if "\\" in space or "/" in space or re.match(r"^[A-Za-z]:", space):
+        raise ConfpubError(
+            ERR_VALIDATION_SPACE_KEY,
+            (
+                f"Space key '{space}' appears to be a shell-expanded path. "
+                "Quote the value: --space '~username' or set CONFPUB_SPACE=~username"
+            ),
+            details={
+                "fix_options": [
+                    "Quote the --space value: --space '~username'",
+                    "Set the CONFPUB_SPACE environment variable instead",
+                    "Use the space key without shell-expandable characters",
+                ],
+            },
+        )
+
+
 def internal_error(
     code: str = ERR_INTERNAL_CONVERTER,
     message: str = "Internal error",

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/confpub/guide.py

@@ -25,6 +25,7 @@ from confpub.errors import (
     ERR_IO_TIMEOUT,
     ERR_VALIDATION_ASSET_MISSING,
     ERR_VALIDATION_LABEL,
+    ERR_VALIDATION_SPACE_KEY,
     ERR_VALIDATION_MANIFEST,
     ERR_VALIDATION_MARKDOWN,
     ERR_VALIDATION_NOT_FOUND,
@@ -102,7 +103,9 @@ def build_guide() -> dict[str, Any]:
                 },
                 "agent_hint": (
                     "Use --start and --limit for pagination: first call with --start 0 --limit 25, "
-                    "then if has_more is true, call again with --start 25 --limit 25, and so on."
+                    "then if has_more is true, call again with --start 25 --limit 25, and so on. "
+                    "For personal spaces, quote the tilde: --space '~username' "
+                    "(PowerShell expands unquoted ~). Or set CONFPUB_SPACE env var."
                 ),
             },
             "page.inspect": {
@@ -140,7 +143,9 @@ def build_guide() -> dict[str, Any]:
                     "the stem is extracted, hyphens and underscores are replaced with spaces, "
                     "and the result is title-cased. E.g. 'my-cool-page.md' → 'My Cool Page'. "
                     "Use --title-from-h1 to extract the title from the first # heading in the file. "
-                    "Use --label to apply labels (repeatable): --label api --label docs."
+                    "Use --label to apply labels (repeatable): --label api --label docs. "
+                    "For personal spaces, quote the tilde: --space '~username' "
+                    "(PowerShell expands unquoted ~). Or set CONFPUB_SPACE env var."
                 ),
             },
             "page.move": {
@@ -307,6 +312,7 @@ def build_guide() -> dict[str, Any]:
             ERR_VALIDATION_NOT_FOUND: _error_code_entry(ERR_VALIDATION_NOT_FOUND),
             ERR_VALIDATION_SPACE_MISMATCH: _error_code_entry(ERR_VALIDATION_SPACE_MISMATCH),
             ERR_VALIDATION_LABEL: _error_code_entry(ERR_VALIDATION_LABEL),
+            ERR_VALIDATION_SPACE_KEY: _error_code_entry(ERR_VALIDATION_SPACE_KEY),
             ERR_AUTH_REQUIRED: _error_code_entry(ERR_AUTH_REQUIRED),
             ERR_AUTH_EXPIRED: _error_code_entry(ERR_AUTH_EXPIRED),
             ERR_AUTH_FORBIDDEN: _error_code_entry(ERR_AUTH_FORBIDDEN),
@@ -405,6 +411,13 @@ def build_guide() -> dict[str, Any]:
                 "config_file",
                 "os_keychain",
             ],
+            "env_vars": {
+                "CONFPUB_URL": "Confluence base URL",
+                "CONFPUB_TOKEN": "API token or PAT",
+                "CONFPUB_USER": "User email or username",
+                "CONFPUB_SSL_VERIFY": "SSL verification (true/false/ca-bundle path)",
+                "CONFPUB_SPACE": "Default space key (avoids shell expansion issues with --space)",
+            },
             "non_interactive": (
                 "Never prompts when LLM=true or stdin is non-interactive"
             ),

{confpub_cli-1.4.2 → confpub_cli-1.4.4}/tests/test_integration.py

@@ -125,6 +125,110 @@ class TestPersonalSpaceKeyCLI:
         assert captured["space"] == "~thro"
 
 
+class TestSpaceKeyValidation:
+    """Reject space values that look like shell-expanded paths."""
+
+    def test_windows_path_detected(self):
+        result = runner.invoke(app, ["page", "list", "--space", "C:\\Users\\thro"])
+        assert result.exit_code == 10
+        data = json.loads(result.output)
+        assert data["ok"] is False
+        assert data["errors"][0]["code"] == "ERR_VALIDATION_SPACE_KEY"
+
+    def test_unix_home_path_detected(self):
+        result = runner.invoke(app, ["page", "list", "--space", "/home/thro"])
+        assert result.exit_code == 10
+        data = json.loads(result.output)
+        assert data["ok"] is False
+        assert data["errors"][0]["code"] == "ERR_VALIDATION_SPACE_KEY"
+
+    def test_backslash_in_value_detected(self):
+        result = runner.invoke(app, ["page", "list", "--space", "some\\path"])
+        assert result.exit_code == 10
+        data = json.loads(result.output)
+        assert data["ok"] is False
+        assert data["errors"][0]["code"] == "ERR_VALIDATION_SPACE_KEY"
+
+    def test_valid_tilde_space_passes(self, monkeypatch):
+        def fake_list_pages(self, space, **kwargs):
+            return {"pages": [], "start": 0, "limit": 25, "size": 0, "has_more": False}
+
+        from confpub.confluence import ConfluenceClient
+        monkeypatch.setattr(ConfluenceClient, "list_pages", fake_list_pages)
+        monkeypatch.setattr("confpub.confluence.build_client", lambda: ConfluenceClient.__new__(ConfluenceClient))
+
+        result = runner.invoke(app, ["page", "list", "--space", "~thro"])
+        assert result.exit_code == 0
+        data = json.loads(result.output)
+        assert data["ok"] is True
+
+    def test_plain_space_key_passes(self, monkeypatch):
+        def fake_list_pages(self, space, **kwargs):
+            return {"pages": [], "start": 0, "limit": 25, "size": 0, "has_more": False}
+
+        from confpub.confluence import ConfluenceClient
+        monkeypatch.setattr(ConfluenceClient, "list_pages", fake_list_pages)
+        monkeypatch.setattr("confpub.confluence.build_client", lambda: ConfluenceClient.__new__(ConfluenceClient))
+
+        result = runner.invoke(app, ["page", "list", "--space", "DEV"])
+        assert result.exit_code == 0
+        data = json.loads(result.output)
+        assert data["ok"] is True
+
+
+class TestConfpubSpaceEnvVar:
+    """CONFPUB_SPACE env var as an alternative to --space."""
+
+    def test_env_var_used_when_no_flag(self, monkeypatch):
+        def fake_list_pages(self, space, **kwargs):
+            self._captured_space = space
+            return {"pages": [], "start": 0, "limit": 25, "size": 0, "has_more": False}
+
+        from confpub.confluence import ConfluenceClient
+        mock_client = ConfluenceClient.__new__(ConfluenceClient)
+        monkeypatch.setattr(ConfluenceClient, "list_pages", fake_list_pages)
+        monkeypatch.setattr("confpub.confluence.build_client", lambda: mock_client)
+        monkeypatch.setenv("CONFPUB_SPACE", "~thro")
+
+        result = runner.invoke(app, ["page", "list"])
+        assert result.exit_code == 0
+        data = json.loads(result.output)
+        assert data["ok"] is True
+        assert mock_client._captured_space == "~thro"
+
+    def test_cli_flag_overrides_env(self, monkeypatch):
+        captured = {}
+
+        def fake_list_pages(self, space, **kwargs):
+            captured["space"] = space
+            return {"pages": [], "start": 0, "limit": 25, "size": 0, "has_more": False}
+
+        from confpub.confluence import ConfluenceClient
+        monkeypatch.setattr(ConfluenceClient, "list_pages", fake_list_pages)
+        monkeypatch.setattr("confpub.confluence.build_client", lambda: ConfluenceClient.__new__(ConfluenceClient))
+        monkeypatch.setenv("CONFPUB_SPACE", "~env")
+
+        result = runner.invoke(app, ["page", "list", "--space", "~cli"])
+        assert result.exit_code == 0
+        assert captured["space"] == "~cli"
+
+    def test_env_var_also_validated(self, monkeypatch):
+        monkeypatch.setenv("CONFPUB_SPACE", "C:\\Users\\thro")
+
+        result = runner.invoke(app, ["page", "list"])
+        assert result.exit_code == 10
+        data = json.loads(result.output)
+        assert data["ok"] is False
+        assert data["errors"][0]["code"] == "ERR_VALIDATION_SPACE_KEY"
+
+    def test_missing_space_mentions_env(self):
+        result = runner.invoke(app, ["page", "list"])
+        assert result.exit_code == 10
+        data = json.loads(result.output)
+        assert data["ok"] is False
+        assert "CONFPUB_SPACE" in data["errors"][0]["message"]
+
+
 class TestSearchCommand:
     def test_search_help(self):
         result = runner.invoke(app, ["search", "--help"])