Skip to content

fix(security): limit auto-pair to one-shot with 180s timeout #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericksoa wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −4
Open

fix(security): limit auto-pair to one-shot with 180s timeout #690

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5864d97
fix(security): limit auto-pair to one-shot with identity check and to…
ericksoa Mar 23, 2026
ccdd7c3
fix: prevent one-shot bypass via repeated deadline extension
ericksoa Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions scripts/nemoclaw-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,17 @@ import json
import subprocess
import time

DEADLINE = time.time() + 600
DEADLINE = time.time() + 180
QUIET_POLLS = 0
APPROVED = 0

def run(*args):
proc = subprocess.run(args, capture_output=True, text=True)
return proc.returncode, proc.stdout.strip(), proc.stderr.strip()

# Revoke all device tokens from previous sessions so they don't persist across restarts
run('openclaw', 'devices', 'clear', '--yes')

while time.time() < DEADLINE:
rc, out, err = run('openclaw', 'devices', 'list', '--json')
if rc != 0 or not out:
Expand All @@ -95,18 +98,28 @@ while time.time() < DEADLINE:
paired = data.get('paired') or []
has_browser = any((d.get('clientId') == 'openclaw-control-ui') or (d.get('clientMode') == 'webchat') for d in paired if isinstance(d, dict))

if pending:
if pending and APPROVED == 0:
QUIET_POLLS = 0
for device in pending:
request_id = (device or {}).get('requestId')
if not isinstance(device, dict):
continue
request_id = device.get('requestId')
if not request_id:
continue
# Only approve the chat UI — reject unknown clients.
client_id = device.get('clientId', '')
if client_id != 'openclaw-control-ui':
print(f'[auto-pair] skipping non-UI device request={request_id} clientId={client_id!r}')
run('openclaw', 'devices', 'reject', request_id, '--json')
continue
arc, aout, aerr = run('openclaw', 'devices', 'approve', request_id, '--json')
if arc == 0:
APPROVED += 1
print(f'[auto-pair] approved request={request_id}')
print(f'[auto-pair] approved request={request_id} clientId={client_id}')
elif aout or aerr:
print(f'[auto-pair] approve failed request={request_id}: {(aerr or aout)[:400]}')
if APPROVED >= 1:
DEADLINE = time.time() + 5
time.sleep(1)
continue

Expand All @@ -123,6 +136,9 @@ while time.time() < DEADLINE:
time.sleep(1)
else:
print(f'[auto-pair] watcher timed out approvals={APPROVED}')

# Clean up: reject any remaining pending requests so no stale requests linger
run('openclaw', 'devices', 'clear', '--pending', '--yes')
PYAUTOPAIR
echo "[gateway] auto-pair watcher launched (pid $!)"
}
Expand Down