chore: ensure proper rbac permissions on 'Acquire' file in the cache #18348
Conversation
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
Acquire file in cache
aslilac
reviewed
Jun 13, 2025
coderd/files/cache.go
Outdated
| "github.com/coder/coder/v2/coderd/util/lazy" | ||
| ) | ||
|
|
||
| type AuthorizeFile func(ctx context.Context, subject rbac.Subject, action policy.Action, object rbac.Object) error |
There was a problem hiding this comment.
nothing about this is "file" specific. it takes an rbac.Object. is this not a type def somewhere already? could we move this to a move general place with a more general name?
There was a problem hiding this comment.
True. Actually, I can just pass in an rbac.Authorizer. Not just the function.
There was a problem hiding this comment.
Ahh I did it because it's an import loop
imports github.com/coder/coder/v2/coderd/coderdtest from cache_internal_test.go
imports github.com/coder/coder/v2/coderd from authorize.go
I fixed it because it was in a internal test, but I had to export the cacheEntryValue.
If we do our solution discussed in slack, this will be cleaned up.
coderd/files/cache.go
Outdated
| @@ -101,6 +111,7 @@ type Cache struct { | |||
| lock sync.Mutex | |||
| data map[uuid.UUID]*cacheEntry | |||
| fetcher | |||
| authz AuthorizeFile | |||
There was a problem hiding this comment.
Suggested change
| authz AuthorizeFile | |
| authorize AuthorizeFile |
There was a problem hiding this comment.
It is now
authz rbac.Authorizer
coderd/files/cache.go
Outdated
| return nil, dbauthz.ErrNoActor | ||
| } | ||
| // Always check the caller can actually read the file. | ||
| if err := c.authz(ctx, subject, policy.ActionRead, it.object); err != nil { |
There was a problem hiding this comment.
Suggested change
| if err := c.authz(ctx, subject, policy.ActionRead, it.object); err != nil { | |
| if err := c.authorize(ctx, subject, policy.ActionRead, it.object); err != nil { |
This reverts commit 2015837.
aslilac
approved these changes
Jun 13, 2025
Co-authored-by: ケイラ <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The file cache was caching the
Unauthorizederrors if a user without the right perms opened the file first. So all future opens would fail.Now the cache always opens with a subject that can read files. And authz is checked on the Acquire per user.