From bde44b64f78176af6eecb788c86fab0f884731a8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Oct 2024 23:00:33 +0200 Subject: [PATCH] Use HttpRequest in PrincipalService PrincipalService requires access to headers, nothing else. Make sure it does not carry the baggage of FullHttpRequest. JIRA: NETCONF-1379 Change-Id: Icae70e153118dc661fc7a50352a6503337ac7ba2 Signed-off-by: Robert Varga --- .../restconf/server/AAAShiroPrincipalService.java | 3 +-- .../org/opendaylight/restconf/server/PrincipalService.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/AAAShiroPrincipalService.java b/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/AAAShiroPrincipalService.java index 1469d19955..d833ed7745 100644 --- a/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/AAAShiroPrincipalService.java +++ b/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/AAAShiroPrincipalService.java @@ -9,7 +9,6 @@ package org.opendaylight.restconf.server; import static java.util.Objects.requireNonNull; -import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpRequest; import java.security.Principal; import java.util.Map; @@ -57,7 +56,7 @@ public final class AAAShiroPrincipalService implements PrincipalService { } @Override - public @Nullable Principal acquirePrincipal(final FullHttpRequest request) { + public @Nullable Principal acquirePrincipal(final HttpRequest request) { final var uuidStr = request.headers().get(PRINCIPAL_UUID_HEADER); UUID uuid = null; try { diff --git a/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/PrincipalService.java b/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/PrincipalService.java index 2b84a4b37b..fa4ff7ce15 100644 --- a/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/PrincipalService.java +++ b/protocol/restconf-server/src/main/java/org/opendaylight/restconf/server/PrincipalService.java @@ -7,7 +7,7 @@ */ package org.opendaylight.restconf.server; -import io.netty.handler.codec.http.FullHttpRequest; +import io.netty.handler.codec.http.HttpRequest; import java.security.Principal; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; @@ -15,5 +15,5 @@ import org.opendaylight.netconf.transport.http.AuthHandlerFactory; public interface PrincipalService extends AuthHandlerFactory { - @Nullable Principal acquirePrincipal(@NonNull FullHttpRequest request); + @Nullable Principal acquirePrincipal(@NonNull HttpRequest request); } -- 2.36.6