Rebase

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

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
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
@@ -130,10 +130,10 @@ private AuthCredentials extractCredentials0(final SecurityRequest request) {
         }
 
         if ((jwtToken == null || jwtToken.isEmpty()) && jwtUrlParameter != null) {
-            jwtToken = request.param(jwtUrlParameter);
+            jwtToken = request.params().get(jwtUrlParameter);
         } else {
             // just consume to avoid "contains unrecognized parameter"
-            request.param(jwtUrlParameter);
+            request.params().get(jwtUrlParameter);
         }
 
         if (jwtToken == null || jwtToken.length() == 0) {

diff --git a/src/main/java/org/opensearch/security/filter/NettyRequest.java b/src/main/java/org/opensearch/security/filter/NettyRequest.java
@@ -98,13 +98,6 @@ public Set<String> getUnconsumedParams() {
         return parameters.get().accessedKeys();
     }
 
-    @Override
-    public String param(String key) {
-        Map<String, String> urlParams = params();
-        consumedParams.add(key);
-        return urlParams != null ? params().get(key) : null;
-    }
-
     public Set<String> getConsumedParams() {
         return consumedParams;
     }

diff --git a/src/main/java/org/opensearch/security/filter/SecurityRestFilter.java b/src/main/java/org/opensearch/security/filter/SecurityRestFilter.java
@@ -69,7 +69,6 @@
 
 import static org.opensearch.security.OpenSearchSecurityPlugin.LEGACY_OPENDISTRO_PREFIX;
 import static org.opensearch.security.OpenSearchSecurityPlugin.PLUGINS_PREFIX;
-import static org.opensearch.security.http.SecurityHttpServerTransport.CONSUMED_PARAMS;
 import static org.opensearch.security.http.SecurityHttpServerTransport.CONTEXT_TO_RESTORE;
 import static org.opensearch.security.http.SecurityHttpServerTransport.EARLY_RESPONSE;
 import static org.opensearch.security.http.SecurityHttpServerTransport.IS_AUTHENTICATED;
@@ -155,10 +154,6 @@ public void handleRequest(RestRequest request, RestChannel channel, NodeClient c
 
             final SecurityRequestChannel requestChannel = SecurityRequestFactory.from(request, channel);
 
-            for (String paramToConsume : registry.getUrlParamsToConsume()) {
-                requestChannel.param(paramToConsume);
-            }
-
             // Authenticate request
             if (!NettyAttribute.popFrom(request, IS_AUTHENTICATED).orElse(false)) {
                 // we aren't authenticated so we should skip this step

diff --git a/src/main/java/org/opensearch/security/ssl/http/netty/Netty4HttpRequestHeaderVerifier.java b/src/main/java/org/opensearch/security/ssl/http/netty/Netty4HttpRequestHeaderVerifier.java
@@ -14,7 +14,6 @@
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.http.netty4.Netty4HttpChannel;
 import org.opensearch.http.netty4.Netty4HttpServerTransport;
-import org.opensearch.security.filter.NettyRequest;
 import org.opensearch.security.filter.SecurityRequestChannel;
 import org.opensearch.security.filter.SecurityRequestChannelUnsupported;
 import org.opensearch.security.filter.SecurityRequestFactory;
@@ -33,7 +32,6 @@
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.util.ReferenceCountUtil;
 
-import static org.opensearch.security.http.SecurityHttpServerTransport.CONSUMED_PARAMS;
 import static org.opensearch.security.http.SecurityHttpServerTransport.CONTEXT_TO_RESTORE;
 import static org.opensearch.security.http.SecurityHttpServerTransport.EARLY_RESPONSE;
 import static org.opensearch.security.http.SecurityHttpServerTransport.IS_AUTHENTICATED;