-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
fix(supervisor): authorize the dequeue route and reject absent tokens in enforce mode #4898
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.
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
Closed
AUTHENSOR
wants to merge
1
commit into
triggerdotdev:main
from
AUTHENSOR:redthread/fix-workload-server-authz
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -197,7 +197,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> { | |
| * Verify the deployment token from the workload deployment-id header and return the verified | ||
| * environment_id to forward upstream. The env id is only forwarded in enforce mode: in log mode | ||
| * we still verify + record metrics but attach no header (so the platform never scopes). Only | ||
| * enforce fails a request, and only for a present-but-invalid token; absent and legacy ids pass. | ||
| * enforce fails a request, and only for an absent or invalid token; legacy bare ids pass. | ||
| * | ||
| * `claims` are returned on any valid token, for local use only - never to scope the platform, | ||
| * which is why environmentId stays gated on enforce. | ||
|
|
@@ -213,7 +213,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> { | |
|
|
||
| const result = await verifyDeploymentIdHeader(this.deploymentIdFromRequest(req), "http"); | ||
|
|
||
| if (result.outcome === "jwt_invalid" && workloadTokenEnforced) { | ||
| if (workloadTokenEnforced && (result.outcome === "jwt_invalid" || result.outcome === "token_absent")) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| return { ok: false }; | ||
| } | ||
|
|
||
|
|
@@ -735,6 +735,11 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> { | |
| "GET", | ||
| async () => { | ||
| const { req, reply, params } = ctx; | ||
| const auth = await this.authorizeWorkloadRequest(req); | ||
| if (!auth.ok) { | ||
| reply.empty(401); | ||
| return; | ||
| } | ||
| const dequeueResponse = await this.workerClient.dequeueFromVersion( | ||
| params.deploymentId, | ||
| 1, | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔍 Enforce-mode test contradicts new behavior
The existing enforce-mode test expects an absent token to return 200.
authorizeWorkloadRequestnow returns 401, so the test fails.Was this helpful? React with 👍 or 👎 to provide feedback.