mirror of
https://github.com/jhd3197/ServerKit.git
synced 2026-11-09 21:43:05 +09:00
Juan DenisandClaude Opus 4.7
7d55a9c05d
Users had to SSH in to run `cloudflared tunnel login` before any of
the Tunnels tab worked. Wire up the OAuth flow so the panel can
trigger it and surface the auth URL for the user to open from their
own browser.
Agent:
- New cloudflared.LoginEvent + Manager.Login() that spawns the
process, regex-matches the dash.cloudflare.com/argotunnel URL on
stdout/stderr, and watches cert.pem in parallel as a reliable
completion signal. 15-minute hard ceiling.
- New cloudflared:login action returns {job_id, channel} immediately;
the goroutine emits start → status (with auth_url) → done events
on the job channel.
- Non-linux stub returns "unsupported".
- jobs.HasTerminated() helper so handler shutdown paths can avoid
double-emitting the terminator.
Panel:
- POST /servers/<id>/cloudflared/login + RemoteCloudflaredService.login
- ApiService.startRemoteCloudflaredLogin
Frontend:
- CloudflaredTab gains a "Login to Cloudflare" CTA when not authed.
Click → starts the agent flow, joins the job's Socket.IO room,
listens for the auth_url event, and renders an Open-in-Browser
button. Once the agent emits done, refreshes capabilities + status
+ tunnel list automatically — the rest of the tab unlocks itself.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
79 lines
3.0 KiB
Python
79 lines
3.0 KiB
Python
"""
|
|
Remote Cloudflared Service
|
|
|
|
Mirrors RemoteCronService: a thin dispatcher that forwards
|
|
cloudflared:* actions to the agent.
|
|
|
|
Auth model — approach A (the user runs `cloudflared tunnel login`
|
|
once on each server). The panel never touches Cloudflare credentials
|
|
directly; the cert.pem on the host IS the credential, and cloudflared
|
|
uses it for every subsequent call. The /status endpoint surfaces
|
|
"cert present? yes/no" so the UI can show a "log in first" prompt
|
|
instead of letting actions fail with confusing errors.
|
|
"""
|
|
|
|
from typing import Any, Dict, Optional
|
|
|
|
from app.services.agent_registry import agent_registry
|
|
|
|
|
|
class RemoteCloudflaredService:
|
|
@staticmethod
|
|
def _send(server_id: str, action: str, params: Optional[Dict[str, Any]] = None,
|
|
user_id: Optional[int] = None, timeout: float = 30.0) -> Dict[str, Any]:
|
|
return agent_registry.send_command(
|
|
server_id=server_id,
|
|
action=action,
|
|
params=params or {},
|
|
user_id=user_id,
|
|
timeout=timeout,
|
|
)
|
|
|
|
@staticmethod
|
|
def status(server_id: str, user_id: Optional[int] = None) -> Dict[str, Any]:
|
|
return RemoteCloudflaredService._send(server_id, 'cloudflared:status',
|
|
user_id=user_id, timeout=8.0)
|
|
|
|
@staticmethod
|
|
def list_tunnels(server_id: str, user_id: Optional[int] = None) -> Dict[str, Any]:
|
|
# Tunnel list hits Cloudflare API server-side, so allow more time
|
|
# than for crontab parsing.
|
|
return RemoteCloudflaredService._send(server_id, 'cloudflared:tunnel:list',
|
|
user_id=user_id, timeout=30.0)
|
|
|
|
@staticmethod
|
|
def create_tunnel(server_id: str, name: str,
|
|
user_id: Optional[int] = None) -> Dict[str, Any]:
|
|
return RemoteCloudflaredService._send(
|
|
server_id, 'cloudflared:tunnel:create',
|
|
params={'name': name},
|
|
user_id=user_id, timeout=30.0,
|
|
)
|
|
|
|
@staticmethod
|
|
def route_tunnel(server_id: str, tunnel_ref: str, hostname: str,
|
|
user_id: Optional[int] = None) -> Dict[str, Any]:
|
|
return RemoteCloudflaredService._send(
|
|
server_id, 'cloudflared:tunnel:route',
|
|
params={'tunnel_ref': tunnel_ref, 'hostname': hostname},
|
|
user_id=user_id, timeout=30.0,
|
|
)
|
|
|
|
@staticmethod
|
|
def delete_tunnel(server_id: str, ref: str,
|
|
user_id: Optional[int] = None) -> Dict[str, Any]:
|
|
return RemoteCloudflaredService._send(
|
|
server_id, 'cloudflared:tunnel:delete',
|
|
params={'ref': ref},
|
|
user_id=user_id, timeout=30.0,
|
|
)
|
|
|
|
@staticmethod
|
|
def login(server_id: str, user_id: Optional[int] = None) -> Dict[str, Any]:
|
|
# Returns {job_id, channel} immediately; the panel subscribes to
|
|
# the matching Socket.IO room for the auth_url + completion event.
|
|
return RemoteCloudflaredService._send(
|
|
server_id, 'cloudflared:login',
|
|
user_id=user_id, timeout=10.0,
|
|
)
|