diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/apikey/CustomApiKeyAuthenticator.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/apikey/CustomApiKeyAuthenticator.java index 4f5d05e720715..46f40b64b3492 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/apikey/CustomApiKeyAuthenticator.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/apikey/CustomApiKeyAuthenticator.java @@ -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; @@ -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> listener); @@ -36,7 +37,7 @@ public String name() { } @Override - public AuthenticationToken extractCredentials(@Nullable SecureString apiKeyCredentials) { + public AuthenticationToken extractCredentials(ThreadContext threadContext, @Nullable SecureString apiKeyCredentials) { return null; } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/PluggableApiKeyAuthenticator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/PluggableApiKeyAuthenticator.java index 0637efbc5e89a..84b238ba7985f 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/PluggableApiKeyAuthenticator.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/PluggableApiKeyAuthenticator.java @@ -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