Make authenticator name more concise

Signed-off-by: Peter Nied <petern@amazon.com>
opensearch-project · Jun 13, 2023 · 8c8bb88 · 8c8bb88
1 parent 5582c5c
commit 8c8bb88
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -141,7 +141,7 @@
 import org.opensearch.security.dlic.rest.validation.PasswordValidator;
 import org.opensearch.security.filter.SecurityFilter;
 import org.opensearch.security.filter.SecurityRestFilter;
-import org.opensearch.security.http.HTTPOnBehalfOfJwtAuthenticator;
+import org.opensearch.security.http.OnBehalfOfAuthenticator;
 import org.opensearch.security.http.SecurityHttpServerTransport;
 import org.opensearch.security.http.SecurityNonSslHttpServerTransport;
 import org.opensearch.security.http.XFFResolver;
@@ -838,8 +838,8 @@ public Collection<Object> createComponents(Client localClient, ClusterService cl
 
         securityRestHandler = new SecurityRestFilter(backendRegistry, auditLog, threadPool,
                 principalExtractor, settings, configPath, compatConfig);
-
-        HTTPOnBehalfOfJwtAuthenticator acInstance = new HTTPOnBehalfOfJwtAuthenticator();
+                
+        final OnBehalfOfAuthenticator onBehalfOfAuthenticator = new OnBehalfOfAuthenticator();
 
         final DynamicConfigFactory dcf = new DynamicConfigFactory(cr, settings, configPath, localClient, threadPool, cih);
         dcf.registerDCFListener(backendRegistry);
@@ -848,7 +848,7 @@ public Collection<Object> createComponents(Client localClient, ClusterService cl
         dcf.registerDCFListener(xffResolver);
         dcf.registerDCFListener(evaluator);
         dcf.registerDCFListener(securityRestHandler);
-        dcf.registerDCFListener(acInstance);
+        dcf.registerDCFListener(onBehalfOfAuthenticator);
         if (!(auditLog instanceof NullAuditLog)) {
             // Don't register if advanced modules is disabled in which case auditlog is instance of NullAuditLog
             dcf.registerDCFListener(auditLog);

diff --git a/.../http/HTTPOnBehalfOfJwtAuthenticator.java → ...ecurity/http/OnBehalfOfAuthenticator.java b/.../http/HTTPOnBehalfOfJwtAuthenticator.java → ...ecurity/http/OnBehalfOfAuthenticator.java
@@ -44,7 +44,7 @@
 import org.opensearch.security.securityconf.DynamicConfigModel;
 import org.opensearch.security.user.AuthCredentials;
 
-public class HTTPOnBehalfOfJwtAuthenticator implements HTTPAuthenticator {
+public class OnBehalfOfAuthenticator implements HTTPAuthenticator {
 
     protected final Logger log = LogManager.getLogger(this.getClass());
 
@@ -58,13 +58,13 @@ public class HTTPOnBehalfOfJwtAuthenticator implements HTTPAuthenticator {
     private String signingKey;
     private String encryptionKey;
 
-    public HTTPOnBehalfOfJwtAuthenticator() {
+    public OnBehalfOfAuthenticator() {
         super();
         init();
     }
 
     // FOR TESTING
-    public HTTPOnBehalfOfJwtAuthenticator(String signingKey, String encryptionKey){
+    public OnBehalfOfAuthenticator(String signingKey, String encryptionKey){
         this.signingKey = signingKey;
         this.encryptionKey = encryptionKey;
         init();

diff --git a/...p/HTTPOnBehalfOfJwtAuthenticatorTest.java → ...ity/http/OnBehalfOfAuthenticatorTest.java b/...p/HTTPOnBehalfOfJwtAuthenticatorTest.java → ...ity/http/OnBehalfOfAuthenticatorTest.java
@@ -37,7 +37,7 @@
 import org.opensearch.security.user.AuthCredentials;
 import org.opensearch.security.util.FakeRestRequest;
 
-public class HTTPOnBehalfOfJwtAuthenticatorTest {
+public class OnBehalfOfAuthenticatorTest {
     final static byte[] secretKeyBytes = new byte[1024];
     final static String claimsEncryptionKey = RandomStringUtils.randomAlphanumeric(16);
     final static SecretKey secretKey;
@@ -91,10 +91,7 @@ public void testBadKey() throws Exception {
     @Test
     public void testTokenMissing() throws Exception {
 
-        HTTPOnBehalfOfJwtAuthenticator jwtAuth = new HTTPOnBehalfOfJwtAuthenticator(
-            BaseEncoding.base64().encode(secretKeyBytes),
-            claimsEncryptionKey
-        );
+        OnBehalfOfAuthenticator jwtAuth = new OnBehalfOfAuthenticator(BaseEncoding.base64().encode(secretKeyBytes),claimsEncryptionKey);
         Map<String, String> headers = new HashMap<String, String>();
 
         AuthCredentials credentials = jwtAuth.extractCredentials(new FakeRestRequest(headers, new HashMap<String, String>()), null);
@@ -107,10 +104,7 @@ public void testInvalid() throws Exception {
 
         String jwsToken = "123invalidtoken..";
 
-        HTTPOnBehalfOfJwtAuthenticator jwtAuth = new HTTPOnBehalfOfJwtAuthenticator(
-            BaseEncoding.base64().encode(secretKeyBytes),
-            claimsEncryptionKey
-        );
+        OnBehalfOfAuthenticator jwtAuth = new OnBehalfOfAuthenticator(BaseEncoding.base64().encode(secretKeyBytes), claimsEncryptionKey);
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Authorization", "Bearer " + jwsToken);
 
@@ -127,10 +121,7 @@ public void testBearer() throws Exception {
             .signWith(secretKey, SignatureAlgorithm.HS512)
             .compact();
 
-        HTTPOnBehalfOfJwtAuthenticator jwtAuth = new HTTPOnBehalfOfJwtAuthenticator(
-            BaseEncoding.base64().encode(secretKeyBytes),
-            claimsEncryptionKey
-        );
+        OnBehalfOfAuthenticator jwtAuth = new OnBehalfOfAuthenticator(BaseEncoding.base64().encode(secretKeyBytes), claimsEncryptionKey);
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Authorization", "Bearer " + jwsToken);
 
@@ -295,7 +286,7 @@ private AuthCredentials extractCredentialsFromJwtHeader(
         final Boolean bwcPluginCompatibilityMode
     ) {
         final String jwsToken = jwtBuilder.signWith(secretKey, SignatureAlgorithm.HS512).compact();
-        final HTTPOnBehalfOfJwtAuthenticator jwtAuth = new HTTPOnBehalfOfJwtAuthenticator(signingKey, encryptionKey);
+        final OnBehalfOfAuthenticator jwtAuth = new OnBehalfOfAuthenticator(signingKey, encryptionKey);
         final Map<String, String> headers = Map.of("Authorization", "Bearer " + jwsToken);
         return jwtAuth.extractCredentials(new FakeRestRequest(headers, new HashMap<>()), null);
     }