bt-cli 0.4.27__tar.gz → 0.4.29__tar.gz

{bt_cli-0.4.27 → bt_cli-0.4.29}/CLAUDE.md

@@ -1,6 +1,6 @@
 # BT-CLI
 
-BeyondTrust Platform CLI for Password Safe, Entitle, PRA, and EPM Windows. **Version: 0.4.27**
+BeyondTrust Platform CLI for Password Safe, Entitle, PRA, and EPM Windows. **Version: 0.4.29**
 
 ## Setup
 

{bt_cli-0.4.27 → bt_cli-0.4.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bt-cli
-Version: 0.4.27
+Version: 0.4.29
 Summary: BeyondTrust Platform CLI (unofficial) - Password Safe, Entitle, PRA, EPM
 Author-email: Dave Grendysz <dgrendysz@beyondtrust.com>
 License: MIT

{bt_cli-0.4.27 → bt_cli-0.4.29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bt-cli"
-version = "0.4.27"
+version = "0.4.29"
 description = "BeyondTrust Platform CLI (unofficial) - Password Safe, Entitle, PRA, EPM"
 readme = "README.md"
 requires-python = ">=3.9"

{bt_cli-0.4.27 → bt_cli-0.4.29}/src/bt_cli/__init__.py

@@ -1,3 +1,3 @@
 """BeyondTrust Unified Admin CLI."""
 
-__version__ = "0.4.27"
+__version__ = "0.4.29"

{bt_cli-0.4.27 → bt_cli-0.4.29}/src/bt_cli/commands/configure.py

@@ -298,11 +298,21 @@ def show_config(
     profile: Optional[str] = typer.Option(None, "--profile", help="Profile to show"),
     show_secrets: bool = typer.Option(False, "--show-secrets", help="Show secret values"),
 ) -> None:
-    """Show current configuration."""
+    """Show configuration from config file.
+
+    Note: This only shows profiles saved to ~/.bt-cli/config.yaml.
+    If you're using environment variables or .env file, use:
+
+        bt configure effective
+
+    to see the actual configuration in use.
+    """
     config = load_config_file()
 
     if not config.profiles:
-        print_warning("No configuration found. Run 'bt configure' to set up.")
+        print_warning("No profiles in config file. Run 'bt configure' to set up.")
+        console.print("\n[dim]Tip: If using .env or environment variables, run:[/dim]")
+        console.print("[cyan]  bt configure effective[/cyan]")
         raise typer.Exit(0)
 
     profiles_to_show = [profile] if profile else config.list_profiles()
@@ -413,3 +423,209 @@ def show_path() -> None:
         console.print("[green]Config file exists[/green]")
     else:
         console.print("[yellow]Config file does not exist yet[/yellow]")
+
+
+@app.command("import-env")
+def import_from_env(
+    profile: str = typer.Option("default", "--profile", "-p", help="Profile name to save as"),
+    force: bool = typer.Option(False, "--force", "-f", help="Overwrite existing profile"),
+) -> None:
+    """Import configuration from environment variables into a profile.
+
+    This saves the current BT_* environment variables (including .env file)
+    into a named profile in the config file. Useful for:
+
+    - Converting .env setup to profile-based config
+    - Creating profiles from existing environment
+    - Backing up current config to file
+
+    Example:
+        bt configure import-env --profile production
+    """
+    import os
+    from dotenv import load_dotenv, find_dotenv
+    from rich.prompt import Confirm
+
+    # Load .env if present
+    env_file = find_dotenv()
+    if env_file:
+        load_dotenv(env_file)
+        console.print(f"[dim]Loaded .env from: {env_file}[/dim]\n")
+
+    config = load_config_file()
+
+    # Check if profile exists
+    if profile in config.profiles and not force:
+        if not Confirm.ask(f"Profile '{profile}' exists. Overwrite?", default=False):
+            print_info("Cancelled")
+            raise typer.Exit(0)
+
+    # Product environment variable mappings
+    env_mappings = {
+        "pws": {
+            "api_url": "BT_PWS_API_URL",
+            "api_key": "BT_PWS_API_KEY",
+            "client_id": "BT_PWS_CLIENT_ID",
+            "client_secret": "BT_PWS_CLIENT_SECRET",
+            "run_as": "BT_PWS_RUN_AS",
+            "verify_ssl": "BT_PWS_VERIFY_SSL",
+            "timeout": "BT_PWS_TIMEOUT",
+        },
+        "pra": {
+            "api_url": "BT_PRA_API_URL",
+            "client_id": "BT_PRA_CLIENT_ID",
+            "client_secret": "BT_PRA_CLIENT_SECRET",
+            "verify_ssl": "BT_PRA_VERIFY_SSL",
+            "timeout": "BT_PRA_TIMEOUT",
+        },
+        "entitle": {
+            "api_url": "BT_ENTITLE_API_URL",
+            "api_key": "BT_ENTITLE_API_KEY",
+            "verify_ssl": "BT_ENTITLE_VERIFY_SSL",
+            "timeout": "BT_ENTITLE_TIMEOUT",
+        },
+        "epmw": {
+            "api_url": "BT_EPM_API_URL",
+            "client_id": "BT_EPM_CLIENT_ID",
+            "client_secret": "BT_EPM_CLIENT_SECRET",
+            "verify_ssl": "BT_EPM_VERIFY_SSL",
+            "timeout": "BT_EPM_TIMEOUT",
+        },
+    }
+
+    imported = []
+    for product, env_vars in env_mappings.items():
+        product_config = {}
+        for setting, env_var in env_vars.items():
+            value = os.getenv(env_var)
+            if value:
+                # Convert types
+                if setting == "verify_ssl":
+                    product_config[setting] = value.lower() not in ("false", "0", "no")
+                elif setting == "timeout":
+                    try:
+                        product_config[setting] = float(value)
+                    except ValueError:
+                        product_config[setting] = 30.0
+                else:
+                    product_config[setting] = value
+
+        if product_config.get("api_url"):
+            # Infer auth_method for PWS
+            if product == "pws":
+                if product_config.get("api_key"):
+                    product_config["auth_method"] = "apikey"
+                elif product_config.get("client_id"):
+                    product_config["auth_method"] = "oauth"
+
+            config.set_product_config(product, product_config, profile)
+            imported.append(product)
+
+    if imported:
+        if not config.default_profile or profile == "default":
+            config.default_profile = profile
+        save_config_file(config)
+        print_success(f"Imported {', '.join(imported)} into profile '{profile}'")
+        console.print(f"[dim]Config saved to: {CONFIG_FILE}[/dim]")
+    else:
+        print_warning("No configuration found in environment variables")
+
+
+@app.command("effective")
+def show_effective_config(
+    show_secrets: bool = typer.Option(False, "--show-secrets", help="Show secret values"),
+) -> None:
+    """Show effective configuration from all sources.
+
+    Shows what configuration is actually in use, combining:
+    - Environment variables (BT_PWS_*, BT_PRA_*, etc.)
+    - .env file (if present)
+    - Config file profiles (~/.bt-cli/config.yaml)
+
+    This is useful for debugging why the CLI connects successfully
+    but 'bt configure show' appears empty.
+    """
+    import os
+    from dotenv import load_dotenv, find_dotenv
+
+    # Load .env if present
+    env_file = find_dotenv()
+    if env_file:
+        load_dotenv(env_file)
+        console.print(f"[dim]Loaded .env from: {env_file}[/dim]\n")
+
+    def mask_secret(key: str, value: str) -> str:
+        if not value:
+            return "[dim]not set[/dim]"
+        if not show_secrets and any(s in key.lower() for s in ["secret", "key", "password"]):
+            return "****" + value[-4:] if len(value) > 4 else "****"
+        return value
+
+    # Product environment variable mappings
+    products = {
+        "Password Safe": {
+            "api_url": "BT_PWS_API_URL",
+            "api_key": "BT_PWS_API_KEY",
+            "client_id": "BT_PWS_CLIENT_ID",
+            "client_secret": "BT_PWS_CLIENT_SECRET",
+            "run_as": "BT_PWS_RUN_AS",
+            "verify_ssl": "BT_PWS_VERIFY_SSL",
+            "timeout": "BT_PWS_TIMEOUT",
+        },
+        "PRA": {
+            "api_url": "BT_PRA_API_URL",
+            "client_id": "BT_PRA_CLIENT_ID",
+            "client_secret": "BT_PRA_CLIENT_SECRET",
+            "verify_ssl": "BT_PRA_VERIFY_SSL",
+            "timeout": "BT_PRA_TIMEOUT",
+        },
+        "Entitle": {
+            "api_url": "BT_ENTITLE_API_URL",
+            "api_key": "BT_ENTITLE_API_KEY",
+            "verify_ssl": "BT_ENTITLE_VERIFY_SSL",
+            "timeout": "BT_ENTITLE_TIMEOUT",
+        },
+        "EPM Windows": {
+            "api_url": "BT_EPM_API_URL",
+            "client_id": "BT_EPM_CLIENT_ID",
+            "client_secret": "BT_EPM_CLIENT_SECRET",
+            "verify_ssl": "BT_EPM_VERIFY_SSL",
+            "timeout": "BT_EPM_TIMEOUT",
+        },
+    }
+
+    # Check active profile
+    active_profile = os.getenv("BT_PROFILE", "default")
+    console.print(f"[bold]Active Profile:[/bold] {active_profile}\n")
+
+    # Show effective config for each product
+    for product_name, env_vars in products.items():
+        table = Table(title=product_name, show_header=True, title_style="bold cyan")
+        table.add_column("Setting", style="green")
+        table.add_column("Env Var", style="dim")
+        table.add_column("Value")
+        table.add_column("Source", style="dim")
+
+        has_config = False
+        for setting, env_var in env_vars.items():
+            value = os.getenv(env_var, "")
+            if value:
+                has_config = True
+                source = ".env" if env_file else "environment"
+                table.add_row(setting, env_var, mask_secret(setting, value), source)
+
+        if has_config:
+            console.print(table)
+            console.print()
+        else:
+            console.print(f"[dim]{product_name}: not configured[/dim]\n")
+
+    # Also show config file info
+    config = load_config_file()
+    if config.profiles:
+        console.print("[bold]Config File Profiles:[/bold]")
+        for profile_name in config.list_profiles():
+            products_list = list(config.profiles[profile_name].keys())
+            is_default = " (default)" if profile_name == config.default_profile else ""
+            console.print(f"  {profile_name}{is_default}: {', '.join(products_list)}")
+        console.print(f"\n[dim]Note: Environment variables override config file settings[/dim]")

{bt_cli-0.4.27 → bt_cli-0.4.29}/src/bt_cli/pra/client/base.py

@@ -489,19 +489,27 @@ class PRAClient:
         name: Optional[str] = None,
         hostname: Optional[str] = None,
     ) -> List[Dict[str, Any]]:
-        """List Protocol Tunnel Jump items (TCP, MSSQL, K8s) with optional filters."""
+        """List Protocol Tunnel Jump items (TCP, MSSQL, K8s) with optional filters.
+
+        Note: tunnel_type is filtered client-side as the API doesn't support it.
+        """
         params = {}
         if jump_group_id:
             params["jump_group_id"] = jump_group_id
-        if tunnel_type:
-            params["tunnel_type"] = tunnel_type
         if tag:
             params["tag"] = tag
         if name:
             params["name"] = name
         if hostname:
             params["hostname"] = hostname
-        return self.get_paginated("/jump-item/protocol-tunnel-jump", params)
+
+        items = self.get_paginated("/jump-item/protocol-tunnel-jump", params)
+
+        # Filter tunnel_type client-side (API doesn't support this filter)
+        if tunnel_type:
+            items = [i for i in items if i.get("tunnel_type") == tunnel_type]
+
+        return items
 
     def get_protocol_tunnel(self, item_id: int) -> Dict[str, Any]:
         """Get a Protocol Tunnel Jump item."""