Merge branch 'feature/session-tokens' of github.com:ankit--sethi/elasticsearch into feature/session-tokens

Author: ankit--sethi

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java

@@ -1387,10 +1387,7 @@ public static Authentication newCloudAccessTokenAuthentication(
     ) {
         assert authResult.isAuthenticated() : "cloud access token authn result must be successful";
         final User user = authResult.getValue();
-        return new Authentication(
-            new Subject(user, realmRef, TransportVersion.current(), authResult.getMetadata()),
-            TOKEN
-        );
+        return new Authentication(new Subject(user, realmRef, TransportVersion.current(), authResult.getMetadata()), TOKEN);
     }
 
     public static Authentication newCloudApiKeyAuthentication(AuthenticationResult<User> authResult, String nodeName) {

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/PluggableAuthenticatorChain.java

@@ -57,7 +57,8 @@ public void authenticate(Context context, ActionListener<AuthenticationResult<Au
         }
         AuthenticationToken token = context.getMostRecentAuthenticationToken();
         if (token != null) {
-            var lis = new IteratingActionListener<>(listener,
+            var lis = new IteratingActionListener<>(
+                listener,
                 getAuthConsumer(context),
                 customAuthenticators,
                 context.getThreadContext(),
@@ -68,7 +69,8 @@ public void authenticate(Context context, ActionListener<AuthenticationResult<Au
                     }
                     return result;
                 },
-                result -> result == null || result.getStatus() == AuthenticationResult.Status.CONTINUE);
+                result -> result == null || result.getStatus() == AuthenticationResult.Status.CONTINUE
+            );
             lis.run();
             return;
         }
@@ -93,8 +95,7 @@ private BiConsumer<CustomAuthenticator, ActionListener<AuthenticationResult<Auth
                         iteratingListener.onResponse(AuthenticationResult.notHandled());
                     }
                 }, ex -> iteratingListener.onFailure(context.getRequest().exceptionProcessingRequest(ex, token))));
-            }
-            else {
+            } else {
                 iteratingListener.onResponse(null); // try the next custom authenticator
             }
         };

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/PluggableAuthenticatorChainTests.java

@@ -164,8 +164,7 @@ public Authentication getAuthentication(AuthenticationResult<User> result, Strin
 
     @Before
     public void init() {
-        final Settings settings = Settings.builder()
-            .build();
+        final Settings settings = Settings.builder().build();
         threadContext = new ThreadContext(settings);
     }
 
@@ -253,8 +252,9 @@ public void onFailure(Exception e) {
 
     public void testAuthenticateWhenTokenSupportedByBothAuthenticatorsInChain() throws Exception {
 
-        PluggableAuthenticatorChain chain = new PluggableAuthenticatorChain(List.of(new TokenAAuthenticator("foo"),
-            new TokenAAuthenticator("bar")));
+        PluggableAuthenticatorChain chain = new PluggableAuthenticatorChain(
+            List.of(new TokenAAuthenticator("foo"), new TokenAAuthenticator("bar"))
+        );
         TestTokenA testToken = new TestTokenA("test-value");
 
         Authenticator.Context context = createContext();
@@ -290,13 +290,14 @@ public void onFailure(Exception e) {
         assertThat(result.isAuthenticated(), equalTo(true));
 
         Authentication auth = result.getValue();
-        assertThat(auth.getEffectiveSubject().getUser().principal(), equalTo("token-a-auth-user-foo-test-value")); //id of first
+        assertThat(auth.getEffectiveSubject().getUser().principal(), equalTo("token-a-auth-user-foo-test-value")); // id of first
     }
 
     public void testAuthenticateWhenTokenSupportedByNoAuthenticatorsInChain() throws Exception {
 
-        PluggableAuthenticatorChain chain = new PluggableAuthenticatorChain(List.of(new TokenAAuthenticator("foo"),
-            new TokenAAuthenticator("bar")));
+        PluggableAuthenticatorChain chain = new PluggableAuthenticatorChain(
+            List.of(new TokenAAuthenticator("foo"), new TokenAAuthenticator("bar"))
+        );
         AuthenticationToken unknownToken = new AuthenticationToken() {
             @Override
             public String principal() {
@@ -347,15 +348,7 @@ public void onFailure(Exception e) {
         assertThat(result.getStatus(), equalTo(AuthenticationResult.Status.CONTINUE));
     }
 
-
-
     private Authenticator.Context createContext() {
-        return new Authenticator.Context(
-            threadContext,
-            null,
-            null,
-            true,
-            null
-        );
+        return new Authenticator.Context(threadContext, null, null, true, null);
     }
 }