Only set X-Opaque-Id if present

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Oct 6, 2023 · 4abc12e · 4abc12e
1 parent 782d27f
commit 4abc12e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/opensearch/security/filter/SecurityRestFilter.java b/src/main/java/org/opensearch/security/filter/SecurityRestFilter.java
@@ -143,13 +143,15 @@ public RestHandler wrap(RestHandler original, AdminDNs adminDNs) {
                 // X_OPAQUE_ID will be overritten on restore - save to apply after restoring the saved context
                 final String xOpaqueId = threadContext.getHeader(Task.X_OPAQUE_ID);
                 storedContext.restore();
-                threadContext.putHeader(Task.X_OPAQUE_ID, xOpaqueId);
+                if (xOpaqueId != null) {
+                    threadContext.putHeader(Task.X_OPAQUE_ID, xOpaqueId);
+                }
             });
 
             final SecurityRequestChannel requestChannel = SecurityRequestFactory.from(request, channel);
 
             // Authenticate request
-            if(!NettyAttribute.popFrom(request, IS_AUTHENTICATED).orElse(false)) {
+            if (!NettyAttribute.popFrom(request, IS_AUTHENTICATED).orElse(false)) {
                 // we aren't authenticated so we should skip this step
                 checkAndAuthenticateRequest(requestChannel);
             }

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
@@ -88,9 +88,7 @@ public void channelRead0(ChannelHandlerContext ctx, DefaultHttpRequest msg) thro
 
         // TODO: GET PROPER MAVEN BUILD
         // final Netty4HttpChannel httpChannel = ctx.channel().attr(Netty4HttpServerTransport.HTTP_CHANNEL_KEY).get();
-        final Netty4HttpChannel httpChannel = ctx.channel()
-            .attr(AttributeKey.<Netty4HttpChannel>valueOf("opensearch-http-channel"))
-            .get();
+        final Netty4HttpChannel httpChannel = ctx.channel().attr(AttributeKey.<Netty4HttpChannel>valueOf("opensearch-http-channel")).get();
         Matcher matcher = PATTERN_PATH_PREFIX.matcher(msg.uri());
         final String suffix = matcher.matches() ? matcher.group(2) : null;
         if (API_AUTHTOKEN_SUFFIX.equals(suffix)) {