Pass ChannelHandlerContext to doAuth call (#1756)

Netflix · Sep 9, 2024 · b4fc2cc · b4fc2cc
1 parent 66e6cb9
commit b4fc2cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushAuthHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushAuthHandler.java
@@ -87,7 +87,7 @@ protected final void channelRead0(ChannelHandlerContext ctx, FullHttpRequest req
                 // client auth will happen later, continue with WebSocket upgrade handshake
                 ctx.fireChannelRead(req.retain());
             } else {
-                final PushUserAuth authEvent = doAuth(req);
+                final PushUserAuth authEvent = doAuth(req, ctx);
                 if (authEvent.isSuccess()) {
                     ctx.fireChannelRead(req.retain()); // continue with WebSocket upgrade handshake
                     ctx.fireUserEventTriggered(authEvent);
@@ -125,5 +125,5 @@ protected final Cookies parseCookies(FullHttpRequest req) {
      */
     protected abstract boolean isDelayedAuth(FullHttpRequest req, ChannelHandlerContext ctx);
 
-    protected abstract PushUserAuth doAuth(FullHttpRequest req);
+    protected abstract PushUserAuth doAuth(FullHttpRequest req, ChannelHandlerContext ctx);
 }
diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushAuthHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushAuthHandlerTest.java
@@ -58,7 +58,7 @@ protected boolean isDelayedAuth(FullHttpRequest req, ChannelHandlerContext ctx)
         }
 
         @Override
-        protected PushUserAuth doAuth(FullHttpRequest req) {
+        protected PushUserAuth doAuth(FullHttpRequest req, ChannelHandlerContext ctx) {
             return null;
         }
     }

diff --git a/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushAuthHandler.java b/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushAuthHandler.java
@@ -49,7 +49,7 @@ protected boolean isDelayedAuth(FullHttpRequest req, ChannelHandlerContext ctx)
     }
 
     @Override
-    protected PushUserAuth doAuth(FullHttpRequest req) {
+    protected PushUserAuth doAuth(FullHttpRequest req, ChannelHandlerContext ctx) {
         final Cookies cookies = parseCookies(req);
         for (final Cookie c : cookies.getAll()) {
             if (c.name().equals("userAuthCookie")) {