Adds auditlog capability and conform to changes in core

Signed-off-by: Darshit Chanpura <[email protected]>
DarshitChanpura · Dec 20, 2024 · a55ac22 · a55ac22
1 parent 428e11e
commit a55ac22
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -726,7 +726,7 @@ public void onIndexModule(IndexModule indexModule) {
 
             if (this.indicesToListen.contains(indexModule.getIndex().getName())) {
                 ResourceSharingIndexListener resourceSharingIndexListener = ResourceSharingIndexListener.getInstance();
-                resourceSharingIndexListener.initialize(threadPool, localClient);
+                resourceSharingIndexListener.initialize(threadPool, localClient, auditLog);
                 indexModule.addIndexOperationListener(resourceSharingIndexListener);
                 log.warn("Security plugin started listening to operations on index {}", indexModule.getIndex().getName());
             }
@@ -1215,7 +1215,12 @@ public Collection<Object> createComponents(
         }
 
         final var resourceSharingIndex = ConfigConstants.OPENSEARCH_RESOURCE_SHARING_INDEX;
-        ResourceSharingIndexHandler rsIndexHandler = new ResourceSharingIndexHandler(resourceSharingIndex, localClient, threadPool);
+        ResourceSharingIndexHandler rsIndexHandler = new ResourceSharingIndexHandler(
+            resourceSharingIndex,
+            localClient,
+            threadPool,
+            auditLog
+        );
         resourceAccessHandler = new ResourceAccessHandler(threadPool, rsIndexHandler, adminDns);
 
         rmr = ResourceSharingIndexManagementRepository.create(rsIndexHandler);
@@ -2150,8 +2155,12 @@ public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings sett
             ConfigConstants.SECURITY_CONFIG_INDEX_NAME,
             ConfigConstants.OPENDISTRO_SECURITY_DEFAULT_CONFIG_INDEX
         );
-        final SystemIndexDescriptor systemIndexDescriptor = new SystemIndexDescriptor(indexPattern, "Security index");
-        return Collections.singletonList(systemIndexDescriptor);
+        final SystemIndexDescriptor securityIndexDescriptor = new SystemIndexDescriptor(indexPattern, "Security index");
+        final SystemIndexDescriptor resourceSharingIndexDescriptor = new SystemIndexDescriptor(
+            ConfigConstants.OPENSEARCH_RESOURCE_SHARING_INDEX,
+            "Resource Sharing index"
+        );
+        return List.of(securityIndexDescriptor, resourceSharingIndexDescriptor);
     }
 
     @Override

diff --git a/src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java b/src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java
@@ -313,7 +313,7 @@ private boolean checkSharing(ResourceSharing document, EntityType entityType, St
             .filter(sharedWithScope -> sharedWithScope.getScope().equals(scope))
             .findFirst()
             .map(sharedWithScope -> {
-                SharedWithScope.SharedWithPerScope scopePermissions = sharedWithScope.getSharedWithPerScope();
+                SharedWithScope.ScopeRecipients scopePermissions = sharedWithScope.getSharedWithPerScope();
 
                 return switch (entityType) {
                     case EntityType.USERS -> scopePermissions.getUsers().contains(identifier);

diff --git a/src/main/java/org/opensearch/security/resources/ResourceSharingIndexHandler.java b/src/main/java/org/opensearch/security/resources/ResourceSharingIndexHandler.java
@@ -66,6 +66,7 @@
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.security.DefaultObjectMapper;
+import org.opensearch.security.auditlog.AuditLog;
 import org.opensearch.threadpool.ThreadPool;
 
 import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
@@ -84,10 +85,13 @@ public class ResourceSharingIndexHandler {
 
     private final ThreadPool threadPool;
 
-    public ResourceSharingIndexHandler(final String indexName, final Client client, ThreadPool threadPool) {
+    private final AuditLog auditLog;
+
+    public ResourceSharingIndexHandler(final String indexName, final Client client, final ThreadPool threadPool, final AuditLog auditLog) {
         this.resourceSharingIndex = indexName;
         this.client = client;
         this.threadPool = threadPool;
+        this.auditLog = auditLog;
     }
 
     public final static Map<String, Object> INDEX_SETTINGS = Map.of("index.number_of_shards", 1, "index.auto_expand_replicas", "0-all");

diff --git a/src/main/java/org/opensearch/security/resources/ResourceSharingIndexListener.java b/src/main/java/org/opensearch/security/resources/ResourceSharingIndexListener.java
@@ -19,6 +19,7 @@
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.index.engine.Engine;
 import org.opensearch.index.shard.IndexingOperationListener;
+import org.opensearch.security.auditlog.AuditLog;
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.security.user.User;
 import org.opensearch.threadpool.ThreadPool;
@@ -53,7 +54,7 @@ public static ResourceSharingIndexListener getInstance() {
      * @param threadPool The ThreadPool instance to be used for executing operations.
      * @param client     The Client instance to be used for interacting with OpenSearch.
      */
-    public void initialize(ThreadPool threadPool, Client client) {
+    public void initialize(ThreadPool threadPool, Client client, AuditLog auditLog) {
 
         if (initialized) {
             return;
@@ -64,7 +65,8 @@ public void initialize(ThreadPool threadPool, Client client) {
         this.resourceSharingIndexHandler = new ResourceSharingIndexHandler(
             ConfigConstants.OPENSEARCH_RESOURCE_SHARING_INDEX,
             client,
-            threadPool
+            threadPool,
+            auditLog
         );
 
     }