Merge pull request quarkusio#34895 from gsmet/2.16.9-backports-1

2.16.9 backports 1
gsmet · Jul 21, 2023 · 2e6da66 · 2e6da66
2 parents 699dc60 + 4f44f92
commit 2e6da66
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java
@@ -215,7 +215,7 @@ public static Channel createChannel(String name, Set<String> perClientIntercepto
             }
             Optional<Duration> idleTimeout = config.idleTimeout;
             if (idleTimeout.isPresent()) {
-                builder.keepAliveTimeout(idleTimeout.get().toMillis(), TimeUnit.MILLISECONDS);
+                builder.idleTimeout(idleTimeout.get().toMillis(), TimeUnit.MILLISECONDS);
             }
 
             if (plainText && provider == null) {

diff --git a/...http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttribute.java b/...http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttribute.java
@@ -13,7 +13,7 @@
  */
 public class DateTimeAttribute implements ExchangeAttribute {
 
-    private static final String COMMON_LOG_PATTERN = "[dd/MMM/yyyy:HH:mm:ss Z]";
+    private static final String COMMON_LOG_PATTERN = "'['dd/MMM/yyyy:HH:mm:ss Z']'";
 
     public static final String DATE_TIME_SHORT = "%t";
     public static final String DATE_TIME = "%{DATE_TIME}";

diff --git a/...reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java b/...reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java
@@ -389,6 +389,12 @@ protected static String encodeFromArray(String segment, String[] encodingMap, bo
                 result.append(currentChar);
                 continue;
             }
+            if (Character.isHighSurrogate(currentChar)) {
+                String part = segment.substring(i, i + 2);
+                result.append(URLEncoder.encode(part, StandardCharsets.UTF_8));
+                ++i;
+                continue;
+            }
             String encoding = encode(currentChar, encodingMap);
             if (encoding == null) {
                 result.append(currentChar);

diff --git a/...tive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/util/EncodeTest.java b/...tive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/util/EncodeTest.java
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+class EncodeTest {
+    @Test
+    void encodeEmoji() {
+        String emoji = "\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00";
+        String encodedEmoji = URLEncoder.encode(emoji, StandardCharsets.UTF_8);
+        assertEquals(encodedEmoji, Encode.encodePath(emoji));
+        assertEquals(encodedEmoji, Encode.encodeQueryParam(emoji));
+    }
+}
diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/AccessLogTestCase.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/AccessLogTestCase.java
@@ -2,7 +2,6 @@
 
 import static org.hamcrest.Matchers.containsString;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -23,12 +22,11 @@ public class AccessLogTestCase {
     /**
      * Fires a HTTP request, to an application which has access log enabled and then checks
      * the access-log contents to verify that the request was logged
-     *
-     * @throws Exception
      */
     @Test
-    public void testAccessLogContent() throws Exception {
+    public void testAccessLogContent() {
         final Path logDirectory = Paths.get(".", "target");
+        final Path accessLogFilePath = logDirectory.resolve("quarkus-access-log.log");
         final String queryParamVal = UUID.randomUUID().toString();
         final String targetUri = "/simple/access-log-test-endpoint?foo=" + queryParamVal;
         RestAssured.when().get(targetUri).then().body(containsString("passed"));
@@ -37,15 +35,18 @@ public void testAccessLogContent() throws Exception {
                 .untilAsserted(new ThrowingRunnable() {
                     @Override
                     public void run() throws Throwable {
-                        final Path accessLogFilePath = logDirectory.resolve("quarkus-access-log.log");
                         Assertions.assertTrue(Files.exists(accessLogFilePath),
                                 "access log file " + accessLogFilePath + " is missing");
-                        String data = new String(Files.readAllBytes(accessLogFilePath), StandardCharsets.UTF_8);
-                        Assertions.assertTrue(data.contains(targetUri),
+                        String line = Files.readString(accessLogFilePath);
+                        Assertions.assertTrue(line.startsWith("127.0.0.1 - - ["),
+                                "access log doesn't contain request IP or does not wrap the date with []: " + line);
+                        Assertions.assertTrue(line.contains("] \"GET"),
+                                "access log doesn't contain the HTTP method or does not wrap the date with []: " + line);
+                        Assertions.assertTrue(line.contains(targetUri),
                                 "access log doesn't contain an entry for " + targetUri);
-                        Assertions.assertTrue(data.contains("?foo=" + queryParamVal),
+                        Assertions.assertTrue(line.contains("?foo=" + queryParamVal),
                                 "access log is missing query params");
-                        Assertions.assertFalse(data.contains("?foo=" + queryParamVal + "?foo=" + queryParamVal),
+                        Assertions.assertFalse(line.contains("?foo=" + queryParamVal + "?foo=" + queryParamVal),
                                 "access log contains duplicated query params");
                     }
                 });

diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <!-- Dependency versions -->
 
         <!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
-        <grpc.version>1.51.1</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
+        <grpc.version>1.53.0</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
         <grpc-jprotoc.version>1.2.1</grpc-jprotoc.version>
         <protoc.version>3.22.0</protoc.version>
         <protobuf-java.version>${protoc.version}</protobuf-java.version>