Use Cookie Encoder/Decoder API (#618)

* Use Cookie Encoder/Decoder API * servlet 4.5.0 * Fix RequestFilterTest * Fix Cors TCK test * Replace wildcard import --------- Co-authored-by: Tim Yates <tim.yates@gmail.com>
micronaut-projects · Jan 24, 2024 · 05dc4b0 · 05dc4b0
1 parent 7f82a6d
commit 05dc4b0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 44 deletions.
diff --git a/azure-function-http/build.gradle.kts b/azure-function-http/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     api(mn.micronaut.http.server)
     api(projects.micronautAzureFunction)
     api(mnServlet.micronaut.servlet.core)
-    implementation(mn.micronaut.http.netty)
     implementation(mn.micronaut.router)
     implementation(libs.jakarta.inject.api)
     compileOnly(libs.managed.azure.functions.java.library)

diff --git a/azure-function-http/src/main/java/io/micronaut/azure/function/http/AzureCookies.java b/azure-function-http/src/main/java/io/micronaut/azure/function/http/AzureCookies.java
@@ -21,13 +21,13 @@
 import io.micronaut.http.HttpHeaders;
 import io.micronaut.http.cookie.Cookie;
 import io.micronaut.http.cookie.Cookies;
-import io.micronaut.http.netty.cookies.NettyCookie;
-import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
+import io.micronaut.http.cookie.ServerCookieDecoder;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -51,18 +51,11 @@ public AzureCookies(String path, HttpHeaders headers, ConversionService conversi
         this.conversionService = conversionService;
         String value = headers.get(HttpHeaders.COOKIE);
         if (value != null) {
-            cookies = new LinkedHashMap<>(10);
-            Set<io.netty.handler.codec.http.cookie.Cookie> nettyCookies = ServerCookieDecoder.STRICT.decode(value);
-            for (io.netty.handler.codec.http.cookie.Cookie nettyCookie : nettyCookies) {
-                String cookiePath = nettyCookie.path();
-                if (cookiePath != null) {
-                    if (path.startsWith(cookiePath)) {
-                        cookies.put(nettyCookie.name(), new NettyCookie(nettyCookie));
-                    }
-                } else {
-                    cookies.put(nettyCookie.name(), new NettyCookie(nettyCookie));
-                }
-            }
+            List<Cookie> cookieList = ServerCookieDecoder.INSTANCE.decode(value);
+            cookies = new LinkedHashMap<>(cookieList.size());
+            cookieList.stream()
+                    .filter(c -> c.getPath() == null || path.startsWith(c.getPath()))
+                    .forEach(c -> cookies.put(c.getName(), c));
         } else {
             cookies = Collections.emptyMap();
         }

diff --git a/...nction-http/src/main/java/io/micronaut/azure/function/http/AzureFunctionHttpResponse.java b/...nction-http/src/main/java/io/micronaut/azure/function/http/AzureFunctionHttpResponse.java
@@ -29,9 +29,8 @@
 import io.micronaut.http.MutableHttpHeaders;
 import io.micronaut.http.MutableHttpResponse;
 import io.micronaut.http.cookie.Cookie;
-import io.micronaut.http.netty.cookies.NettyCookie;
+import io.micronaut.http.cookie.ServerCookieEncoder;
 import io.micronaut.servlet.http.ServletHttpResponse;
-import io.netty.handler.codec.http.cookie.ServerCookieEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,10 +83,7 @@ public BufferedWriter getWriter() {
 
     @Override
     public MutableHttpResponse<B> cookie(Cookie cookie) {
-        if (cookie instanceof NettyCookie nettyCookie) {
-            final String encoded = ServerCookieEncoder.STRICT.encode(nettyCookie.getNettyCookie());
-            header(HttpHeaders.SET_COOKIE, encoded);
-        }
+        ServerCookieEncoder.INSTANCE.encode(cookie).forEach(c -> header(HttpHeaders.SET_COOKIE, c));
         return this;
     }
 
@@ -160,12 +156,10 @@ public HttpResponseMessage getNativeResponse() {
                 responseBuilder.header(s, string);
             }
         });
-        if (bodyObject != null) {
-            if (binaryTypeConfiguration.isMediaTypeBinary(getHeaders().getContentType().orElse(null))) {
-                responseBuilder.body(body.toByteArray());
-            } else {
-                responseBuilder.body(body.toString(getCharacterEncoding()));
-            }
+        if (binaryTypeConfiguration.isMediaTypeBinary(getHeaders().getContentType().orElse(null))) {
+            responseBuilder.body(body.toByteArray());
+        } else {
+            responseBuilder.body(body.toString(getCharacterEncoding()));
         }
         return responseBuilder.build();
     }

diff --git a/azure-function-http/src/main/java/io/micronaut/azure/function/http/HttpHandler.java b/azure-function-http/src/main/java/io/micronaut/azure/function/http/HttpHandler.java
@@ -20,8 +20,6 @@
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.servlet.http.ServletExchange;
-import io.netty.util.internal.MacAddressUtil;
-import io.netty.util.internal.PlatformDependent;
 
 import java.util.Optional;
 
@@ -35,18 +33,7 @@
 class HttpHandler extends HttpRequestMessageHandler {
 
     public HttpHandler(ApplicationContext applicationContext) {
-        super(init(applicationContext));
-    }
-
-    private static ApplicationContext init(ApplicationContext applicationContext) {
-        setIoNettyMachineIdSystemProperty();
-        return applicationContext;
-    }
-
-    private static void setIoNettyMachineIdSystemProperty() {
-        byte[] bestMacAddr = new byte[8];
-        PlatformDependent.threadLocalRandom().nextBytes(bestMacAddr);
-        System.setProperty("io.netty.machineId", MacAddressUtil.formatAddress(bestMacAddr));
+        super(applicationContext);
     }
 
     @Override

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,11 +10,11 @@ system-lambda = "1.2.1"
 testcontainers = "1.19.3"
 
 # Micronaut
-micronaut = "4.2.3"
+micronaut = "4.3.0"
 micronaut-logging = "1.1.2"
 micronaut-reactor = "3.2.1"
 micronaut-serde = "2.7.1"
-micronaut-servlet = "4.4.0"
+micronaut-servlet = "4.5.0"
 micronaut-test = "4.1.1"
 micronaut-validation = "4.2.0"
 

diff --git a/...java/io/micronaut/http/server/tck/azurehttpfunction/AzureFunctionHttpServerUnderTest.java b/...java/io/micronaut/http/server/tck/azurehttpfunction/AzureFunctionHttpServerUnderTest.java
@@ -9,6 +9,7 @@
 import io.micronaut.core.convert.ConversionService;
 import io.micronaut.core.type.Argument;
 import io.micronaut.core.util.StringUtils;
+import io.micronaut.http.HttpHeaders;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
@@ -75,7 +76,8 @@ public void close() throws IOException {
 
     private final static Set<String> HEADERS_USED_IN_TEST_SUITE = Set.of(
         "X-Test-Filter",
-        "X-Captured-Remote-Address"
+        "X-Captured-Remote-Address",
+        HttpHeaders.ACCESS_CONTROL_ALLOW_PRIVATE_NETWORK
     );
 
 }