fix: replace Bearer JWTs with path-bound access tickets in MCP download tools

link_capture_download and get_symbol embedded a 10-min JWT in the
Authorization header of the curl command they return; LLM clients
retyping that command corrupted the long token — the same failure
class as the console WebSocket URLs fixed in the previous commit.

Generalize the ticket store (console_tickets.py -> access_tickets.py,
ConsoleTicketService -> AccessTicketService): a ticket now binds to
either a node's console endpoints (WebSocket, matched against route
path params) or one exact REST resource path (capture file, symbol
image). The two binding modes are isolated — a node-bound ticket
cannot authenticate a REST resource and vice versa.

get_user_from_token redeems path-bound tickets through the existing
token parameter / Bearer header, matched exactly against
request.url.path, then reuses the shared user lookup and token_version
revocation checks. Download URLs embed ?token=<ticket> and the curl
commands no longer carry a Bearer header.
This commit is contained in:
YueGuobin committed 2026-08-29 01:10:19 +08:00
1 parent 6d6b5351fa
commit d1edfbe5e8
8 files changed
+293 -88

No files matched your search

+2 -2
View File
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from .authentication import AuthService
from .console_tickets import ConsoleTicketService
from .access_tickets import AccessTicketService
auth_service = AuthService()
console_ticket_service = ConsoleTicketService()
access_ticket_service = AccessTicketService()
@@ -15,20 +15,27 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
Short-lived console tickets.
Short-lived access tickets.
A console ticket is a short random string ("gns3t_" + 16 urlsafe chars) that
replaces the long JWT previously embedded in console WebSocket URLs returned
An access ticket is a short random string ("gns3t_" + 16 urlsafe chars) that
replaces the long JWTs previously embedded in URLs and curl commands returned
to LLM clients, which reliably corrupted the ~200-char JWT when retyping it
into a shell command. The ticket carries no information itself — the server
remembers what it maps to, which is what makes a 96-bit random string a
sufficient credential.
Tickets are bound to a single node's console endpoints (console/ws and
console/vnc share the same binding) and are multi-use within their TTL, so
console clients that reconnect after a drop keep working. Redeeming also
re-checks the minting user's token_version, so logging out invalidates
outstanding tickets just like it invalidates JWTs.
A ticket is bound to exactly one target, in one of two modes:
- node binding (project_id + node_id): redeemable on that node's console
WebSocket endpoints (console/ws and console/vnc share the binding),
validated against the route's path parameters.
- path binding (exact resource path): redeemable on one REST resource path
(e.g. a capture file download or a symbol image), validated against
request.url.path.
Tickets are multi-use within their TTL, so clients that reconnect keep
working. Redemption re-checks the minting user's token_version, so logging
out invalidates outstanding tickets just like it invalidates JWTs.
"""
import logging
@@ -45,34 +52,36 @@ DEFAULT_TICKET_TTL = 600 # seconds
@dataclass
class ConsoleTicket:
class AccessTicket:
username: str
token_version: int
project_id: str
node_id: str
expires_at: float # time.monotonic() based
project_id: Optional[str] = None # node binding: console WebSocket endpoints
node_id: Optional[str] = None
path: Optional[str] = None # path binding: one exact REST resource path
expires_at: float = 0.0 # time.monotonic() based
class ConsoleTicketService:
class AccessTicketService:
"""
In-memory store for console tickets.
In-memory store for access tickets.
Single-process asyncio app: minting (MCP tool handlers, via worker
threads) and redemption (WS auth dependency, event loop) share one dict.
threads) and redemption (auth dependencies, event loop) share one dict.
dict get/set/del are atomic under the GIL and keys are random, so no
locking is needed. Tickets vanish on restart — clients just request a
new one.
"""
def __init__(self) -> None:
self._tickets: dict[str, ConsoleTicket] = {}
self._tickets: dict[str, AccessTicket] = {}
def mint(
self,
username: str,
token_version: int,
project_id: str,
node_id: str,
project_id: Optional[str] = None,
node_id: Optional[str] = None,
path: Optional[str] = None,
ttl: int = DEFAULT_TICKET_TTL,
) -> str:
# 12 random bytes → 16 urlsafe chars (~96 bits); comfortably
@@ -80,33 +89,58 @@ class ConsoleTicketService:
# LLM clients copy it without corruption.
ticket = TICKET_PREFIX + secrets.token_urlsafe(12)
self._sweep_expired()
self._tickets[ticket] = ConsoleTicket(
self._tickets[ticket] = AccessTicket(
username=username,
token_version=token_version,
project_id=project_id,
node_id=node_id,
path=path,
expires_at=time.monotonic() + ttl,
)
return ticket
def redeem(self, ticket: str, path_params: dict) -> Optional[ConsoleTicket]:
def redeem(self, ticket: str, path_params: dict) -> Optional[AccessTicket]:
"""
Validate a ticket against the route it is being used on.
Validate a node-bound ticket against a WebSocket route.
Returns the ticket record if valid, None otherwise. The route's path
parameters must match the ticket's binding, which confines a ticket
to the node's console endpoints — routes without a node_id path
parameter (notifications, web wireshark, …) always fail the binding.
parameter (notifications, web wireshark, …) always fail the binding,
and so do path-bound (REST) tickets.
"""
record = self._get_valid(ticket)
if record is None:
return None
if record.node_id is None or record.path is not None:
return None
if path_params.get("project_id") != record.project_id or path_params.get("node_id") != record.node_id:
return None
return record
def redeem_for_path(self, ticket: str, path: str) -> Optional[AccessTicket]:
"""
Validate a path-bound ticket against a REST resource path.
The path must match exactly — a ticket minted for one capture file
download cannot be replayed against any other resource.
"""
record = self._get_valid(ticket)
if record is None:
return None
if record.path is None or record.path != path:
return None
return record
def _get_valid(self, ticket: str) -> Optional[AccessTicket]:
record = self._tickets.get(ticket)
if record is None:
return None
if time.monotonic() >= record.expires_at:
self._tickets.pop(ticket, None)
return None
if path_params.get("project_id") != record.project_id or path_params.get("node_id") != record.node_id:
return None
return record
def _sweep_expired(self) -> None: