secflow-cli 0.2.4__tar.gz → 0.2.5__tar.gz

{secflow_cli-0.2.4/src/secflow_cli.egg-info → secflow_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secflow-cli
-Version: 0.2.4
+Version: 0.2.5
 Summary: SecFlow operator CLI
 License-Expression: MIT
 Project-URL: Repository, https://github.com/yeon3724/secflow
@@ -14,7 +14,7 @@ Dynamic: license-file
 
 # SecFlow CLI
 
-Use Intflow browser login or an existing Slack-issued Admin session. Both distributions provide the same `secflowctl` commands.
+Use Intflow browser login or an existing Admin session token. Both distributions provide the same `secflowctl` commands.
 
 ## Install and update
 
@@ -32,7 +32,7 @@ secflowctl --version
 
 The Python distribution requires Python 3.10+. Installation automatically includes the matching Admin-capable `secflow-sdk` dependency.
 
-The npm distribution includes Python and the CLI dependencies in OS-specific native packages. Initial targets: Windows x64, macOS Intel/Apple Silicon, and Linux x64 with glibc 2.35+ (Ubuntu 22.04+). Alpine/musl and Linux ARM are not npm targets yet; use the Python distribution there. Keep npm optional dependencies enabled. Installation has no postinstall script or runtime download. Native binaries are not platform-signed or notarized.
+The npm distribution includes Python and the CLI dependencies in OS-specific native packages. Targets: Windows x64, macOS Intel/Apple Silicon, and Linux x64 with glibc 2.35+ (Ubuntu 22.04+). Alpine/musl and Linux ARM are not npm targets; use the Python distribution there. Keep npm optional dependencies enabled. Installation has no postinstall script or runtime download. Native binaries are not platform-signed or notarized.
 
 The bundled interpreter includes CA certificates for HTTPS. An explicit `SSL_CERT_FILE` or `SSL_CERT_DIR` takes precedence for organization-managed trust; TLS certificate verification stays enabled.
 
@@ -55,9 +55,9 @@ secflowctl --help
 
 `secflowctl` without arguments displays a quick start. `secflowctl login` opens Intflow login and creates the `production` profile for `https://secflow.intflow.dev` on first use. Existing profiles retain their selected server. For another server, first use `secflowctl profile add staging --base-url https://secflow.example.test`, then `secflowctl --profile staging login`. Global options precede the command. Every command supports `--help`, including examples. Account and role administration requires server authorization.
 
-`auth login` remains compatible with Slack-issued Admin sessions and prompts without echo for an existing session. Sessions are stored in Windows Credential Manager, macOS Keychain, or Linux Secret Service. Linux persistent login needs an unlocked Secret Service (for example GNOME Keyring) and a D-Bus session. If secure storage is unavailable, login fails without a plaintext file fallback. Installing the CLI does not create an account or grant access.
+`auth login` prompts without echo for an existing Admin session token. Sessions are stored in Windows Credential Manager, macOS Keychain, or Linux Secret Service. Linux persistent login needs an unlocked Secret Service (for example GNOME Keyring) and a D-Bus session. If secure storage is unavailable, login fails without a plaintext file fallback. Installing the CLI does not create an account or grant access.
 
-When browser login is enabled on the server, run `secflowctl auth login --browser`. Sign in to Intflow, compare the code with your terminal, and approve the SecFlow login. Use `--browser --no-browser` to open the displayed URL manually. This requires an interactive terminal, an existing authorized SecFlow account, and OS credential storage. The CLI stores only the resulting SecFlow session. If login expires or the exchange fails, start a new login.
+When browser login is enabled on the server, run `secflowctl auth login --browser`. Sign in to Intflow, compare the code with your terminal, and approve the SecFlow login. Use `--browser --no-browser` to open the displayed URL manually. This requires an interactive terminal, an existing authorized SecFlow account, and OS credential storage. The CLI stores only the resulting SecFlow session. A busy server is retried for a minute. If login expires or the exchange fails, log in again.
 
 For automation use `SECFLOW_ADMIN_SESSION_TOKEN` supplied by your secret manager, or `--token-stdin` with `--non-interactive`. Never put tokens in command arguments, profiles, shell history, or tracked files. SDK tokens cannot authorize these Admin commands. `auth logout` revokes the current server session; `auth forget` only removes the local credential.
 
@@ -128,6 +128,6 @@ For automation, use `--non-interactive` before the command and `--yes` on `put`.
 
 ## Credentials and values
 
-`tokens issue --save-as NAME` stores an SDK token separately from Admin profiles; `runtime ... --sdk-name NAME` uses it. `auth sessions issue --save-as PROFILE` creates a new destination profile. Both require a new destination name or explicit `--token-stdout` to redirected stdout; raw credentials never appear in ordinary JSON/table results. Linux/macOS non-interactive invocations require an explicitly injected credential rather than unlocking the OS store.
+`tokens issue` uses the server-default lifetime; choose `--ttl-seconds` (1-7776000) or `--no-expiry`, never both. `--save-as NAME` stores an SDK token for `runtime ... --sdk-name NAME`. `auth sessions issue --save-as PROFILE` stores a separate Admin profile. Both need a new destination or `--token-stdout` redirected to a pipe/file; ordinary results contain no raw credentials. Linux/macOS non-interactive calls need an injected credential, not an OS store unlock.
 
-Secret create/rotate reads exact UTF-8 or base64 input through hidden input, `--value-stdin`, or `--value-file`. Do not put values in command arguments. Stdin cannot simultaneously carry an Admin token and a secret or policy document. Runtime commands use SDK credentials only; Admin sessions are never substituted. No plaintext resolve command is provided.
+Secret create/rotate accepts exact UTF-8 or base64 via hidden input, `--value-stdin` or `--value-file`, never command arguments. Stdin cannot carry both an Admin token and a value or policy. Runtime uses SDK credentials, never Admin sessions; no plaintext resolve command exists.

{secflow_cli-0.2.4 → secflow_cli-0.2.5}/USAGE.md

@@ -1,6 +1,6 @@
 # SecFlow CLI
 
-Use Intflow browser login or an existing Slack-issued Admin session. Both distributions provide the same `secflowctl` commands.
+Use Intflow browser login or an existing Admin session token. Both distributions provide the same `secflowctl` commands.
 
 ## Install and update
 
@@ -18,7 +18,7 @@ secflowctl --version
 
 The Python distribution requires Python 3.10+. Installation automatically includes the matching Admin-capable `secflow-sdk` dependency.
 
-The npm distribution includes Python and the CLI dependencies in OS-specific native packages. Initial targets: Windows x64, macOS Intel/Apple Silicon, and Linux x64 with glibc 2.35+ (Ubuntu 22.04+). Alpine/musl and Linux ARM are not npm targets yet; use the Python distribution there. Keep npm optional dependencies enabled. Installation has no postinstall script or runtime download. Native binaries are not platform-signed or notarized.
+The npm distribution includes Python and the CLI dependencies in OS-specific native packages. Targets: Windows x64, macOS Intel/Apple Silicon, and Linux x64 with glibc 2.35+ (Ubuntu 22.04+). Alpine/musl and Linux ARM are not npm targets; use the Python distribution there. Keep npm optional dependencies enabled. Installation has no postinstall script or runtime download. Native binaries are not platform-signed or notarized.
 
 The bundled interpreter includes CA certificates for HTTPS. An explicit `SSL_CERT_FILE` or `SSL_CERT_DIR` takes precedence for organization-managed trust; TLS certificate verification stays enabled.
 
@@ -41,9 +41,9 @@ secflowctl --help
 
 `secflowctl` without arguments displays a quick start. `secflowctl login` opens Intflow login and creates the `production` profile for `https://secflow.intflow.dev` on first use. Existing profiles retain their selected server. For another server, first use `secflowctl profile add staging --base-url https://secflow.example.test`, then `secflowctl --profile staging login`. Global options precede the command. Every command supports `--help`, including examples. Account and role administration requires server authorization.
 
-`auth login` remains compatible with Slack-issued Admin sessions and prompts without echo for an existing session. Sessions are stored in Windows Credential Manager, macOS Keychain, or Linux Secret Service. Linux persistent login needs an unlocked Secret Service (for example GNOME Keyring) and a D-Bus session. If secure storage is unavailable, login fails without a plaintext file fallback. Installing the CLI does not create an account or grant access.
+`auth login` prompts without echo for an existing Admin session token. Sessions are stored in Windows Credential Manager, macOS Keychain, or Linux Secret Service. Linux persistent login needs an unlocked Secret Service (for example GNOME Keyring) and a D-Bus session. If secure storage is unavailable, login fails without a plaintext file fallback. Installing the CLI does not create an account or grant access.
 
-When browser login is enabled on the server, run `secflowctl auth login --browser`. Sign in to Intflow, compare the code with your terminal, and approve the SecFlow login. Use `--browser --no-browser` to open the displayed URL manually. This requires an interactive terminal, an existing authorized SecFlow account, and OS credential storage. The CLI stores only the resulting SecFlow session. If login expires or the exchange fails, start a new login.
+When browser login is enabled on the server, run `secflowctl auth login --browser`. Sign in to Intflow, compare the code with your terminal, and approve the SecFlow login. Use `--browser --no-browser` to open the displayed URL manually. This requires an interactive terminal, an existing authorized SecFlow account, and OS credential storage. The CLI stores only the resulting SecFlow session. A busy server is retried for a minute. If login expires or the exchange fails, log in again.
 
 For automation use `SECFLOW_ADMIN_SESSION_TOKEN` supplied by your secret manager, or `--token-stdin` with `--non-interactive`. Never put tokens in command arguments, profiles, shell history, or tracked files. SDK tokens cannot authorize these Admin commands. `auth logout` revokes the current server session; `auth forget` only removes the local credential.
 
@@ -114,6 +114,6 @@ For automation, use `--non-interactive` before the command and `--yes` on `put`.
 
 ## Credentials and values
 
-`tokens issue --save-as NAME` stores an SDK token separately from Admin profiles; `runtime ... --sdk-name NAME` uses it. `auth sessions issue --save-as PROFILE` creates a new destination profile. Both require a new destination name or explicit `--token-stdout` to redirected stdout; raw credentials never appear in ordinary JSON/table results. Linux/macOS non-interactive invocations require an explicitly injected credential rather than unlocking the OS store.
+`tokens issue` uses the server-default lifetime; choose `--ttl-seconds` (1-7776000) or `--no-expiry`, never both. `--save-as NAME` stores an SDK token for `runtime ... --sdk-name NAME`. `auth sessions issue --save-as PROFILE` stores a separate Admin profile. Both need a new destination or `--token-stdout` redirected to a pipe/file; ordinary results contain no raw credentials. Linux/macOS non-interactive calls need an injected credential, not an OS store unlock.
 
-Secret create/rotate reads exact UTF-8 or base64 input through hidden input, `--value-stdin`, or `--value-file`. Do not put values in command arguments. Stdin cannot simultaneously carry an Admin token and a secret or policy document. Runtime commands use SDK credentials only; Admin sessions are never substituted. No plaintext resolve command is provided.
+Secret create/rotate accepts exact UTF-8 or base64 via hidden input, `--value-stdin` or `--value-file`, never command arguments. Stdin cannot carry both an Admin token and a value or policy. Runtime uses SDK credentials, never Admin sessions; no plaintext resolve command exists.

{secflow_cli-0.2.4 → secflow_cli-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "secflow-cli"
-version = "0.2.4"
+version = "0.2.5"
 description = "SecFlow operator CLI"
 readme = "USAGE.md"
 license = "MIT"

{secflow_cli-0.2.4 → secflow_cli-0.2.5}/src/secflow_cli/browser_login.py

@@ -4,6 +4,7 @@ import base64
 from datetime import datetime, timezone
 import hashlib
 import json
+import logging
 import os
 import re
 import sys
@@ -11,12 +12,18 @@ import time
 from urllib.error import HTTPError
 from urllib.request import HTTPRedirectHandler, Request, build_opener
 from uuid import UUID
+
+
+LOGGER = logging.getLogger(__name__)
 import webbrowser
 
 from secflow_sdk import SecFlowAdminClient
 from secflow_cli.errors import CliError
 
 
+BUSY_WAIT_SECONDS = 60
+
+
 def rejected():
     return CliError(3, "BROWSER_LOGIN_FAILED", "Browser login did not complete. Start a new login; uncertain session exchanges are not retried.")
 
@@ -32,9 +39,9 @@ def post(url, body, timeout):
     try:
         response = build_opener(NoRedirect).open(request, timeout=timeout)
     except HTTPError as error:
-        status = error.code
+        status, retry_after = error.code, _retry_after(error.headers.get("Retry-After"))
         error.close()
-        return status, {}
+        return status, {}, retry_after
     with response:
         raw = response.read(16385)
         if len(raw) > 16384:
@@ -42,7 +49,13 @@ def post(url, body, timeout):
         value = json.loads(raw)
         if not isinstance(value, dict):
             raise rejected()
-        return response.status, value
+        return response.status, value, None
+
+
+def _retry_after(value):
+    if not isinstance(value, str) or not re.fullmatch(r"[0-9]{1,4}", value):
+        return None
+    return min(30, max(1, int(value)))
 
 
 def acquire_session(url, timeout, *, no_browser=False):
@@ -57,7 +70,8 @@ def acquire_session(url, timeout, *, no_browser=False):
 def _open_browser(verification_uri):
     try:
         opened = webbrowser.open(verification_uri)
-    except Exception:
+    except Exception as caught:
+        LOGGER.debug("Browser could not be opened", extra={"attributes": {"error.type": type(caught).__name__}})
         opened = False
     if not opened:
         print("Open the URL above manually to continue.", file=sys.stderr)
@@ -75,10 +89,26 @@ def _issued_session(result):
     return {field: result[field] for field in ("session_token", "session_id", "account_id", "expires_at")}
 
 
+def _create(url, proof, timeout):
+    give_up = time.monotonic() + BUSY_WAIT_SECONDS
+    announced = False
+    while True:
+        started_at = time.monotonic()
+        status, created, retry_after = post(url + "/v1/auth/browser-login", {"poll_challenge": hashlib.sha256(proof.encode()).hexdigest()}, timeout)
+        if status != 503 or retry_after is None:
+            return status, created, started_at
+        remaining = give_up - time.monotonic()
+        if remaining <= 0:
+            raise CliError(3, "BROWSER_LOGIN_BUSY", "The server is too busy to start a browser login. Try again in a few minutes.")
+        if not announced:
+            print("The server is busy. Retrying for up to " + str(BUSY_WAIT_SECONDS) + " seconds.", file=sys.stderr)
+            announced = True
+        time.sleep(min(retry_after, remaining))
+
+
 def _acquire_session(url, timeout, *, no_browser):
     proof = base64.urlsafe_b64encode(os.urandom(32)).rstrip(b"=").decode("ascii")
-    started_at = time.monotonic()
-    status, created = post(url + "/v1/auth/browser-login", {"poll_challenge": hashlib.sha256(proof.encode()).hexdigest()}, timeout)
+    status, created, started_at = _create(url, proof, timeout)
     if status == 404:
         raise CliError(3, "BROWSER_LOGIN_UNAVAILABLE", "This server has not enabled browser login. Use a Slack-issued Admin session.")
     if status != 201:
@@ -97,18 +127,26 @@ def _acquire_session(url, timeout, *, no_browser):
     print("Confirm code " + created["user_code"] + " and approve the login in your browser.", file=sys.stderr)
     if not no_browser:
         _open_browser(verification_uri)
-    interval = created["interval"]
-    while time.monotonic() + interval < deadline:
-        time.sleep(interval)
+    return _poll(url, timeout, identifier, proof, deadline, created["interval"])
+
+
+def _poll(url, timeout, identifier, proof, deadline, interval):
+    wait = interval
+    while time.monotonic() + wait < deadline:
+        time.sleep(wait)
+        wait = interval
         remaining = deadline - time.monotonic()
         if remaining <= 0:
             break
-        status, result = post(url + "/v1/auth/browser-login/redeem",
-                              {"transaction_id": identifier, "poll_secret": proof}, min(timeout, remaining))
+        status, result, retry_after = post(url + "/v1/auth/browser-login/redeem",
+                                           {"transaction_id": identifier, "poll_secret": proof}, min(timeout, remaining))
         if status == 202 and result == {"status": "pending"}:
             continue
         if status == 429:
-            interval = min(30, interval + 2)
+            wait = interval = min(30, interval + 2)
+            continue
+        if status == 503 and retry_after is not None:
+            wait = max(interval, retry_after)
             continue
         if status != 200:
             raise rejected()
@@ -128,7 +166,7 @@ def login(url, timeout, store, reference, *, no_browser=False):
     except BaseException:
         try:
             client.revoke_current_session()
-        except Exception:
-            pass
+        except Exception as caught:
+            LOGGER.debug("New session revocation failed", extra={"attributes": {"error.type": type(caught).__name__}})
         raise
     return account, session["expires_at"]