Encode uri in HttpGateway (#958)

Author: dmitriyslaym

services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java

@@ -30,6 +30,7 @@
 import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.api.DataCodec;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -231,16 +232,16 @@ private static ServiceMessage toMessage(
 
     // Copy HTTP query params to service message
 
-    final var uri = httpRequest.uri();
-    final var queryParams = matchQueryParams(uri);
+    final var uri = URI.create(httpRequest.uri());
+    final var queryParams = matchQueryParams(uri.getQuery());
     queryParams.forEach((param, value) -> builder.header("http.query." + param, value));
 
     // Add HTTP method to service message (used by REST services)
 
     builder
         .header("http.method", httpRequest.method().name())
         .header(HEADER_REQUEST_METHOD, httpRequest.method().name())
-        .qualifier(stripQueryParams(uri.substring(1)));
+        .qualifier(uri.getPath().substring(1));
 
     if (consumer != null) {
       consumer.accept(builder);
@@ -249,12 +250,11 @@ private static ServiceMessage toMessage(
     return builder.build();
   }
 
-  private static Map<String, String> matchQueryParams(String uri) {
-    final var index = uri.indexOf('?');
-    if (index < 0 || index == uri.length() - 1) {
+  private static Map<String, String> matchQueryParams(String queryString) {
+    if (queryString == null) {
       return Collections.emptyMap(); // no query params
     }
-    return Arrays.stream(uri.substring(index + 1).split("&"))
+    return Arrays.stream(queryString.split("&"))
         .map(s -> s.split("=", 2))
         .filter(parts -> parts.length == 2)
         .collect(
@@ -263,14 +263,6 @@ private static Map<String, String> matchQueryParams(String uri) {
                 parts -> URLDecoder.decode(parts[1], StandardCharsets.UTF_8)));
   }
 
-  private static String stripQueryParams(String uri) {
-    final var index = uri.indexOf('?');
-    if (index < 0) {
-      return uri; // no query params
-    }
-    return uri.substring(0, index);
-  }
-
   private static Mono<ServiceMessage> emptyMessage(ServiceMessage message) {
     return Mono.just(ServiceMessage.builder().qualifier(message.qualifier()).build());
   }

services-gateway/src/test/java/io/scalecube/services/gateway/rest/RestGatewayTest.java

@@ -24,6 +24,9 @@
 import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.AfterAll;
@@ -423,5 +426,29 @@ void testNoMatchWithoutRestMethod() {
             .verify(Duration.ofSeconds(3));
       }
     }
+
+    @Test
+    void testUrlEncoding() {
+      final var param = "user|1234";
+      StepVerifier.create(
+          serviceCall.requestOne(
+            ServiceMessage.builder()
+              .header("http.method", "GET")
+              .qualifier(encodeUri("v1/restService/encoding/" + param) + "?" +
+                encodeUri("x=test|1234&y=foo#bar&orderBy[direction]=Asc"))
+              .build(),
+            SomeResponse.class))
+        .assertNext(
+          message -> {
+            final var someResponse = message.<SomeResponse>data();
+            assertNotNull(someResponse, "data");
+            assertEquals(param, someResponse.name(), "someResponse.name");
+          })
+        .verifyComplete();
+    }
+
+    private static String encodeUri(String uri) {
+      return URLEncoder.encode(uri, StandardCharsets.UTF_8);
+    }
   }
 }

services-gateway/src/test/java/io/scalecube/services/gateway/rest/RestService.java

@@ -39,4 +39,8 @@ public interface RestService {
   @RestMethod("GET")
   @ServiceMethod("queryParams")
   Mono<SomeResponse> queryParams();
+
+  @RestMethod("GET")
+  @ServiceMethod("encoding/:foo")
+  Mono<SomeResponse> encoding();
 }

services-gateway/src/test/java/io/scalecube/services/gateway/rest/RestServiceImpl.java

@@ -187,4 +187,19 @@ public Mono<SomeResponse> queryParams() {
               return new SomeResponse().name(UUID.randomUUID().toString());
             });
   }
+
+  @Override
+  public Mono<SomeResponse> encoding() {
+    return RequestContext.deferContextual()
+      .map(
+        context -> {
+          final var pathParams = context.pathParams();
+          final var foo = pathParams.getString("foo");
+          final var queryParams = context.headerParams("http.query");
+          assertEquals("test|1234", queryParams.getString("x"));
+          assertEquals("foo#bar", queryParams.getString("y"));
+          assertEquals("Asc", queryParams.getString("orderBy[direction]"));
+          return new SomeResponse().name(foo);
+        });
+  }
 }