Address code review comments

Signed-off-by: Craig Perkins <cwperx@amazon.com>
cwperks · Sep 12, 2024 · c8489fe · c8489fe
1 parent 2a56781
commit c8489fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 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
@@ -16,7 +16,6 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
@@ -48,7 +47,6 @@
 /**
  * Identity implementation with Shiro
  */
-@ExperimentalApi
 public final class ShiroIdentityPlugin extends Plugin implements IdentityPlugin, ActionPlugin {
     private Logger log = LogManager.getLogger(this.getClass());
 
@@ -122,7 +120,7 @@ public AuthcRestHandler(RestHandler original) {
         @Override
         public void handleRequest(RestRequest request, RestChannel channel, NodeClient client) throws Exception {
             try {
-                final AuthToken token = RestTokenExtractor.extractToken(request);
+                final AuthToken token = ShiroTokenExtractor.extractToken(request);
                 // If no token was found, continue executing the request
                 if (token == null) {
                     // Authentication did not fail so return true. Authorization is handled at the action level.

diff --git a/...ch/identity/shiro/RestTokenExtractor.java → ...h/identity/shiro/ShiroTokenExtractor.java b/...ch/identity/shiro/RestTokenExtractor.java → ...h/identity/shiro/ShiroTokenExtractor.java
@@ -20,9 +20,9 @@
 /**
  * Extracts tokens from RestRequests used for authentication
  */
-public class RestTokenExtractor {
+public class ShiroTokenExtractor {
 
-    private static final Logger logger = LogManager.getLogger(RestTokenExtractor.class);
+    private static final Logger logger = LogManager.getLogger(ShiroTokenExtractor.class);
 
     public final static String AUTH_HEADER_NAME = "Authorization";
 

diff --git a/...entity/shiro/RestTokenExtractorTests.java → ...ntity/shiro/ShiroTokenExtractorTests.java b/...entity/shiro/RestTokenExtractorTests.java → ...ntity/shiro/ShiroTokenExtractorTests.java
@@ -22,24 +22,24 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 
-public class RestTokenExtractorTests extends OpenSearchTestCase {
+public class ShiroTokenExtractorTests extends OpenSearchTestCase {
 
     public void testAuthorizationHeaderExtractionWithBasicAuthToken() {
         String basicAuthHeader = Base64.getEncoder().encodeToString("foo:bar".getBytes(StandardCharsets.UTF_8));
         RestRequest fakeRequest = new FakeRestRequest.Builder(xContentRegistry()).withHeaders(
-            Map.of(RestTokenExtractor.AUTH_HEADER_NAME, List.of(BasicAuthToken.TOKEN_IDENTIFIER + " " + basicAuthHeader))
+            Map.of(ShiroTokenExtractor.AUTH_HEADER_NAME, List.of(BasicAuthToken.TOKEN_IDENTIFIER + " " + basicAuthHeader))
         ).build();
-        AuthToken extractedToken = RestTokenExtractor.extractToken(fakeRequest);
+        AuthToken extractedToken = ShiroTokenExtractor.extractToken(fakeRequest);
         assertThat(extractedToken, instanceOf(BasicAuthToken.class));
         assertThat(extractedToken.asAuthHeaderValue(), equalTo(basicAuthHeader));
     }
 
     public void testAuthorizationHeaderExtractionWithUnknownToken() {
         String authHeader = "foo";
         RestRequest fakeRequest = new FakeRestRequest.Builder(xContentRegistry()).withHeaders(
-            Map.of(RestTokenExtractor.AUTH_HEADER_NAME, List.of(authHeader))
+            Map.of(ShiroTokenExtractor.AUTH_HEADER_NAME, List.of(authHeader))
         ).build();
-        AuthToken extractedToken = RestTokenExtractor.extractToken(fakeRequest);
+        AuthToken extractedToken = ShiroTokenExtractor.extractToken(fakeRequest);
         assertNull(extractedToken);
     }
 }