fix(gateway): add shared-secret fallback to trusted-proxy auth dispatcher#1
Closed
dashed wants to merge 2 commits intofix/trusted-proxy-device-pairingfrom
Closed
fix(gateway): add shared-secret fallback to trusted-proxy auth dispatcher#1dashed wants to merge 2 commits intofix/trusted-proxy-device-pairingfrom
dashed wants to merge 2 commits intofix/trusted-proxy-device-pairingfrom
Conversation
…cher When auth.mode is "trusted-proxy" and proxy auth fails (e.g. internal connections that bypass the reverse proxy), fall back to token/password credentials if configured. This allows CLI, node hosts, ACP, and other internal services to authenticate directly while external users authenticate via the proxy. Also enable the tailscale overlay for trusted-proxy mode by removing the mode exclusion from the allowTailscale default.
Add 9 unit tests covering fallback behavior: proxy success unchanged, token/password fallback on valid credentials, rejection on mismatch, no-fallback when server credentials unconfigured, rate limiting on fallback attempts, and proxy-takes-priority when both are available. Add 3 e2e tests covering internal connection scenarios: token auth with device identity, token auth without device identity (canSkipDevice), and proxy connection priority over token fallback.
Closed
7 tasks
|
The formal models extracted constants ( This check is informational (not blocking merges yet). If this change is intentional, follow up by updating the formal models repo or regenerating the extracted artifacts there. |
dashed
pushed a commit
that referenced
this pull request
Mar 2, 2026
… and docs (openclaw#16761) Add inline file attachment support for sessions_spawn (subagent runtime only): - Schema: attachments[] (name, content, encoding, mimeType) and attachAs.mountPath hint - Materialization: files written to .openclaw/attachments/<uuid>/ with manifest.json - Validation: strict base64 decode, filename checks, size limits, duplicate detection - Transcript redaction: sanitizeToolCallInputs redacts attachment content from persisted transcripts - Lifecycle cleanup: safeRemoveAttachmentsDir with symlink-safe path containment check - Config: tools.sessions_spawn.attachments (enabled, maxFiles, maxFileBytes, maxTotalBytes, retainOnSessionKeep) - Registry: attachmentsDir/attachmentsRootDir/retainAttachmentsOnKeep on SubagentRunRecord - ACP rejection: attachments rejected for runtime=acp with clear error message - Docs: updated tools/index.md, concepts/session-tool.md, configuration-reference.md - Tests: 85 new/updated tests across 5 test files Fixes: - Guard fs.rm in materialization catch block with try/catch (review concern #1) - Remove unreachable fallback in safeRemoveAttachmentsDir (review concern #7) - Move attachment cleanup out of retry path to avoid timing issues with announce loop Co-authored-by: Tyler Yust <TYTYYUST@YAHOO.COM> Co-authored-by: napetrov <napetrov@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Stacked on openclaw#17705 — review/merge that PR first. Once merged, this PR's changes should be re-targeted to
mainon upstream.The gateway's
authorizeGatewayConnectdispatcher treatstrusted-proxyas a single-mode gate: when proxy auth fails (e.g. internal services connecting directly without the reverse proxy), the function early-returns before reaching the shared-secret (token/password) or Tailscale code paths. This breaks all internal consumers — node host, CLI RPC, ACP, TUI, agent tools, etc.This PR adds an inline shared-secret fallback within the trusted-proxy block:
AuthRateLimiterallowTailscaledefault to not excludetrusted-proxymodeChanges
src/gateway/auth.ts: Move rate-limiter/IP resolution before trusted-proxy block; add token and password fallback with rate limiting when proxy auth fails; fixallowTailscaledefault conditionsrc/gateway/auth.test.ts: 9 new unit tests for the fallback path (success, rejection, rate limiting, priority)src/gateway/server.auth.e2e.test.ts: 3 new e2e tests for internal connections with token fallback + device identityConnection flow (after fix)
Related Issues
canSkipDevice/skipPairinggate logicopenclaw node runfails silently with "1008: pairing required" when connecting to a remote gateway openclaw/openclaw#4833 — GatewayClient reconnect behaviorTest Plan
oxlint— 0 errorsoxfmt— cleantsgo— clean