Simplify PR, make NoopPluginSubject and introduce IdentityAwarePlugin

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Aug 16, 2024 · 16f4251 · 16f4251
1 parent 8f38206
commit 16f4251
Show file tree

Hide file tree

Showing 20 changed files with 179 additions and 477 deletions.
diff --git a/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroIdentityPlugin.java b/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroIdentityPlugin.java
@@ -14,9 +14,14 @@
 import org.apache.shiro.mgt.SecurityManager;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.identity.Subject;
+import org.opensearch.identity.noop.NoopPluginSubject;
 import org.opensearch.identity.tokens.TokenManager;
+import org.opensearch.plugins.IdentityAwarePlugin;
 import org.opensearch.plugins.IdentityPlugin;
 import org.opensearch.plugins.Plugin;
+import org.opensearch.threadpool.ThreadPool;
+
+import java.util.List;
 
 /**
  * Identity implementation with Shiro
@@ -61,4 +66,14 @@ public Subject getSubject() {
     public TokenManager getTokenManager() {
         return this.authTokenHandler;
     }
+
+    @Override
+    public void initializeIdentityAwarePlugins(List<IdentityAwarePlugin> identityAwarePlugins, ThreadPool threadPool) {
+        if (identityAwarePlugins != null) {
+            for (IdentityAwarePlugin plugin : identityAwarePlugins) {
+                Subject subject = new NoopPluginSubject(threadPool);
+                plugin.initializePlugin(subject);
+            }
+        }
+    }
 }
diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/ExecutionContextPluginGetIT.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/ExecutionContextPluginGetIT.java
diff --git a/.../src/test/java/org/opensearch/http/executioncontextplugin/TestExecutionContextPlugin.java b/.../src/test/java/org/opensearch/http/executioncontextplugin/TestExecutionContextPlugin.java
diff --git a/...c/test/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextAction.java b/...c/test/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextAction.java
diff --git a/.../test/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextRequest.java b/.../test/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextRequest.java
diff --git a/...test/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextResponse.java b/...test/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextResponse.java
diff --git a/...st/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextRestAction.java b/...st/java/org/opensearch/http/executioncontextplugin/TestGetExecutionContextRestAction.java
diff --git a/...va/org/opensearch/http/executioncontextplugin/TestGetExecutionContextTransportAction.java b/...va/org/opensearch/http/executioncontextplugin/TestGetExecutionContextTransportAction.java