Apache Solr open-source search software
SOLR-16720: Defer PKI header creation to send-time (#1495)
Jason Gerlowski4c3e70affbb8
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex afca3478b4c..4cfdb71d640 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -101,6 +101,9 @@ Bug Fixes* SOLR-16730: Fix NPE in SystemInfoHandler for inter-node requests that would cause the Nodes page not to load.SystemInfoHandler no longer populates the username, roles and permissions in inter-node requests. (Tomás Fernández Löbbe)+* SOLR-16720: PKI headers are now populated closer to when inter-node requests are actually sent,+ making TTL expiry less likely. (Jason Gerlowski, Alex Deparvu)+Dependency Upgrades---------------------* PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.javaindex 6a005559f9b..82a77934dcc 100644--- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java+++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java@@ -368,9 +368,20 @@ public class PKIAuthenticationPlugin extends AuthenticationPluginpublic void setup(Http2SolrClient client) {final HttpListenerFactory.RequestResponseListener listener =new HttpListenerFactory.RequestResponseListener() {+ private static final String CACHED_REQUEST_USER_KEY = "cachedRequestUser";+@Overridepublic void onQueued(Request request) {- log.trace("onQueued: {}", request);+ // The onBegin hook below (potentially) runs in a separate Jetty thread than was+ // used to submit the request. While we're still in the submitting thread, fetch+ // the user information from the SolrRequestInfo thread local and cache it on the+ // Request so it can be accessed accurately in onBegin+ cachePreFetchedUserOnJettyRequest(request);+ }++ @Override+ public void onBegin(Request request) {+ log.trace("onBegin: {}", request);if (cores.getAuthenticationPlugin() == null) {log.trace("no authentication plugin, skipping");return;@@ -379,10 +390,12 @@ public class PKIAuthenticationPlugin extends AuthenticationPluginif (log.isDebugEnabled()) {log.debug("{} secures this internode request", this.getClass().getSimpleName());}++ final Optional<String> preFetchedUser = getUserFromJettyRequest(request);if ("v1".equals(System.getProperty(SEND_VERSION))) {- generateToken().ifPresent(s -> request.header(HEADER, s));+ generateToken(preFetchedUser).ifPresent(s -> request.header(HEADER, s));} else {- generateTokenV2().ifPresent(s -> request.header(HEADER_V2, s));+ generateTokenV2(preFetchedUser).ifPresent(s -> request.header(HEADER_V2, s));}} else {if (log.isDebugEnabled()) {@@ -392,6 +405,15 @@ public class PKIAuthenticationPlugin extends AuthenticationPlugin}}}++ private void cachePreFetchedUserOnJettyRequest(Request request) {+ request.attribute(CACHED_REQUEST_USER_KEY, getUser());+ }++ private Optional<String> getUserFromJettyRequest(Request request) {+ return Optional.ofNullable(+ (String) request.getAttributes().get(CACHED_REQUEST_USER_KEY));+ }};client.addListenerFactory(() -> listener);}@@ -458,8 +480,8 @@ public class PKIAuthenticationPlugin extends AuthenticationPlugin}@SuppressForbidden(reason = "Needs currentTimeMillis to set current time in header")- private Optional<String> generateToken() {- String usr = getUser();+ private Optional<String> generateToken(Optional<String> preFetchedUser) {+ String usr = preFetchedUser.orElse(getUser());if (usr == null) {return Optional.empty();}@@ -472,8 +494,9 @@ public class PKIAuthenticationPlugin extends AuthenticationPluginreturn Optional.of(myNodeName + " " + base64Cipher);}- private Optional<String> generateTokenV2() {- String user = getUser();+ private Optional<String> generateTokenV2(Optional<String> preFetchedUser) {++ String user = preFetchedUser.orElse(getUser());if (user == null) {return Optional.empty();}@@ -488,9 +511,9 @@ public class PKIAuthenticationPlugin extends AuthenticationPluginvoid setHeader(HttpRequest httpRequest) {if ("v1".equals(System.getProperty(SEND_VERSION))) {- generateToken().ifPresent(s -> httpRequest.setHeader(HEADER, s));+ generateToken(Optional.empty()).ifPresent(s -> httpRequest.setHeader(HEADER, s));} else {- generateTokenV2().ifPresent(s -> httpRequest.setHeader(HEADER_V2, s));+ generateTokenV2(Optional.empty()).ifPresent(s -> httpRequest.setHeader(HEADER_V2, s));}}