Use action group

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Dec 17, 2024 · 4a0a8c3 · 4a0a8c3
1 parent c33d42a
commit 4a0a8c3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/org/opensearch/security/resource/ResourceSharingEntry.java b/src/main/java/org/opensearch/security/resource/ResourceSharingEntry.java
@@ -12,8 +12,7 @@
 package org.opensearch.security.resource;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.opensearch.core.xcontent.ToXContentFragment;
@@ -25,9 +24,9 @@ public class ResourceSharingEntry implements ToXContentFragment {
     private final String resourceIndex;
     private final String resourceId;
     private final ResourceUser resourceUser;
-    private final List<ShareWith> shareWith;
+    private final Map<String, ShareWith> shareWith;
 
-    public ResourceSharingEntry(String resourceIndex, String resourceId, ResourceUser resourceUser, List<ShareWith> shareWith) {
+    public ResourceSharingEntry(String resourceIndex, String resourceId, ResourceUser resourceUser, Map<String, ShareWith> shareWith) {
         this.resourceIndex = resourceIndex;
         this.resourceId = resourceId;
         this.resourceUser = resourceUser;
@@ -39,10 +38,11 @@ public static ResourceSharingEntry fromSource(Map<String, Object> sourceAsMap) {
         String resourceIndex = (String) sourceAsMap.get("resource_index");
         String resourceId = (String) sourceAsMap.get("resource_id");
         ResourceUser resourceUser = ResourceUser.fromSource((Map<String, Object>) sourceAsMap.get("resource_user"));
-        List<Map<String, Object>> sharedWithList = (List<Map<String, Object>>) sourceAsMap.get("share_with");
-        List<ShareWith> sharedWith = new ArrayList<>();
-        for (Map<String, Object> sharedWithMap : sharedWithList) {
-            sharedWith.add(ShareWith.fromSource(sharedWithMap));
+        Map<String, Object> sharedWithMap = (Map<String, Object>) sourceAsMap.get("share_with");
+        Map<String, ShareWith> sharedWith = new HashMap<>();
+        for (Map.Entry<String, Object> entry : sharedWithMap.entrySet()) {
+            ShareWith shareWith = ShareWith.fromSource((Map<String, Object>) entry.getValue());
+            sharedWith.put(entry.getKey(), shareWith);
         }
         return new ResourceSharingEntry(resourceIndex, resourceId, resourceUser, sharedWith);
     }
@@ -51,7 +51,7 @@ public ResourceUser getResourceUser() {
         return resourceUser;
     }
 
-    public List<ShareWith> getShareWith() {
+    public Map<String, ShareWith> getShareWith() {
         return shareWith;
     }
 

diff --git a/src/main/java/org/opensearch/security/resource/ResourceSharingListener.java b/src/main/java/org/opensearch/security/resource/ResourceSharingListener.java
@@ -12,7 +12,7 @@
 package org.opensearch.security.resource;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 import org.apache.logging.log4j.LogManager;
@@ -45,6 +45,8 @@ public class ResourceSharingListener implements IndexingOperationListener {
 
     public static final String RESOURCE_SHARING_INDEX = ".resource-sharing";
 
+    private static final String UNLIMITED = "unlimited";
+
     private boolean initialized;
     private ThreadPool threadPool;
     private Client client;
@@ -115,7 +117,7 @@ private void createResourceSharingIndexIfNotExists(Callable<Boolean> callable) {
     public void indexResourceSharing(String resourceId, String resourceIndex, ResourceUser resourceUser, ShareWith shareWith)
         throws IOException {
         createResourceSharingIndexIfNotExists(() -> {
-            ResourceSharingEntry entry = new ResourceSharingEntry(resourceIndex, resourceId, resourceUser, List.of(shareWith));
+            ResourceSharingEntry entry = new ResourceSharingEntry(resourceIndex, resourceId, resourceUser, Map.of(UNLIMITED, shareWith));
 
             IndexRequest ir = client.prepareIndex(RESOURCE_SHARING_INDEX)
                 .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)

diff --git a/src/main/java/org/opensearch/security/resource/SecurityResourceSharingService.java b/src/main/java/org/opensearch/security/resource/SecurityResourceSharingService.java
@@ -59,7 +59,7 @@ private boolean hasPermissionsFor(User authenticatedUser, ResourceSharingEntry s
             return true;
         }
 
-        for (ShareWith shareWith : sharedWith.getShareWith()) {
+        for (ShareWith shareWith : sharedWith.getShareWith().values()) {
             WildcardMatcher userMatcher = WildcardMatcher.from(shareWith.getUsers());
             if (userMatcher.test(authenticatedUser.getName())) {
                 return true;