mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
37d0766ba5
Follow-up hardening on the request-id grant path. approve_request took the same lockout treatment as approve_code: gated by it, and recording a miss toward it. But the two paths defend different things. The lockout exists to stop guessing at the 8-char code space over a messaging channel; a request id is only ever obtained by an admin already authenticated to the store, so a miss means the row they clicked went stale. Counting those let a handful of clicks on a stale list lock the operator out of `hermes pairing approve` for an hour — the GUI DoSing the CLI. Also drops the `code`/`code_hash_prefix` compat fields from list_pending. The hash prefix is what admin surfaces mistook for an approvable code in the first place, and re-exporting the request id under the old `code` key just preserves the ambiguity; both consumers in the tree read `request_id` now. The 16-hex sniffing that had been copy-pasted into the CLI and the endpoint (where a chained conditional consulted it against the wrong field) moves to one owner, PairingStore.looks_like_request_id. The endpoint no longer reports a 429 on the request-id path, where lockout can't apply — a stale id surfaced as a bogus "locked out" while the platform sat locked for something else entirely.
120 lines
4.5 KiB
Python
120 lines
4.5 KiB
Python
"""
|
|
CLI commands for the DM pairing system.
|
|
|
|
Usage:
|
|
hermes pairing list # Show all pending + approved users
|
|
hermes pairing approve <platform> <request-id|code> # Approve a pairing request
|
|
hermes pairing revoke <platform> <user_id> # Revoke user access
|
|
hermes pairing clear-pending # Clear all expired/pending codes
|
|
"""
|
|
|
|
def pairing_command(args):
|
|
"""Handle hermes pairing subcommands."""
|
|
from gateway.pairing import PairingStore
|
|
|
|
store = PairingStore()
|
|
action = getattr(args, "pairing_action", None)
|
|
|
|
if action == "list":
|
|
_cmd_list(store)
|
|
elif action == "approve":
|
|
_cmd_approve(store, args.platform, args.code)
|
|
elif action == "revoke":
|
|
_cmd_revoke(store, args.platform, args.user_id)
|
|
elif action == "clear-pending":
|
|
_cmd_clear_pending(store)
|
|
else:
|
|
print("Usage: hermes pairing {list|approve|revoke|clear-pending}")
|
|
print("Run 'hermes pairing --help' for details.")
|
|
|
|
|
|
def _cmd_list(store):
|
|
"""List all pending and approved users."""
|
|
pending = store.list_pending()
|
|
approved = store.list_approved()
|
|
|
|
if not pending and not approved:
|
|
print("No pairing data found. No one has tried to pair yet~")
|
|
return
|
|
|
|
if pending:
|
|
print(f"\n Pending Pairing Requests ({len(pending)}):")
|
|
print(f" {'Platform':<12} {'Request ID':<18} {'User ID':<20} {'Name':<20} {'Age'}")
|
|
print(f" {'--------':<12} {'----------':<18} {'-------':<20} {'----':<20} {'---'}")
|
|
for p in pending:
|
|
print(
|
|
f" {p['platform']:<12} {(p.get('request_id') or '-'):<18} {p['user_id']:<20} "
|
|
f"{(p.get('user_name') or ''):<20} {p['age_minutes']}m ago"
|
|
)
|
|
print("\n Approve with: hermes pairing approve <platform> <request-id>")
|
|
print(" The code the bot DM'd the user also works if they relay it.")
|
|
else:
|
|
print("\n No pending pairing requests.")
|
|
|
|
if approved:
|
|
print(f"\n Approved Users ({len(approved)}):")
|
|
print(f" {'Platform':<12} {'User ID':<20} {'Name':<20}")
|
|
print(f" {'--------':<12} {'-------':<20} {'----':<20}")
|
|
for a in approved:
|
|
print(f" {a['platform']:<12} {a['user_id']:<20} {(a.get('user_name') or ''):<20}")
|
|
else:
|
|
print("\n No approved users.")
|
|
|
|
print()
|
|
|
|
|
|
def _cmd_approve(store, platform: str, code: str):
|
|
"""Approve a pairing request id (from ``pairing list``) or a DM'd code."""
|
|
platform = platform.lower().strip()
|
|
code = code.strip()
|
|
|
|
if store.looks_like_request_id(code):
|
|
result = store.approve_request(platform, code)
|
|
else:
|
|
result = store.approve_code(platform, code.upper())
|
|
if result:
|
|
uid = result["user_id"]
|
|
name = result.get("user_name") or ""
|
|
display = f"{name} ({uid})" if name else uid
|
|
print(f"\n Approved! User {display} on {platform} can now use the bot~")
|
|
print(" They'll be recognized automatically on their next message.\n")
|
|
elif store._is_locked_out(platform):
|
|
# Disambiguate: approve_code returns None for both invalid codes
|
|
# and lockout. Tell the operator it's lockout so they don't chase
|
|
# a "wrong code" rabbit hole (#10195).
|
|
import time as _time
|
|
limits = store._load_json(store._rate_limit_path())
|
|
lockout_until = limits.get(f"_lockout:{platform}", 0)
|
|
remaining = max(0, int(lockout_until - _time.time()))
|
|
mins = remaining // 60
|
|
print(
|
|
f"\n Platform '{platform}' is locked out after too many failed "
|
|
f"approval attempts."
|
|
)
|
|
print(f" Lockout clears in ~{mins} minute(s).")
|
|
print(
|
|
" To reset sooner, delete the '_lockout:{0}' entry from "
|
|
"~/.hermes/platforms/pairing/_rate_limits.json\n".format(platform)
|
|
)
|
|
else:
|
|
print(f"\n Pairing request or code '{code}' not found or expired for platform '{platform}'.")
|
|
print(" Run 'hermes pairing list' to see pending requests.\n")
|
|
|
|
|
|
def _cmd_revoke(store, platform: str, user_id: str):
|
|
"""Revoke a user's access."""
|
|
platform = platform.lower().strip()
|
|
|
|
if store.revoke(platform, user_id):
|
|
print(f"\n Revoked access for user {user_id} on {platform}.\n")
|
|
else:
|
|
print(f"\n User {user_id} not found in approved list for {platform}.\n")
|
|
|
|
|
|
def _cmd_clear_pending(store):
|
|
"""Clear all pending pairing codes."""
|
|
count = store.clear_pending()
|
|
if count:
|
|
print(f"\n Cleared {count} pending pairing request(s).\n")
|
|
else:
|
|
print("\n No pending requests to clear.\n")
|