Remove getDB and hasAuthorization #3437
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
dnephin
requested review from
BruceMacD,
jmorganca and
pdevine
as code owners
dnephin
commented
Oct 12, 2022
| if err != nil { | ||
| return nil, HandleAuthErr(err, "organizations", "get", models.InfraSupportAdminRole) | ||
| rCtx := GetRequestContext(c) | ||
| if user := rCtx.Authenticated.User; user != nil && user.OrganizationID == id { |
There was a problem hiding this comment.
I made one small change here from the implementation we had in isOrganizationSelf. It now checks the authorized user.OrganizationID instead of the authenticated organization.ID.
On unauthenticated routes the authenticated organization is still set, so the authenticated user.OrganizationID is a slightly safer pattern. In this case it doesn't really matter because the route required authentication.
BruceMacD
reviewed
Oct 13, 2022
BruceMacD
reviewed
Oct 13, 2022
Call the identity check directly, like we do in other places.
dnephin
force-pushed
the
dnephin/remove-get-db
branch
from
a074227
to
7ce36a5
Compare
BruceMacD
approved these changes
Oct 14, 2022
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.
Summary
Best viewed by individual commit.
getDBwas deprecated a while ago, when we addedRequestContext. We left it for a bit to make sure we had the right interface forRequestContext. It seems to be working well, so now we can remove it.We had 3 different ways to authorize a request (
hasAuthorization,RequireInfraRole, andCanwhich was recently renamed toIsAuthorized). We've been replacing the use ofhasAuthorizationwith a check in the caller to compare the requested ID to the authorized user. This PR replaces the last few callers to use the pattern we have in other place. It also changesisIdentitySelfto accept aRequestContextand remove the error return (since it always returnednil). This reduces the number of ways to authorize a request to 2. We should be able to reduce it to a single function in the future.