-
Notifications
You must be signed in to change notification settings - Fork 46
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
Refactored permissions for roles and API keys #97
Merged
billkalter
merged 2 commits into
bazaarvoice:master
from
billkalter:emo-6251-add-role-permissions
Mar 14, 2017
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 |
---|---|---|
|
@@ -353,8 +353,18 @@ private void migrateApiKey(Subject subject, ImmutableMultimap<String, String> pa | |
} | ||
|
||
private void deleteApiKey(Subject subject, ImmutableMultimap<String, String> parameters, PrintWriter output) { | ||
// Does the caller have permission to delete API keys? | ||
subject.checkPermission(Permissions.deleteApiKey()); | ||
|
||
String key = getValueFromParams("key", parameters); | ||
ApiKey apiKey = _authIdentityManager.getIdentity(key); | ||
checkArgument(apiKey != null, "Unknown API key"); | ||
|
||
// Does the caller have permission to revoke every role from the API key? | ||
for (String role : apiKey.getRoles()) { | ||
subject.checkPermission(Permissions.grantRole(RoleIdentifier.fromString(role))); | ||
} | ||
|
||
_authIdentityManager.deleteIdentity(key); | ||
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. @billkalter Looks good. 👍 |
||
output.println("API key deleted"); | ||
} | ||
|
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.
I know that the user will not provide the roles when deleting the api-key, so no roles in the parameters input, but do you think we need to pull up all the roles of the api-key and do a subject.checkPermission(Permissions.grantRole(RoleIdentifier.fromString(role)));
for each role before deleting the api-key:?
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.
That's a great question. My reasoning is this:
It's possible that an API key can exist which has delete-api-key permission but not grant-role permission for all roles on an API key. However, I don't see a use case for this since, unlike API key creation, deletion in practice is tightly controlled and limited only to Emo administrators. It seems like a bad practice to delegate this particular permission to non-trusted administrators.
TL;DR: I have no objection to adding this check, it just seemed redundant since any user with delete permission would be an administrator.