Feature/prevent create api with cloud api key #129966
Open
+22
−0
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
…ud-api-key-authentication
…ud-api-key-authentication # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java
…authentication # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java
…ate-api-with-cloud-api-key # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java # x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java # x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
elasticsearchmachine
added
needs:triage
| if (authentication.isCloudApiKey()) { | ||
| listener.onFailure(new IllegalArgumentException("creating elasticsearch api keys using cloud api keys is not supported")); | ||
| return; | ||
| } |
There was a problem hiding this comment.
I'd suggest to add this check in ApiKeyService#createApiKey method.
Reason is to cover all possible cases, including creating cross-cluster API keys and granting API keys.
There was a problem hiding this comment.
Also, let's add a unit test for this change in ApiKeyServiceTests.
…ate-api-with-cloud-api-key
…cloud-api-key' into feature/prevent-create-api-with-cloud-api-key
|
Pinging @elastic/es-security (Team:Security) |
elasticsearchmachine
removed
the
needs:triage
ankit--sethi
added
>non-issue
needs:triage
Comment on lines
+2568
to
+2577
| assertEquals(true, future.isDone()); | ||
| assertThrows(ExecutionException.class, future::get); | ||
| try { | ||
| future.get(); | ||
| } catch (ExecutionException ex) { | ||
| assertEquals( | ||
| "java.lang.IllegalArgumentException: creating elasticsearch api keys using cloud api keys is not supported", | ||
| ex.getMessage() | ||
| ); | ||
| } |
There was a problem hiding this comment.
optional: The ESTestCase has the expectThrows method that accepts an ActionFuture and which can make this check a bit simpler:
Suggested change
| assertEquals(true, future.isDone()); | |
| assertThrows(ExecutionException.class, future::get); | |
| try { | |
| future.get(); | |
| } catch (ExecutionException ex) { | |
| assertEquals( | |
| "java.lang.IllegalArgumentException: creating elasticsearch api keys using cloud api keys is not supported", | |
| ex.getMessage() | |
| ); | |
| } | |
| final IllegalArgumentException iae = expectThrows(IllegalArgumentException.class, future); | |
| assertThat(iae.getMessage(), equalTo("creating elasticsearch api keys using cloud api keys is not supported")); |
slobodanadamovic
approved these changes
Jun 26, 2025
| @@ -2557,6 +2558,25 @@ public void testCreationWillFailIfHashingThreadPoolIsSaturated() { | |||
| assertThat(e, is(rejectedExecutionException)); | |||
| } | |||
|
|
|||
| @Test | |||
There was a problem hiding this comment.
Oh, I just saw this. The @Test annotation is forbidden. You'll have to remove it.
Forbidden annotation use: org.junit.Test [defaultMessage Just name your test method testFooBar]
Suggested change
| @Test |
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.
Not supporting this at this time per TDD