From f4b40fddf12f8c8bd08e74249b36b259d13a6dad Mon Sep 17 00:00:00 2001 From: Karthik Yagna Date: Mon, 25 Mar 2024 00:51:33 -0700 Subject: [PATCH] Pass ChannelHandlerContext to doAuth call --- .../com/netflix/zuul/netty/server/push/PushAuthHandler.java | 4 ++-- .../netflix/zuul/netty/server/push/PushAuthHandlerTest.java | 2 +- .../com/netflix/zuul/sample/push/SamplePushAuthHandler.java | 2 +- 3 files changed, 4 insertions(+), 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 index 9f7592ded6..bf8f8bd526 100644 --- 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 index f3302f1f63..0f8ea5ff4d 100644 --- 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 index 125dadd380..57345e2fba 100644 --- 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")) {