moar fixes

Author: original-brownbear

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

@@ -131,12 +131,12 @@ private void authenticateWithCache(UsernamePasswordToken token, ActionListener<A
             });
             if (authenticationInCache.get()) {
                 // there is a cached or an inflight authenticate request
-                listenableCacheEntry.addListener(ActionListener.wrap(cachedResult -> {
+                listenableCacheEntry.addListener(listener.delegateFailureAndWrap((delegate, cachedResult) -> {
                     final boolean credsMatch = cachedResult.verify(token.credentials());
                     if (cachedResult.authenticationResult.isAuthenticated()) {
                         if (credsMatch) {
                             // cached credential hash matches the credential hash for this forestalled request
-                            handleCachedAuthentication(cachedResult.user, ActionListener.wrap(authResult -> {
+                            handleCachedAuthentication(cachedResult.user, delegate.delegateFailureAndWrap((delegate2, authResult) -> {
                                 if (authResult.isAuthenticated()) {
                                     logger.debug(
                                         "realm [{}] authenticated user [{}], with roles [{}] (cached)",
@@ -152,8 +152,8 @@ private void authenticateWithCache(UsernamePasswordToken token, ActionListener<A
                                         authResult.getMessage()
                                     );
                                 }
-                                listener.onResponse(authResult);
-                            }, listener::onFailure));
+                                delegate2.onResponse(authResult);
+                            }));
                         } else {
                             logger.trace(
                                 "realm [{}], provided credentials for user [{}] do not match (known good) cached credentials,"
@@ -166,7 +166,7 @@ private void authenticateWithCache(UsernamePasswordToken token, ActionListener<A
                             // clear cache and try to reach the authentication source again because password
                             // might have changed there and the local cached hash got stale
                             cache.invalidate(token.principal(), listenableCacheEntry);
-                            authenticateWithCache(token, listener);
+                            authenticateWithCache(token, delegate);
                         }
                     } else if (credsMatch) {
                         // not authenticated but instead of hammering reuse the result. a new
@@ -178,7 +178,7 @@ private void authenticateWithCache(UsernamePasswordToken token, ActionListener<A
                             cachedResult.authenticationResult.getStatus(),
                             cachedResult.authenticationResult.getMessage()
                         );
-                        listener.onResponse(cachedResult.authenticationResult);
+                        delegate.onResponse(cachedResult.authenticationResult);
                     } else {
                         logger.trace(
                             "realm [{}], provided credentials for user [{}] do not match (possibly invalid) cached credentials,"
@@ -187,9 +187,9 @@ private void authenticateWithCache(UsernamePasswordToken token, ActionListener<A
                             token.principal()
                         );
                         cache.invalidate(token.principal(), listenableCacheEntry);
-                        authenticateWithCache(token, listener);
+                        authenticateWithCache(token, delegate);
                     }
-                }, listener::onFailure), threadPool.executor(ThreadPool.Names.GENERIC), threadPool.getThreadContext());
+                }), threadPool.executor(ThreadPool.Names.GENERIC), threadPool.getThreadContext());
             } else {
                 logger.trace(
                     "realm [{}] does not have a cached result for user [{}]; attempting fresh authentication",

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java

@@ -828,24 +828,24 @@ private void authorizeBulkItems(
                             AuditLevel.ACCESS_DENIED,
                             authentication,
                             action,
-                            resolvedIndicesSet.toArray(new String[0]),
+                            resolvedIndicesSet.toArray(Strings.EMPTY_ARRAY),
                             BulkItemRequest.class.getSimpleName(),
                             request.remoteAddress(),
                             authzInfo
                         )
                     );
-                    actionToGrantedIndicesMap.forEach((action, resolvedIndicesSet) -> {
-                        auditTrail.explicitIndexAccessEvent(
+                    actionToGrantedIndicesMap.forEach(
+                        (action, resolvedIndicesSet) -> auditTrail.explicitIndexAccessEvent(
                             requestId,
                             AuditLevel.ACCESS_GRANTED,
                             authentication,
                             action,
-                            resolvedIndicesSet.toArray(new String[0]),
+                            resolvedIndicesSet.toArray(Strings.EMPTY_ARRAY),
                             BulkItemRequest.class.getSimpleName(),
                             request.remoteAddress(),
                             authzInfo
-                        );
-                    });
+                        )
+                    );
                     delegate2.onResponse(null);
                 }
             );