bt-cli 0.4.26__tar.gz → 0.4.28__tar.gz

{bt_cli-0.4.26 → bt_cli-0.4.28}/CLAUDE.md

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

{bt_cli-0.4.26 → bt_cli-0.4.28}/PKG-INFO

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

{bt_cli-0.4.26 → bt_cli-0.4.28}/pyproject.toml

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

{bt_cli-0.4.26 → bt_cli-0.4.28}/src/bt_cli/__init__.py

@@ -1,3 +1,3 @@
 """BeyondTrust Unified Admin CLI."""
 
-__version__ = "0.4.26"
+__version__ = "0.4.28"

{bt_cli-0.4.26 → bt_cli-0.4.28}/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."""

{bt_cli-0.4.26 → bt_cli-0.4.28}/src/bt_cli/pra/commands/jump_items.py

@@ -1,12 +1,29 @@
 """Jump Item commands (shell, RDP, VNC, web, tunnels)."""
 
-from typing import Optional
+from fnmatch import fnmatch
+from typing import List, Optional
 
 import httpx
 import typer
 
 from bt_cli.core.output import OutputFormat, print_table, print_json, print_error, print_success, print_api_error
 
+
+def _filter_by_pattern(items: List[dict], pattern: str, field: str = "name") -> List[dict]:
+    """Filter items by fnmatch pattern on a field."""
+    return [item for item in items if fnmatch(item.get(field, "").lower(), pattern.lower())]
+
+
+def _find_by_name(items: List[dict], name: str) -> Optional[dict]:
+    """Find a single item by exact name match (case-insensitive)."""
+    name_lower = name.lower()
+    matches = [item for item in items if item.get("name", "").lower() == name_lower]
+    if len(matches) == 1:
+        return matches[0]
+    elif len(matches) > 1:
+        raise ValueError(f"Multiple items found with name '{name}'. Use ID instead.")
+    return None
+
 app = typer.Typer(no_args_is_help=True)
 
 # Shell Jump subcommands
@@ -20,6 +37,7 @@ def list_shell_jumps(
     jumpoint_id: Optional[int] = typer.Option(None, "--jumpoint", "-j", help="Filter by Jumpoint"),
     tag: Optional[str] = typer.Option(None, "--tag", "-t", help="Filter by tag (exact match)"),
     name: Optional[str] = typer.Option(None, "--name", "-n", help="Filter by name (exact match)"),
+    name_pattern: Optional[str] = typer.Option(None, "--name-pattern", help="Filter by name pattern (e.g., 'prod-*')"),
     hostname: Optional[str] = typer.Option(None, "--hostname", help="Filter by hostname (exact match)"),
     output: OutputFormat = typer.Option(OutputFormat.TABLE, "--output", "-o"),
 ):
@@ -36,6 +54,10 @@ def list_shell_jumps(
             hostname=hostname,
         )
 
+        # Client-side pattern filtering
+        if name_pattern:
+            items = _filter_by_pattern(items, name_pattern)
+
         if output == OutputFormat.JSON:
             print_json(items)
         else:
@@ -206,27 +228,44 @@ def update_shell_jump(
 
 @shell_app.command("delete")
 def delete_shell_jump(
-    item_id: int = typer.Argument(..., help="Shell Jump ID"),
+    item_id: Optional[int] = typer.Argument(None, help="Shell Jump ID"),
+    name: Optional[str] = typer.Option(None, "--name", "-n", help="Delete by name instead of ID"),
     force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be deleted without deleting"),
 ):
-    """Delete a Shell Jump item."""
+    """Delete a Shell Jump item by ID or name."""
     from bt_cli.pra.client import get_client
 
+    if not item_id and not name:
+        print_error("Either ITEM_ID or --name is required")
+        raise typer.Exit(1)
+
     try:
         client = get_client()
-        # Fetch item details for display
-        if dry_run:
+
+        # Look up by name if provided
+        if name and not item_id:
+            items = client.list_shell_jumps(name=name)
+            if not items:
+                print_error(f"No shell jump found with name '{name}'")
+                raise typer.Exit(1)
+            if len(items) > 1:
+                print_error(f"Multiple shell jumps found with name '{name}'. Use ID instead.")
+                raise typer.Exit(1)
+            item = items[0]
+            item_id = item.get("id")
+        else:
             item = client.get_shell_jump(item_id)
+
+        if dry_run:
             print_success(f"[DRY-RUN] Would delete shell jump: {item.get('name')} (ID: {item_id})")
             return
 
         if not force:
-            item = client.get_shell_jump(item_id)
             typer.confirm(f"Delete shell jump '{item.get('name')}' (ID: {item_id})?", abort=True)
 
         client.delete_shell_jump(item_id)
-        print_success(f"Deleted shell jump {item_id}")
+        print_success(f"Deleted shell jump '{item.get('name')}' (ID: {item_id})")
     except httpx.HTTPStatusError as e:
         print_api_error(e, "delete shell jump")
         raise typer.Exit(1)
@@ -249,6 +288,7 @@ def list_rdp_jumps(
     jumpoint_id: Optional[int] = typer.Option(None, "--jumpoint", "-j", help="Filter by Jumpoint"),
     tag: Optional[str] = typer.Option(None, "--tag", "-t", help="Filter by tag (exact match)"),
     name: Optional[str] = typer.Option(None, "--name", "-n", help="Filter by name (exact match)"),
+    name_pattern: Optional[str] = typer.Option(None, "--name-pattern", help="Filter by name pattern (e.g., 'prod-*')"),
     hostname: Optional[str] = typer.Option(None, "--hostname", help="Filter by hostname (exact match)"),
     output: OutputFormat = typer.Option(OutputFormat.TABLE, "--output", "-o"),
 ):
@@ -265,6 +305,9 @@ def list_rdp_jumps(
             hostname=hostname,
         )
 
+        if name_pattern:
+            items = _filter_by_pattern(items, name_pattern)
+
         if output == OutputFormat.JSON:
             print_json(items)
         else:
@@ -382,26 +425,43 @@ def create_rdp_jump(
 
 @rdp_app.command("delete")
 def delete_rdp_jump(
-    item_id: int = typer.Argument(..., help="RDP Jump ID"),
+    item_id: Optional[int] = typer.Argument(None, help="RDP Jump ID"),
+    name: Optional[str] = typer.Option(None, "--name", "-n", help="Delete by name instead of ID"),
     force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be deleted without deleting"),
 ):
-    """Delete a Remote RDP Jump item."""
+    """Delete a Remote RDP Jump item by ID or name."""
     from bt_cli.pra.client import get_client
 
+    if not item_id and not name:
+        print_error("Either ITEM_ID or --name is required")
+        raise typer.Exit(1)
+
     try:
         client = get_client()
-        if dry_run:
+
+        if name and not item_id:
+            items = client.list_rdp_jumps(name=name)
+            if not items:
+                print_error(f"No RDP jump found with name '{name}'")
+                raise typer.Exit(1)
+            if len(items) > 1:
+                print_error(f"Multiple RDP jumps found with name '{name}'. Use ID instead.")
+                raise typer.Exit(1)
+            item = items[0]
+            item_id = item.get("id")
+        else:
             item = client.get_rdp_jump(item_id)
+
+        if dry_run:
             print_success(f"[DRY-RUN] Would delete RDP jump: {item.get('name')} (ID: {item_id})")
             return
 
         if not force:
-            item = client.get_rdp_jump(item_id)
             typer.confirm(f"Delete RDP jump '{item.get('name')}' (ID: {item_id})?", abort=True)
 
         client.delete_rdp_jump(item_id)
-        print_success(f"Deleted RDP jump {item_id}")
+        print_success(f"Deleted RDP jump '{item.get('name')}' (ID: {item_id})")
     except httpx.HTTPStatusError as e:
         print_api_error(e, "delete RDP jump")
         raise typer.Exit(1)
@@ -423,6 +483,7 @@ def list_vnc_jumps(
     jump_group_id: Optional[int] = typer.Option(None, "--jump-group", "-g", help="Filter by Jump Group"),
     tag: Optional[str] = typer.Option(None, "--tag", "-t", help="Filter by tag (exact match)"),
     name: Optional[str] = typer.Option(None, "--name", "-n", help="Filter by name (exact match)"),
+    name_pattern: Optional[str] = typer.Option(None, "--name-pattern", help="Filter by name pattern (e.g., 'prod-*')"),
     hostname: Optional[str] = typer.Option(None, "--hostname", help="Filter by hostname (exact match)"),
     output: OutputFormat = typer.Option(OutputFormat.TABLE, "--output", "-o"),
 ):
@@ -438,6 +499,9 @@ def list_vnc_jumps(
             hostname=hostname,
         )
 
+        if name_pattern:
+            items = _filter_by_pattern(items, name_pattern)
+
         if output == OutputFormat.JSON:
             print_json(items)
         else:
@@ -470,6 +534,7 @@ def list_web_jumps(
     jump_group_id: Optional[int] = typer.Option(None, "--jump-group", "-g", help="Filter by Jump Group"),
     tag: Optional[str] = typer.Option(None, "--tag", "-t", help="Filter by tag (exact match)"),
     name: Optional[str] = typer.Option(None, "--name", "-n", help="Filter by name (exact match)"),
+    name_pattern: Optional[str] = typer.Option(None, "--name-pattern", help="Filter by name pattern (e.g., 'prod-*')"),
     output: OutputFormat = typer.Option(OutputFormat.TABLE, "--output", "-o"),
 ):
     """List Web Jump items."""
@@ -483,6 +548,9 @@ def list_web_jumps(
             name=name,
         )
 
+        if name_pattern:
+            items = _filter_by_pattern(items, name_pattern)
+
         if output == OutputFormat.JSON:
             print_json(items)
         else:
@@ -545,26 +613,43 @@ def get_web_jump(
 
 @web_app.command("delete")
 def delete_web_jump(
-    item_id: int = typer.Argument(..., help="Web Jump ID"),
+    item_id: Optional[int] = typer.Argument(None, help="Web Jump ID"),
+    name: Optional[str] = typer.Option(None, "--name", "-n", help="Delete by name instead of ID"),
     force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be deleted without deleting"),
 ):
-    """Delete a Web Jump item."""
+    """Delete a Web Jump item by ID or name."""
     from bt_cli.pra.client import get_client
 
+    if not item_id and not name:
+        print_error("Either ITEM_ID or --name is required")
+        raise typer.Exit(1)
+
     try:
         client = get_client()
-        if dry_run:
+
+        if name and not item_id:
+            items = client.list_web_jumps(name=name)
+            if not items:
+                print_error(f"No web jump found with name '{name}'")
+                raise typer.Exit(1)
+            if len(items) > 1:
+                print_error(f"Multiple web jumps found with name '{name}'. Use ID instead.")
+                raise typer.Exit(1)
+            item = items[0]
+            item_id = item.get("id")
+        else:
             item = client.get_web_jump(item_id)
+
+        if dry_run:
             print_success(f"[DRY-RUN] Would delete web jump: {item.get('name')} (ID: {item_id})")
             return
 
         if not force:
-            item = client.get_web_jump(item_id)
             typer.confirm(f"Delete web jump '{item.get('name')}' (ID: {item_id})?", abort=True)
 
         client.delete_web_jump(item_id)
-        print_success(f"Deleted web jump {item_id}")
+        print_success(f"Deleted web jump '{item.get('name')}' (ID: {item_id})")
     except httpx.HTTPStatusError as e:
         print_api_error(e, "delete web jump")
         raise typer.Exit(1)
@@ -587,6 +672,7 @@ def list_protocol_tunnels(
     tunnel_type: Optional[str] = typer.Option(None, "--type", help="Filter by type: tcp, mssql, psql, mysql, k8s"),
     tag: Optional[str] = typer.Option(None, "--tag", "-t", help="Filter by tag (exact match)"),
     name: Optional[str] = typer.Option(None, "--name", "-n", help="Filter by name (exact match)"),
+    name_pattern: Optional[str] = typer.Option(None, "--name-pattern", help="Filter by name pattern (e.g., 'prod-*')"),
     hostname: Optional[str] = typer.Option(None, "--hostname", help="Filter by hostname (exact match)"),
     output: OutputFormat = typer.Option(OutputFormat.TABLE, "--output", "-o"),
 ):
@@ -603,6 +689,9 @@ def list_protocol_tunnels(
             hostname=hostname,
         )
 
+        if name_pattern:
+            items = _filter_by_pattern(items, name_pattern)
+
         if output == OutputFormat.JSON:
             print_json(items)
         else:
@@ -741,26 +830,43 @@ def create_protocol_tunnel(
 
 @tunnel_app.command("delete")
 def delete_protocol_tunnel(
-    item_id: int = typer.Argument(..., help="Protocol Tunnel ID"),
+    item_id: Optional[int] = typer.Argument(None, help="Protocol Tunnel ID"),
+    name: Optional[str] = typer.Option(None, "--name", "-n", help="Delete by name instead of ID"),
     force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be deleted without deleting"),
 ):
-    """Delete a Protocol Tunnel Jump item."""
+    """Delete a Protocol Tunnel Jump item by ID or name."""
     from bt_cli.pra.client import get_client
 
+    if not item_id and not name:
+        print_error("Either ITEM_ID or --name is required")
+        raise typer.Exit(1)
+
     try:
         client = get_client()
-        if dry_run:
+
+        if name and not item_id:
+            items = client.list_protocol_tunnels(name=name)
+            if not items:
+                print_error(f"No protocol tunnel found with name '{name}'")
+                raise typer.Exit(1)
+            if len(items) > 1:
+                print_error(f"Multiple protocol tunnels found with name '{name}'. Use ID instead.")
+                raise typer.Exit(1)
+            item = items[0]
+            item_id = item.get("id")
+        else:
             item = client.get_protocol_tunnel(item_id)
+
+        if dry_run:
             print_success(f"[DRY-RUN] Would delete protocol tunnel: {item.get('name')} (ID: {item_id})")
             return
 
         if not force:
-            item = client.get_protocol_tunnel(item_id)
             typer.confirm(f"Delete protocol tunnel '{item.get('name')}' (ID: {item_id})?", abort=True)
 
         client.delete_protocol_tunnel(item_id)
-        print_success(f"Deleted protocol tunnel {item_id}")
+        print_success(f"Deleted protocol tunnel '{item.get('name')}' (ID: {item_id})")
     except httpx.HTTPStatusError as e:
         print_api_error(e, "delete protocol tunnel")
         raise typer.Exit(1)

{bt_cli-0.4.26 → bt_cli-0.4.28}/src/bt_cli/pws/client/beyondinsight.py

@@ -910,3 +910,46 @@ class BeyondInsightMixin:
             attribute_id: Attribute ID to remove
         """
         self.delete(f"/ManagedSystems/{managed_system_id}/Attributes/{attribute_id}")
