daniel156161
c1a5ef9dd7
- Remove token auth entirely; only Ed25519 pubkey auth or --no-auth - Add 32 MB message-size cap in serve and client (DoS protection) - Set Unix socket to 0o600 after bind in native_host (multi-user hardening) - Enforce browser-cli/VERSION user-agent on all TCP connections - Add PROTOCOL_MIN_CLIENT check (>= 0.9.0) server- and client-side - Include server_version + min_client_version in challenge frame - Add browser_cli/version_manager.py: parse_version, get_installed_version - Add browser_cli/compat.py: Stripe-style versioning layer with adapt_request / adapt_response hooks; baseline 0.9.2, no shims needed yet - Fix BrowserCLI key handling: no Path() wrap for agent specs - Fix _multi_browser_targets() to forward key to remote_browser_targets() Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
116 lines
3.8 KiB
Python
116 lines
3.8 KiB
Python
import click
|
|
from browser_cli.client import BrowserNotConnected, active_browser_targets, remote_browser_targets, send_command
|
|
from rich.console import Console
|
|
from rich.table import Table
|
|
|
|
console = Console()
|
|
|
|
|
|
def _handle(command, args=None, profile=None):
|
|
try:
|
|
return send_command(command, args or {}, profile=profile)
|
|
except BrowserNotConnected as e:
|
|
console.print(f"[red]Error:[/red] {e}")
|
|
raise SystemExit(1)
|
|
except RuntimeError as e:
|
|
console.print(f"[red]Browser error:[/red] {e}")
|
|
raise SystemExit(1)
|
|
|
|
|
|
def _handle_multi(command, args=None, profile=None, remote=None):
|
|
try:
|
|
if remote:
|
|
return send_command(command, args or {}, profile=profile, remote=remote)
|
|
return send_command(command, args or {}, profile=profile)
|
|
except (BrowserNotConnected, RuntimeError):
|
|
return None
|
|
|
|
|
|
def _multi_browser_targets():
|
|
root = click.get_current_context().find_root()
|
|
if root.obj.get("browser_explicit"):
|
|
return []
|
|
remote = root.obj.get("remote")
|
|
key = root.obj.get("key")
|
|
if remote:
|
|
targets = remote_browser_targets(remote, key=key)
|
|
else:
|
|
targets = active_browser_targets(key=key)
|
|
if len(targets) <= 1 and not any(target.remote for target in targets):
|
|
return []
|
|
return targets
|
|
|
|
|
|
def _print_windows(windows: list[dict], *, show_browser: bool = False) -> None:
|
|
if not windows:
|
|
console.print("[yellow]No windows found[/yellow]")
|
|
return
|
|
table = Table(show_header=True, header_style="bold cyan")
|
|
if show_browser:
|
|
table.add_column("Browser")
|
|
table.add_column("ID", style="dim", no_wrap=True)
|
|
table.add_column("Alias", width=20)
|
|
table.add_column("Tabs", width=6)
|
|
table.add_column("State", width=12)
|
|
for w in windows:
|
|
row = [
|
|
w.get("browser", "") if show_browser else None,
|
|
str(w.get("id", "")),
|
|
w.get("alias") or "",
|
|
str(w.get("tabCount", "")),
|
|
w.get("state") or "",
|
|
]
|
|
table.add_row(*[value for value in row if value is not None])
|
|
console.print(table)
|
|
|
|
|
|
@click.group("windows")
|
|
def windows_group():
|
|
"""Manage browser windows."""
|
|
|
|
|
|
@windows_group.command("list")
|
|
def windows_list():
|
|
"""List all browser windows."""
|
|
targets = _multi_browser_targets()
|
|
if targets:
|
|
windows = []
|
|
for target in targets:
|
|
result = _handle_multi("windows.list", profile=target.profile, remote=target.remote)
|
|
if result is None:
|
|
continue
|
|
windows.extend({**window, "browser": target.display_name} for window in result)
|
|
if not windows:
|
|
console.print("[red]Error:[/red] Cannot resolve a browser socket automatically.")
|
|
raise SystemExit(1)
|
|
_print_windows(windows, show_browser=True)
|
|
return
|
|
windows = _handle("windows.list")
|
|
_print_windows(windows or [])
|
|
|
|
|
|
@windows_group.command("rename")
|
|
@click.argument("window_id", type=int)
|
|
@click.argument("name")
|
|
def windows_rename(window_id, name):
|
|
"""Give a window a local alias NAME (stored in native host)."""
|
|
_handle("windows.rename", {"windowId": window_id, "name": name})
|
|
console.print(f"[green]Window {window_id} aliased as '{name}'[/green]")
|
|
|
|
|
|
@windows_group.command("close")
|
|
@click.argument("window_id", type=int)
|
|
def windows_close(window_id):
|
|
"""Close a browser window."""
|
|
_handle("windows.close", {"windowId": window_id})
|
|
console.print(f"[green]Window {window_id} closed[/green]")
|
|
|
|
|
|
@windows_group.command("open")
|
|
@click.argument("url", required=False)
|
|
def windows_open(url):
|
|
"""Open a new browser window."""
|
|
result = _handle("windows.open", {"url": url})
|
|
wid = result.get("id") if isinstance(result, dict) else result
|
|
console.print(f"[green]Opened new window[/green] (id: {wid})" + (f" with {url}" if url else ""))
|