Use handlingSettings

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Oct 2, 2023 · e46adaa · e46adaa
1 parent b06242b
commit e46adaa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/org/opensearch/security/http/SecurityNonSslHttpServerTransport.java b/src/main/java/org/opensearch/security/http/SecurityNonSslHttpServerTransport.java
@@ -92,6 +92,6 @@ protected void initChannel(Channel ch) throws Exception {
 
     @Override
     protected ChannelInboundHandlerAdapter createHeaderVerifier() {
-        return new Netty4HttpRequestHeaderVerifier(restFilter, xContentRegistry, threadPool);
+        return new Netty4HttpRequestHeaderVerifier(restFilter, xContentRegistry, threadPool, handlingSettings);
     }
 }
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
@@ -17,6 +17,7 @@
 import org.opensearch.http.AbstractHttpServerTransport;
 
 import io.netty.channel.ChannelHandlerContext;
+import org.opensearch.http.HttpHandlingSettings;
 import org.opensearch.http.netty4.Netty4DefaultHttpRequest;
 import org.opensearch.http.netty4.Netty4HttpChannel;
 import org.opensearch.http.netty4.Netty4HttpServerTransport;
@@ -33,11 +34,18 @@ public class Netty4HttpRequestHeaderVerifier extends SimpleChannelInboundHandler
     private final SecurityRestFilter restFilter;
     private final ThreadPool threadPool;
     private final NamedXContentRegistry xContentRegistry;
+    private final HttpHandlingSettings handlingSettings;
 
-    public Netty4HttpRequestHeaderVerifier(SecurityRestFilter restFilter, NamedXContentRegistry xContentRegistry, ThreadPool threadPool) {
+    public Netty4HttpRequestHeaderVerifier(
+        SecurityRestFilter restFilter,
+        NamedXContentRegistry xContentRegistry,
+        ThreadPool threadPool,
+        HttpHandlingSettings handlingSettings
+    ) {
         this.restFilter = restFilter;
         this.xContentRegistry = xContentRegistry;
         this.threadPool = threadPool;
+        this.handlingSettings = handlingSettings;
     }
 
     @Override
@@ -54,7 +62,10 @@ public void channelRead0(ChannelHandlerContext ctx, DefaultHttpRequest msg) thro
         final Netty4DefaultHttpRequest httpRequest = new Netty4DefaultHttpRequest(msg);
         RestRequest restRequest = AbstractHttpServerTransport.createRestRequest(xContentRegistry, httpRequest, httpChannel);
 
-        InterceptingRestChannel interceptingRestChannel = new InterceptingRestChannel(restRequest, false);
+        InterceptingRestChannel interceptingRestChannel = new InterceptingRestChannel(
+            restRequest,
+            handlingSettings.getDetailedErrorsEnabled()
+        );
         ThreadContext threadContext = threadPool.getThreadContext();
         try (ThreadContext.StoredContext ignore = threadPool.getThreadContext().stashContext()) {
             boolean isUnauthenticated = restFilter.checkAndAuthenticateRequest(restRequest, interceptingRestChannel, threadContext);

diff --git a/...main/java/org/opensearch/security/ssl/http/netty/SecuritySSLNettyHttpServerTransport.java b/...main/java/org/opensearch/security/ssl/http/netty/SecuritySSLNettyHttpServerTransport.java
@@ -157,6 +157,6 @@ protected void configurePipeline(Channel ch) {
 
     @Override
     protected ChannelInboundHandlerAdapter createHeaderVerifier() {
-        return new Netty4HttpRequestHeaderVerifier(restFilter, xContentRegistry, threadPool);
+        return new Netty4HttpRequestHeaderVerifier(restFilter, xContentRegistry, threadPool, handlingSettings);
     }
 }