Skip to content

Refactor custom API key authenticator interface #130583

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Refactor custom API key authenticator interface #130583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95df8d6
Refactor custom API key authenticator interface
slobodanadamovic Jul 3, 2025
216a701
[CI] Auto commit changes from spotless
Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...in/java/org/elasticsearch/xpack/core/security/authc/apikey/CustomApiKeyAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import org.elasticsearch.action.ActionListener;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.xpack.core.security.authc.Authentication;
import org.elasticsearch.xpack.core.security.authc.AuthenticationResult;
Expand All @@ -22,7 +23,7 @@
public interface CustomApiKeyAuthenticator {
String name();

AuthenticationToken extractCredentials(@Nullable SecureString apiKeyCredentials);
AuthenticationToken extractCredentials(ThreadContext threadContext, @Nullable SecureString apiKeyCredentials);

void authenticate(@Nullable AuthenticationToken authenticationToken, ActionListener<AuthenticationResult<Authentication>> listener);

Expand All @@ -36,7 +37,7 @@ public String name() {
}

@Override
public AuthenticationToken extractCredentials(@Nullable SecureString apiKeyCredentials) {
public AuthenticationToken extractCredentials(ThreadContext threadContext, @Nullable SecureString apiKeyCredentials) {
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion ...ty/src/main/java/org/elasticsearch/xpack/security/authc/PluggableApiKeyAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public String name() {

@Override
public AuthenticationToken extractCredentials(Context context) {
return authenticator.extractCredentials(context.getApiKeyString());
return authenticator.extractCredentials(context.getThreadContext(), context.getApiKeyString());
}

@Override
Expand Down