Consolidate user role resolution for API keys #88542
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
n1v0lg
added
>refactoring
:Security/Security
n1v0lg
changed the title
ApiKeyGenerator to handle API key updates
n1v0lg
commented
Jul 14, 2022
|
|
||
| import java.util.Set; | ||
|
|
||
| public class ApiKeyUserRoleDescriptorResolver { |
There was a problem hiding this comment.
I can also add a test for ApiKeyUpdateHandler however it's very simple and already exercised by our integration tests.
|
Pinging @elastic/es-security (Team:Security) |
ywangd
reviewed
Jul 18, 2022
There was a problem hiding this comment.
The essence of ApiKeyGenerator is really just about resolving the owner user's role descriptors. Once this part is refactored out to its own class, there is no good reason to still keep this class around. I'd suggest we simply remove it and let the handler classes (TransportCreateApiKeyAction and TransportGrantApiKeyAction etc) to be the true handlers. It will be a bit bigger change. But that's OK for a refactoring PR.
n1v0lg
changed the title
ywangd
approved these changes
Jul 20, 2022
...src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportGrantApiKeyAction.java
Show resolved
Hide resolved
...src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/ApiKeyBaseRestHandler.java
Outdated
Show resolved
Hide resolved
...va/org/elasticsearch/xpack/security/authc/support/ApiKeyUserRoleDescriptorResolverTests.java
Outdated
Show resolved
Hide resolved
...est/java/org/elasticsearch/xpack/security/rest/action/apikey/ApiKeyBaseRestHandlerTests.java
Outdated
Show resolved
Hide resolved
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 refactor extracts the user role resolution logic for API keys from
ApiKeyGenerator. It plugs the shared resolver class into API keycreation and update handling. It also removes
ApiKeyGeneratorsincethe class is now trivial. A new REST base handler for API key-related
REST actions ensures that the API key service is enabled before we
perform role resolution, which was the only other responsibility left
to
ApiKeyGenerator.Relates:
https://github.com/elastic/elasticsearch/pull/88186/files#r910515818