tweak

jakelandis · Sep 8, 2023 · 22341aa · 22341aa
1 parent 50fc99f
commit 22341aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...core/src/main/java/org/elasticsearch/xpack/core/security/support/CacheIteratorHelper.java b/...core/src/main/java/org/elasticsearch/xpack/core/security/support/CacheIteratorHelper.java
@@ -40,7 +40,7 @@ public CacheIteratorHelper(Cache<K, V> cache) {
         iteratorLock = new ReleasableLock(lock.writeLock());
     }
 
-    public ReleasableLock acquireForUpdate() {
+    public ReleasableLock acquireUpdateLock() {
         return updateLock.acquire();
     }
 

diff --git a/...ck/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/jwt/JwtRealm.java b/...ck/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/jwt/JwtRealm.java
@@ -404,7 +404,7 @@ void processValidatedJwt(
                     () -> format("Realm [%s] roles resolved [%s] for principal=[%s].", name(), join(",", user.roles()), principal)
                 );
                 if (isCacheEnabled()) {
-                    try (ReleasableLock ignored = jwtCacheHelper.acquireForUpdate()) {
+                    try (ReleasableLock ignored = jwtCacheHelper.acquireUpdateLock()) {
                         final long expWallClockMillis = claimsSet.getExpirationTime().getTime() + allowedClockSkew.getMillis();
                         jwtCache.put(jwtCacheKey, new ExpiringUser(result.getValue(), new Date(expWallClockMillis)));
                     }

diff --git a/...urity/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java b/...urity/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java
@@ -327,7 +327,7 @@ private void buildThenMaybeCacheRole(
             restrictedIndices,
             listener.delegateFailureAndWrap((delegate, role) -> {
                 if (role != null && tryCache) {
-                    try (ReleasableLock ignored = roleCacheHelper.acquireForUpdate()) {
+                    try (ReleasableLock ignored = roleCacheHelper.acquireUpdateLock()) {
                         /* this is kinda spooky. We use a read/write lock to ensure we don't modify the cache if we hold
                          * the write lock (fetching stats for instance - which is kinda overkill?) but since we fetching
                          * stuff in an async fashion we need to make sure that if the cache got invalidated since we
@@ -546,7 +546,7 @@ public static void buildRoleFromDescriptors(
     public void invalidateAll() {
         numInvalidation.incrementAndGet();
         negativeLookupCache.invalidateAll();
-        try (ReleasableLock ignored = roleCacheHelper.acquireForUpdate()) {
+        try (ReleasableLock ignored = roleCacheHelper.acquireUpdateLock()) {
             roleCache.invalidateAll();
         }
         dlsBitsetCache.clear("role store invalidation");