+
+    def get_managed_account_attributes(
+        self: "PasswordSafeClient",
+        account_id: int,
+    ) -> list[dict[str, Any]]:
+        """Get attributes for a managed account.
+
+        Args:
+            account_id: Managed account ID
+
+        Returns:
+            List of attribute objects assigned to this account
+        """
+        return self.get(f"/ManagedAccounts/{account_id}/Attributes")
+
+    def assign_managed_account_attribute(
+        self: "PasswordSafeClient",
+        account_id: int,
+        attribute_id: int,
+    ) -> dict[str, Any]:
+        """Assign an attribute to a managed account.
+
+        Args:
+            account_id: Managed account ID
+            attribute_id: Attribute ID to assign
+
+        Returns:
+            The created assignment
+        """
+        return self.post(f"/ManagedAccounts/{account_id}/Attributes/{attribute_id}")
+
+    def remove_managed_account_attribute(
+        self: "PasswordSafeClient",
+        account_id: int,
+        attribute_id: int,
+    ) -> None:
+        """Remove an attribute from a managed account.
+
+        Args:
+            account_id: Managed account ID
+            attribute_id: Attribute ID to remove
+        """
+        self.delete(f"/ManagedAccounts/{account_id}/Attributes/{attribute_id}")

{bt_cli-0.4.26 → bt_cli-0.4.28}/src/bt_cli/pws/commands/attributes.py

