From 0f0478dcff2c900223cf2e7610fa4545ae739b23 Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Tue, 22 Aug 2023 10:14:55 -0700 Subject: [PATCH] Rename the KeyUtils Signed-off-by: Ryan Liang --- .../com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java | 4 ++-- .../org/opensearch/security/http/OnBehalfOfAuthenticator.java | 4 ++-- .../opensearch/security/util/{keyUtils.java => KeyUtils.java} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/org/opensearch/security/util/{keyUtils.java => KeyUtils.java} (99%) diff --git a/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java b/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java index 060c7a2dbe..079904c0be 100644 --- a/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java +++ b/src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java @@ -35,7 +35,7 @@ import org.opensearch.core.rest.RestStatus; import org.opensearch.security.auth.HTTPAuthenticator; import org.opensearch.security.user.AuthCredentials; -import org.opensearch.security.util.keyUtils; +import org.opensearch.security.util.KeyUtils; public class HTTPJwtAuthenticator implements HTTPAuthenticator { @@ -57,7 +57,7 @@ public HTTPJwtAuthenticator(final Settings settings, final Path configPath) { super(); String signingKey = settings.get("signing_key"); - JwtParser _jwtParser = keyUtils.createJwtParserFromSigningKey(signingKey, log); + JwtParser _jwtParser = KeyUtils.createJwtParserFromSigningKey(signingKey, log); jwtUrlParameter = settings.get("jwt_url_parameter"); jwtHeaderName = settings.get("jwt_header", HttpHeaders.AUTHORIZATION); diff --git a/src/main/java/org/opensearch/security/http/OnBehalfOfAuthenticator.java b/src/main/java/org/opensearch/security/http/OnBehalfOfAuthenticator.java index 9deb262bec..3c9d40054a 100644 --- a/src/main/java/org/opensearch/security/http/OnBehalfOfAuthenticator.java +++ b/src/main/java/org/opensearch/security/http/OnBehalfOfAuthenticator.java @@ -38,7 +38,7 @@ import org.opensearch.security.authtoken.jwt.EncryptionDecryptionUtil; import org.opensearch.security.ssl.util.ExceptionUtils; import org.opensearch.security.user.AuthCredentials; -import org.opensearch.security.util.keyUtils; +import org.opensearch.security.util.KeyUtils; import static org.opensearch.security.OpenSearchSecurityPlugin.LEGACY_OPENDISTRO_PREFIX; import static org.opensearch.security.OpenSearchSecurityPlugin.PLUGINS_PREFIX; @@ -69,7 +69,7 @@ public OnBehalfOfAuthenticator(Settings settings, String clusterName) { } private JwtParser initParser(final String signingKey) { - JwtParser _jwtParser = keyUtils.createJwtParserFromSigningKey(signingKey, log); + JwtParser _jwtParser = KeyUtils.createJwtParserFromSigningKey(signingKey, log); if (_jwtParser == null) { throw new RuntimeException("Unable to find on behalf of authenticator signing key"); diff --git a/src/main/java/org/opensearch/security/util/keyUtils.java b/src/main/java/org/opensearch/security/util/KeyUtils.java similarity index 99% rename from src/main/java/org/opensearch/security/util/keyUtils.java rename to src/main/java/org/opensearch/security/util/KeyUtils.java index 3b7ebd1c7d..c948855476 100644 --- a/src/main/java/org/opensearch/security/util/keyUtils.java +++ b/src/main/java/org/opensearch/security/util/KeyUtils.java @@ -27,7 +27,7 @@ import java.util.Base64; import java.util.Objects; -public class keyUtils { +public class KeyUtils { public static JwtParser createJwtParserFromSigningKey(final String signingKey, final Logger log) { final SecurityManager sm = System.getSecurityManager();