events: Check token and ACLs on request #19138
Merged
Conversation
This file contains 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
This checks the request against the `read` permission for
`sys/events/subscribe/{eventType}` on the initial subscribe.
Future work includes moving this to its own verb (`subscribe`)
and periodically rechecking the request.
Tested locally by minting a token with the wrong permissions
and verifying that they are rejected as expected, and that
they work if the policy is adjusted to `sys/event/subscribe/*`
(or the specific topic name) with `read` permissions.
I had to change the `core.checkToken()` to be publicly accessible,
as it seems like the easiest way to check the token on the
`logical.Request` against all relevant policies, but without
going into all of the complex logic further in `handleLogical()`.
tomhjp
approved these changes
Feb 10, 2023
| @@ -53,7 +63,9 @@ func TestEventsSubscribe(t *testing.T) { | |||
| t.Cleanup(cancelFunc) | |||
|
|
|||
| wsAddr := strings.Replace(addr, "http", "ws", 1) | |||
| conn, _, err := websocket.Dial(ctx, wsAddr+"/v1/sys/events/subscribe/"+eventType+"?json=true", nil) | |||
| conn, _, err := websocket.Dial(ctx, wsAddr+"/v1/sys/events/subscribe/"+eventType+"?json=true", &websocket.DialOptions{ | |||
There was a problem hiding this comment.
Could we also add a Dial just above that doesn't include the token, and check that we get an error + 403 status code?
| respondError(w, http.StatusUnauthorized, fmt.Errorf("permission denied or invalid token")) | ||
| return | ||
| } | ||
| respondError(w, http.StatusInternalServerError, fmt.Errorf("error validating token")) |
There was a problem hiding this comment.
We should probably log the error here?
Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This checks the request against the
readpermission forsys/events/subscribe/{eventType}on the initial subscribe.Future work includes moving this to its own verb (
subscribe) and periodically rechecking the request.Tested locally by minting a token with the wrong permissions and verifying that they are rejected as expected, and that they work if the policy is adjusted to
sys/event/subscribe/*(or the specific topic name) withreadpermissions.I had to change the
core.checkToken()to be publicly accessible, as it seems like the easiest way to check the token on thelogical.Requestagainst all relevant policies, but without going into all of the complex logic further inhandleLogical().