@@ -174,3 +174,93 @@ def remove_attribute(
     except Exception as e:
         print_api_error(e, "remove attribute")
         raise typer.Exit(1)
+
+
+# Account attribute commands
+@app.command("show-for-account")
+def show_account_attributes(
+    account_id: int = typer.Argument(..., help="Managed Account ID"),
+    output: OutputFormat = typer.Option(OutputFormat.TABLE, "--output", "-o"),
+):
+    """Show attributes assigned to a managed account."""
+    from bt_cli.pws.client import get_client
+
+    try:
+        with get_client() as client:
+            attributes = client.get_managed_account_attributes(account_id)
+
+        if output == OutputFormat.JSON:
+            print_json(attributes)
+        else:
+            if not attributes:
+                print_error(f"No attributes assigned to managed account {account_id}")
+                return
+
+            columns = [
+                ("ID", "AttributeID"),
+                ("Name", "AttributeName"),
+                ("Type", "AttributeType"),
+            ]
+            print_table(attributes, columns, title=f"Attributes for Managed Account {account_id}")
+    except httpx.HTTPStatusError as e:
+        print_api_error(e, "show account attributes")
+        raise typer.Exit(1)
+    except httpx.RequestError as e:
+        print_api_error(e, "show account attributes")
+        raise typer.Exit(1)
+    except Exception as e:
+        print_api_error(e, "show account attributes")
+        raise typer.Exit(1)
+
+
+@app.command("assign-to-account")
+def assign_account_attribute(
+    account_id: int = typer.Argument(..., help="Managed Account ID"),
+    attribute_id: int = typer.Argument(..., help="Attribute ID to assign"),
+):
+    """Assign an attribute to a managed account."""
+    from bt_cli.pws.client import get_client
+
+    try:
+        with get_client() as client:
+            client.assign_managed_account_attribute(account_id, attribute_id)
+            print_success(f"Assigned attribute {attribute_id} to managed account {account_id}")
+    except httpx.HTTPStatusError as e:
+        print_api_error(e, "assign attribute to account")
+        raise typer.Exit(1)
+    except httpx.RequestError as e:
+        print_api_error(e, "assign attribute to account")
+        raise typer.Exit(1)
+    except Exception as e:
+        print_api_error(e, "assign attribute to account")
+        raise typer.Exit(1)
+
+
+@app.command("remove-from-account")
+def remove_account_attribute(
+    account_id: int = typer.Argument(..., help="Managed Account ID"),
+    attribute_id: int = typer.Argument(..., help="Attribute ID to remove"),
+    force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
+):
+    """Remove an attribute from a managed account."""
+    from bt_cli.pws.client import get_client
+
+    if not force:
+        typer.confirm(
+            f"Remove attribute {attribute_id} from managed account {account_id}?",
+            abort=True
+        )
+
+    try:
+        with get_client() as client:
+            client.remove_managed_account_attribute(account_id, attribute_id)
+            print_success(f"Removed attribute {attribute_id} from managed account {account_id}")
+    except httpx.HTTPStatusError as e:
+        print_api_error(e, "remove attribute from account")
+        raise typer.Exit(1)
+    except httpx.RequestError as e:
+        print_api_error(e, "remove attribute from account")
+        raise typer.Exit(1)
+    except Exception as e:
+        print_api_error(e, "remove attribute from account")
+        raise typer.Exit(1)