proxcli 0.7.0__tar.gz → 0.7.2__tar.gz

{proxcli-0.7.0 → proxcli-0.7.2}/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.2] - 2026-06-20
+
+### Added
+- Helpful hint when global flags are placed after the resource subcommand.
+  Running `proxmox vm list --output table` now shows:
+  `Error: Global flag '--output' must come before the resource. Try: proxmox --output vm list ...`
+
+## [0.7.1] - 2026-06-20
+
+### Fixed
+- API token authentication: Removed incorrect base64 encoding.
+  Proxmox expects `PVEAPIToken=user@realm!tokenid=secret` as plain text
+  in the Authorization header, not base64-encoded.
+- Dry-run mode now always sets API token headers so that
+  `--dry-run` output accurately reflects the Authorization header
+  that would be sent. (Password auth is still skipped in dry-run
+  since it requires a network call.)
+
 ## [0.7.0] - 2026-06-20
 
 ### Added
@@ -82,6 +100,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CSRF ticket auto-refresh on 401.
 - AI-agent-friendly: default JSON output, strict exit codes, `--dry-run` mode.
 
+[0.7.2]: https://github.com/xezpeleta/proxcli/releases/tag/v0.7.2
+[0.7.1]: https://github.com/xezpeleta/proxcli/releases/tag/v0.7.1
 [0.7.0]: https://github.com/xezpeleta/proxcli/releases/tag/v0.7.0
 [0.6.0]: https://github.com/xezpeleta/proxcli/releases/tag/v0.6.0
 [0.5.0]: https://github.com/xezpeleta/proxcli/releases/tag/v0.5.0

