Remove unneeded code

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Feb 22, 2024 · 1939a03 · 1939a03
1 parent c4e49b2
commit 1939a03
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 27 deletions.
diff --git a/src/main/java/org/opensearch/security/auth/BackendRegistry.java b/src/main/java/org/opensearch/security/auth/BackendRegistry.java
@@ -66,7 +66,6 @@
 import org.opensearch.security.user.User;
 import org.opensearch.threadpool.ThreadPool;
 
-import com.amazon.dlic.auth.http.jwt.HTTPJwtAuthenticator;
 import org.greenrobot.eventbus.Subscribe;
 
 import static org.apache.http.HttpStatus.SC_FORBIDDEN;
@@ -78,7 +77,6 @@ public class BackendRegistry {
     protected final Logger log = LogManager.getLogger(this.getClass());
     private SortedSet<AuthDomain> restAuthDomains;
     private Set<AuthorizationBackend> restAuthorizers;
-    private Set<String> urlParamsToConsume = new HashSet<>();
     private List<AuthFailureListener> ipAuthFailureListeners;
     private Multimap<String, AuthFailureListener> authBackendFailureListeners;
     private List<ClientBlockRegistry<InetAddress>> ipClientBlockRegistries;
@@ -157,10 +155,6 @@ public BackendRegistry(
         createCaches();
     }
 
-    public Set<String> getUrlParamsToConsume() {
-        return urlParamsToConsume;
-    }
-
     public boolean isInitialized() {
         return initialized;
     }
@@ -187,15 +181,6 @@ public void onDynamicConfigModelChanged(DynamicConfigModel dcm) {
         authBackendClientBlockRegistries = dcm.getAuthBackendClientBlockRegistries();
 
         SortedSet<AuthDomain> authDomains = Collections.unmodifiableSortedSet(dcm.getRestAuthDomains());
-        urlParamsToConsume.clear();
-        for (AuthDomain authDomain : authDomains) {
-            if ("jwt".equals(authDomain.getHttpAuthenticator().getType())) {
-                HTTPJwtAuthenticator jwtAuthenticator = (HTTPJwtAuthenticator) authDomain.getHttpAuthenticator();
-                if (jwtAuthenticator.getJwtUrlParameter() != null) {
-                    urlParamsToConsume.add(jwtAuthenticator.getJwtUrlParameter());
-                }
-            }
-        }
 
         // OpenSearch Security no default authc
         initialized = !restAuthDomains.isEmpty() || anonymousAuthEnabled || injectedUserEnabled;

diff --git a/src/main/java/org/opensearch/security/filter/NettyRequest.java b/src/main/java/org/opensearch/security/filter/NettyRequest.java
@@ -41,8 +41,6 @@ public class NettyRequest implements SecurityRequest {
     protected final Netty4HttpChannel underlyingChannel;
     protected final Supplier<CheckedAccessMap> parameters = Suppliers.memoize(() -> new CheckedAccessMap(params(uri())));
 
-    private final Set<String> consumedParams = new HashSet<>();
-
     NettyRequest(final HttpRequest request, final Netty4HttpChannel channel) {
         this.underlyingRequest = request;
         this.underlyingChannel = channel;
@@ -98,10 +96,6 @@ public Set<String> getUnconsumedParams() {
         return parameters.get().accessedKeys();
     }
 
-    public Set<String> getConsumedParams() {
-        return consumedParams;
-    }
-
     private static Map<String, String> params(String uri) {
         // Sourced from
         // https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/http/AbstractHttpServerTransport.java#L419-L422

diff --git a/src/main/java/org/opensearch/security/support/ConfigConstants.java b/src/main/java/org/opensearch/security/support/ConfigConstants.java
@@ -170,8 +170,6 @@ public class ConfigConstants {
     public static final boolean OPENDISTRO_SECURITY_AUDIT_SSL_VERIFY_HOSTNAMES_DEFAULT = true;
     public static final boolean OPENDISTRO_SECURITY_AUDIT_SSL_ENABLE_SSL_CLIENT_AUTH_DEFAULT = false;
     public static final String OPENDISTRO_SECURITY_AUDIT_EXCLUDE_SENSITIVE_HEADERS = "opendistro_security.audit.exclude_sensitive_headers";
-    public static final String OPENDISTRO_SECURITY_AUDIT_EXCLUDE_SENSITIVE_URL_PARAMETERS =
-        "opendistro_security.audit.exclude_sensitive_url_params";
 
     public static final String SECURITY_AUDIT_CONFIG_DEFAULT_PREFIX = "plugins.security.audit.config.";
 

diff --git a/src/test/java/org/opensearch/security/auditlog/config/AuditConfigSerializeTest.java b/src/test/java/org/opensearch/security/auditlog/config/AuditConfigSerializeTest.java
@@ -70,7 +70,6 @@ public void testDefaultSerialize() throws IOException {
             .field("log_request_body", true)
             .field("resolve_indices", true)
             .field("exclude_sensitive_headers", true)
-            .field("exclude_sensitive_url_params", true)
             .field("ignore_users", Collections.singletonList("kibanaserver"))
             .field("ignore_requests", Collections.emptyList())
             .field("ignore_headers", Collections.emptyList())
@@ -135,7 +134,6 @@ public void testDeserialize() throws IOException {
             .field("log_request_body", true)
             .field("resolve_indices", true)
             .field("exclude_sensitive_headers", true)
-            .field("exclude_sensitive_url_params", true)
             .field("ignore_users", Collections.singletonList("test-user-1"))
             .field("ignore_requests", Collections.singletonList("test-request"))
             .field("ignore_headers", Collections.singletonList("test-headers"))
@@ -235,7 +233,6 @@ public void testSerialize() throws IOException {
             .field("log_request_body", true)
             .field("resolve_indices", true)
             .field("exclude_sensitive_headers", true)
-            .field("exclude_sensitive_url_params", true)
             .field("ignore_users", ImmutableList.of("ignore-user-1", "ignore-user-2"))
             .field("ignore_requests", Collections.singletonList("ignore-request-1"))
             .field("ignore_headers", Collections.singletonList("test-header"))
@@ -280,7 +277,6 @@ public void testNullSerialize() throws IOException {
             .field("log_request_body", true)
             .field("resolve_indices", true)
             .field("exclude_sensitive_headers", true)
-            .field("exclude_sensitive_url_params", true)
             .field("ignore_users", ImmutableList.of("kibanaserver"))
             .field("ignore_requests", Collections.emptyList())
             .field("ignore_headers", Collections.emptyList())