Additional trace logging for Native Role Mappings

Adds trace logging in a couple of places in `NativeRoleMappingStore` to assist in debugging the sequence of changes from role mapping update (e.g. via `ReservedRoleMappingAction`) and the resolution of user access
tvernum · Sep 29, 2023 · 2ae5bf5 · 2ae5bf5
1 parent ae17505
commit 2ae5bf5
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/...in/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java b/...in/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java
@@ -134,21 +134,17 @@ protected void loadMappings(ActionListener<List<ExpressionRoleMapping>> listener
             ScrollHelper.fetchAllByEntity(
                 client,
                 request,
-                new ContextPreservingActionListener<>(
-                    supplier,
-                    ActionListener.wrap(
-                        (Collection<ExpressionRoleMapping> mappings) -> listener.onResponse(
-                            mappings.stream().filter(Objects::nonNull).toList()
-                        ),
-                        ex -> {
-                            logger.error(
-                                () -> format("failed to load role mappings from index [%s] skipping all mappings.", SECURITY_MAIN_ALIAS),
-                                ex
-                            );
-                            listener.onResponse(Collections.emptyList());
-                        }
-                    )
-                ),
+                new ContextPreservingActionListener<>(supplier, ActionListener.wrap((Collection<ExpressionRoleMapping> mappings) -> {
+                    final List<ExpressionRoleMapping> mappingList = mappings.stream().filter(Objects::nonNull).toList();
+                    logger.debug("successfully loaded [{}] role-mapping(s) from [{}]", mappingList.size(), securityIndex.aliasName());
+                    listener.onResponse(mappingList);
+                }, ex -> {
+                    logger.error(
+                        () -> format("failed to load role mappings from index [%s] skipping all mappings.", SECURITY_MAIN_ALIAS),
+                        ex
+                    );
+                    listener.onResponse(Collections.emptyList());
+                })),
                 doc -> buildMapping(getNameFromId(doc.getId()), doc.getSourceRef())
             );
         }
@@ -200,6 +196,7 @@ private <Request, Result> void modifyMapping(
             );
         } else {
             try {
+                logger.trace("Modifying role mapping [{}] for [{}]", name, request.getClass().getSimpleName());
                 inner.accept(request, ActionListener.wrap(r -> refreshRealms(listener, r), listener::onFailure));
             } catch (Exception e) {
                 logger.error(() -> "failed to modify role-mapping [" + name + "]", e);