{proxcli-0.7.0 → proxcli-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxcli
-Version: 0.7.0
+Version: 0.7.2
 Summary: A CLI tool to interact with Proxmox VE nodes and clusters via the REST API
 Author-email: Xabi Ezpeleta <xezpeleta@gmail.com>
 License: MIT
@@ -108,6 +108,23 @@ proxmox vm list --username root@pam --url https://pve:8006
 proxmox --insecure vm list
 ```
 
+### Manual config file
+
+If you prefer to hand-edit credentials, create `~/.config/proxmox-cli/credentials.json` (chmod 600):
+
+```json
+{
+  "url": "https://192.168.1.10:8006",
+  "username": "root@pam",
+  "auth_method": "api_token",
+  "api_token_id": "my-token",
+  "api_token_secret": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+  "verify_tls": false
+}
+```
+
+For password auth, use `"auth_method": "password"` with a `"password"` field instead of `api_token_id` / `api_token_secret`.
+
 ## Command Reference
 
 ### Global flags

{proxcli-0.7.0 → proxcli-0.7.2}/README.md

@@ -85,6 +85,23 @@ proxmox vm list --username root@pam --url https://pve:8006
 proxmox --insecure vm list
 ```
 
+### Manual config file
+
+If you prefer to hand-edit credentials, create `~/.config/proxmox-cli/credentials.json` (chmod 600):
+
+```json
+{
+  "url": "https://192.168.1.10:8006",
+  "username": "root@pam",
+  "auth_method": "api_token",
+  "api_token_id": "my-token",
+  "api_token_secret": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+  "verify_tls": false
+}
+```
+
+For password auth, use `"auth_method": "password"` with a `"password"` field instead of `api_token_id` / `api_token_secret`.
+
 ## Command Reference
 
 ### Global flags

{proxcli-0.7.0 → proxcli-0.7.2}/proxmox/cli/main.py

@@ -149,21 +149,19 @@ def _build_client(overrides: dict[str, Any], args: argparse.Namespace) -> Proxmo
 
     auth_mgr = AuthManager()
 
-    # Don't authenticate if dry-run (no actual API calls will be made)
-    if not args.dry_run:
-        if overrides["api_token_id"] and overrides["api_token_secret"]:
-            auth_mgr.set_api_token(
-                overrides["username"] or "root@pam",
-                overrides["api_token_id"],
-                overrides["api_token_secret"],
-            )
-        elif overrides["password"]:
-            auth_mgr.authenticate_password(
-                overrides["url"],
-                overrides["username"] or "root@pam",
-                overrides["password"],
-                verify=overrides["verify_tls"],
-            )
+    if overrides["api_token_id"] and overrides["api_token_secret"]:
+        auth_mgr.set_api_token(
+            overrides["username"] or "root@pam",
+            overrides["api_token_id"],
+            overrides["api_token_secret"],
+        )
+    elif overrides["password"] and not args.dry_run:
+        auth_mgr.authenticate_password(
+            overrides["url"],
+            overrides["username"] or "root@pam",
+            overrides["password"],
+            verify=overrides["verify_tls"],
+        )
 
     client = ProxmoxClient(
         base_url=overrides["url"],
@@ -195,10 +193,64 @@ def _print_command_help(args: argparse.Namespace) -> None:
     )
 
 
+GLOBAL_FLAGS = {
+    "--url", "--username", "--password", "--password-stdin", "--api-token",
+    "--output", "--dry-run", "--insecure", "--timeout", "--verbose", "--version",
+    "-h", "--help",
+}
+
+# Flags that take a value (the value follows the flag)
+GLOBAL_FLAGS_WITH_VALUE = {"--url", "--username", "--password", "--api-token", "--output", "--timeout"}
+
+
+def _hint_global_flags_order(argv: list[str]) -> None:
+    """If user placed global flags after the resource, show a helpful hint."""
+    resource_pos = -1
+    resources = {"auth", "vm", "node", "pool", "container", "storage", "cluster", "completion", "task"}
+    for i, arg in enumerate(argv):
+        if arg in resources:
+            resource_pos = i
+            break
+    if resource_pos < 0:
+        return
+    # Check if any global flag (with or without value) appears after the resource
+    for i in range(resource_pos, len(argv)):
+        arg = argv[i]
+        if arg in GLOBAL_FLAGS:
+            # Build a corrected example
+            resource_part = argv[resource_pos:]
+            flags_before = []
+            for j in range(resource_pos):
+                if argv[j] in GLOBAL_FLAGS or (j > 0 and argv[j-1] in GLOBAL_FLAGS_WITH_VALUE):
+                    flags_before.append(argv[j])
+            example = f"proxmox {arg} {' '.join(resource_part[:2])} ..."
+            log_error(
+                f"Global flag '{arg}' must come before the resource. "
+                f"Try: {example}"
+            )
+            return
+        # Check if this arg is the value of a previous global flag
+        if i > 0 and argv[i-1] in GLOBAL_FLAGS_WITH_VALUE and i-1 > resource_pos:
+            log_error(
+                f"Global flag '{argv[i-1]}' must come before the resource. "
+                f"Try: proxmox {argv[i-1]} {arg} {' '.join(argv[resource_pos:resource_pos+2])} ..."
+            )
+            return
+
+
 def main(argv: list[str] | None = None) -> None:
     """Main entry point."""
     parser = build_root_parser()
-    args = parser.parse_args(argv)
+
+    effective_argv = argv if argv is not None else sys.argv[1:]
+
+    try:
+        args = parser.parse_args(effective_argv)
+    except SystemExit as e:
+        # If argparse rejected the args, check for global flags placed after resource
+        if effective_argv:
+            _hint_global_flags_order(effective_argv)
+        sys.exit(e.code if isinstance(e.code, int) else 1)
 
     # --help or no subcommand: just show help
     if args.resource is None:

{proxcli-0.7.0 → proxcli-0.7.2}/proxmox/client/auth.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import base64
 from enum import Enum
 from typing import Any
 
@@ -63,9 +62,7 @@ class AuthManager:
 
     def set_api_token(self, user: str, token_id: str, secret: str) -> None:
         """Use a Proxmox API token for authentication."""
-        raw = f"{user}!{token_id}={secret}"
-        encoded = base64.b64encode(raw.encode()).decode()
-        self._auth_header = f"PVEAPIToken {encoded}"
+        self._auth_header = f"PVEAPIToken={user}!{token_id}={secret}"
         self._method = AuthMethod.API_TOKEN
         self._ticket = None
         self._csrf_token = None

{proxcli-0.7.0 → proxcli-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "proxcli"
-version = "0.7.0"
+version = "0.7.2"
 description = "A CLI tool to interact with Proxmox VE nodes and clusters via the REST API"
 readme = "README.md"
 authors = [

{proxcli-0.7.0 → proxcli-0.7.2}/tests/test_auth.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-import base64
-
 import pytest
 
 from proxmox.client.auth import AuthMethod
@@ -60,9 +58,7 @@ class TestAuthManager:
         assert auth_manager.method == AuthMethod.API_TOKEN
 
         headers = auth_manager.get_headers()
-        expected_raw = "root@pam!my-token=my-secret"
-        expected_encoded = base64.b64encode(expected_raw.encode()).decode()
-        assert headers["Authorization"] == f"PVEAPIToken {expected_encoded}"
+        assert headers["Authorization"] == "PVEAPIToken=root@pam!my-token=my-secret"
         assert "Cookie" not in headers
         assert "CSRFPreventionToken" not in headers
 

{proxcli-0.7.0 → proxcli-0.7.2}/uv.lock

@@ -254,7 +254,7 @@ wheels = [
 
 [[package]]
 name = "proxcli"
-version = "0.7.0"
+version = "0.7.2"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },