fix: allow dynamic parameters without requiring org membership #18531
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
johnstcn
changed the title
Prebuilds user was failing to fetch this way
Emyrk
force-pushed
the
stevenmasley/fix_owner_fetch
branch
from
153faf8 to
fb9664e
Compare
Emyrk
commented
Jun 24, 2025
Comment on lines
+246
to
+269
| user, err := r.db.GetUserByID(ctx, ownerID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // If the user failed to read, we also try to read the user from their | ||
| // organization member. You only need to be able to read the organization member | ||
| // to get the owner data. | ||
| // | ||
| // Only the terraform files can therefore leak more information than the | ||
| // caller should have access to. All this info should be public assuming you can | ||
| // read the user though. | ||
| mem, err := database.ExpectOne(r.db.OrganizationMembers(ctx, database.OrganizationMembersParams{ | ||
| OrganizationID: r.data.templateVersion.OrganizationID, | ||
| UserID: ownerID, | ||
| IncludeSystem: true, | ||
| })) | ||
| if err != nil { | ||
| return xerrors.Errorf("fetch user: %w", err) | ||
| } | ||
|
|
||
| // User data is required for the form. Org member is checked above | ||
| // nolint:gocritic | ||
| user, err := r.db.GetUserByID(dbauthz.AsProvisionerd(ctx), mem.OrganizationMember.UserID) | ||
| if err != nil { | ||
| return xerrors.Errorf("fetch user: %w", err) | ||
| // Org member fetched, so use the provisioner context to fetch the user. | ||
| //nolint:gocritic // Has the correct permissions, and matches the provisioning flow. | ||
| user, err = r.db.GetUserByID(dbauthz.AsProvisionerd(ctx), mem.OrganizationMember.UserID) | ||
| if err != nil { | ||
| return xerrors.Errorf("fetch user: %w", err) | ||
| } |
There was a problem hiding this comment.
If the Renderer had the authz object, we could fetch the user with elevated perms, then check the user's perms. Removing 1 sql query round trip 😢
johnstcn
approved these changes
Jun 24, 2025
|
Follow up issue made: #18536 |
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.
Test failure on
main