Fix URL parsing issue (#391)

components/api/src/main/java/com/hotels/styx/api/Url.java

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2018 Expedia Inc.
+  Copyright (C) 2013-2019 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ private Url(Builder builder) {
      * @return scheme
      */
     public String scheme() {
-        return this.scheme;
+        return this.scheme != null ? this.scheme : "";
     }
 
     /**
@@ -121,7 +121,7 @@ public boolean isFullyQualified() {
      * @return true if the URL is absolute.
      */
     public boolean isAbsolute() {
-        return path.startsWith("/");
+        return Objects.nonNull(scheme) && !scheme.isEmpty();
     }
 
     /**
@@ -131,7 +131,7 @@ public boolean isAbsolute() {
      * @see {@link #isAbsolute()}
      */
     public boolean isRelative() {
-        return !isAbsolute();
+        return scheme == null || scheme.isEmpty();
     }
 
     /**
@@ -455,7 +455,7 @@ public static Builder url(String value) {
                     .fragment(uri.getFragment());
         }
 
-        Builder rawQuery(String rawQuery) {
+        public Builder rawQuery(String rawQuery) {
             this.queryBuilder = rawQuery == null ? null : new UrlQuery.Builder(rawQuery);
             return this;
         }

components/api/src/test/java/com/hotels/styx/api/UrlTest.java

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2018 Expedia Inc.
+  Copyright (C) 2013-2019 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -192,13 +192,13 @@ public void authorityReturnsHostAndPortStringWithoutPort() {
     public void identifiesCorrectlyIfUrlIsFullyQualified() throws Exception {
         Url fqUrl = url("http://example.com").build();
         assertThat(fqUrl.isFullyQualified(), is(true));
-        assertThat(fqUrl.isAbsolute(), is(false));
-        assertThat(fqUrl.isRelative(), is(true));
+        assertThat(fqUrl.isAbsolute(), is(true));
+        assertThat(fqUrl.isRelative(), is(false));
 
         Url nonFqUrl = url("/somepath").build();
         assertThat(nonFqUrl.isFullyQualified(), is(false));
-        assertThat(nonFqUrl.isAbsolute(), is(true));
-        assertThat(nonFqUrl.isRelative(), is(false));
+        assertThat(nonFqUrl.isAbsolute(), is(false));
+        assertThat(nonFqUrl.isRelative(), is(true));
     }
 
     @Test

components/server/src/main/java/com/hotels/styx/server/netty/codec/NettyToStyxRequestDecoder.java

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2018 Expedia Inc.
+  Copyright (C) 2013-2019 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufHolder;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.handler.codec.TooLongFrameException;
 import io.netty.handler.codec.http.HttpContent;
@@ -39,7 +38,6 @@
 import rx.Producer;
 import rx.Subscriber;
 
-import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayDeque;
@@ -50,7 +48,6 @@
 import static com.google.common.collect.Iterables.size;
 import static com.hotels.styx.api.HttpHeaderNames.EXPECT;
 import static com.hotels.styx.api.HttpHeaderNames.HOST;
-import static com.hotels.styx.api.Url.Builder.url;
 import static com.hotels.styx.server.UniqueIdSuppliers.UUID_VERSION_ONE_SUPPLIER;
 import static com.hotels.styx.server.netty.codec.UnwiseCharsEncoder.IGNORE;
 import static java.util.Objects.requireNonNull;
@@ -165,8 +162,7 @@ private static ByteBuf content(HttpObject httpObject) {
 
     @VisibleForTesting
     LiveHttpRequest.Builder makeAStyxRequestFrom(HttpRequest request, Observable<ByteBuf> content) {
-        Url url = url(unwiseCharEncoder.encode(request.uri()))
-                .build();
+        Url url = UrlDecoder.decodeUrl(unwiseCharEncoder, request);
         LiveHttpRequest.Builder requestBuilder = new LiveHttpRequest.Builder()
                 .method(toStyxMethod(request.method()))
                 .url(url)
@@ -188,14 +184,6 @@ private com.hotels.styx.api.HttpMethod toStyxMethod(HttpMethod method) {
         return com.hotels.styx.api.HttpMethod.httpMethod(method.name());
     }
 
-    private static InetSocketAddress remoteAddress(ChannelHandlerContext ctx) {
-        if (ctx.channel() instanceof EmbeddedChannel) {
-            return new InetSocketAddress(0);
-        }
-
-        return (InetSocketAddress) ctx.channel().remoteAddress();
-    }
-
     private static class FlowControllingHttpContentProducer implements Producer {
         private final ChannelHandlerContext ctx;
 

components/server/src/main/java/com/hotels/styx/server/netty/codec/UrlDecoder.java

@@ -0,0 +1,44 @@
+/*
+  Copyright (C) 2013-2019 Expedia Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+package com.hotels.styx.server.netty.codec;
+
+import com.hotels.styx.api.Url;
+import io.netty.handler.codec.http.HttpRequest;
+
+import java.net.URI;
+
+import static com.hotels.styx.api.HttpHeaderNames.HOST;
+import static com.hotels.styx.api.Url.Builder.url;
+
+final class UrlDecoder {
+    private UrlDecoder() {
+    }
+
+    static Url decodeUrl(UnwiseCharsEncoder unwiseCharEncoder, HttpRequest request) {
+        String host = request.headers().get(HOST);
+
+        if (request.uri().startsWith("/") && host != null) {
+            URI uri = URI.create("http://" + host + unwiseCharEncoder.encode(request.uri()));
+            return new Url.Builder()
+                    .path(uri.getRawPath())
+                    .rawQuery(uri.getRawQuery())
+                    .fragment(uri.getFragment())
+                    .build();
+        } else {
+            return url(unwiseCharEncoder.encode(request.uri())).build();
+        }
+    }
+}

components/server/src/test/java/com/hotels/styx/server/netty/codec/NettyToStyxRequestDecoderTest.java

@@ -221,7 +221,7 @@ public void throwsBadRequestExceptionWhenRequestMessageContainsMoreThanOneHostHe
     }
 
     @Test
-    public void callsTheEscaperForUnwiseChars() throws Exception {
+    public void callsTheEscaperForUnwiseChars() {
         UnwiseCharsEncoder encoder = mock(UnwiseCharsEncoder.class);
         NettyToStyxRequestDecoder decoder = new NettyToStyxRequestDecoder.Builder()
                 .uniqueIdSupplier(uniqueIdSupplier)

components/server/src/test/java/com/hotels/styx/server/netty/codec/UrlDecoderTest.java

@@ -0,0 +1,102 @@
+/*
+  Copyright (C) 2013-2019 Expedia Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+package com.hotels.styx.server.netty.codec;
+
+import com.hotels.styx.api.Url;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import org.testng.annotations.Test;
+
+import java.util.Optional;
+
+import static io.netty.handler.codec.http.HttpHeaders.Names.HOST;
+import static io.netty.handler.codec.http.HttpMethod.GET;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class UrlDecoderTest {
+    @Test
+    public void decodesOriginForm() {
+        DefaultFullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/foo");
+        request.headers().add(HOST, "example.com");
+
+        Url url = UrlDecoder.decodeUrl(x -> x, request);
+
+        assertThat(url.authority(), is(Optional.empty()));
+        assertThat(url.path(), is("/foo"));
+        assertThat(url.encodedUri(), is("/foo"));
+        assertThat(url.isAbsolute(), is(false));
+        assertThat(url.isRelative(), is(true));
+        assertThat(url.host(), is(Optional.empty()));
+        assertThat(url.query(), is(Optional.empty()));
+        assertThat(url.scheme(), is(""));
+    }
+
+    // From GitHub issue #391.
+    @Test
+    public void exposesPathComponentsWithDoubleSlashSeparators() {
+        DefaultFullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "//www.abc.com//abc123Z");
+        request.headers().add(HOST, "example.com");
+
+        Url url = UrlDecoder.decodeUrl(x -> x, request);
+
+        assertThat(url.authority(), is(Optional.empty()));
+        assertThat(url.path(), is("//www.abc.com//abc123Z"));
+        assertThat(url.encodedUri(), is("//www.abc.com//abc123Z"));
+        assertThat(url.isAbsolute(), is(false));
+        assertThat(url.isRelative(), is(true));
+        assertThat(url.host(), is(Optional.empty()));
+        assertThat(url.query(), is(Optional.empty()));
+        assertThat(url.scheme(), is(""));
+    }
+
+    // Demonstrates that Host header handling is case insensitive.
+    @Test
+    public void decodesOriginFormWithUppercaseHostHeader() {
+        DefaultFullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "/foo");
+        request.headers().add("HOST", "example.com");
+
+        Url url = UrlDecoder.decodeUrl(x -> x, request);
+
+        assertThat(url.authority(), is(Optional.empty()));
+        assertThat(url.path(), is("/foo"));
+        assertThat(url.encodedUri(), is("/foo"));
+        assertThat(url.isAbsolute(), is(false));
+        assertThat(url.isRelative(), is(true));
+        assertThat(url.host(), is(Optional.empty()));
+        assertThat(url.query(), is(Optional.empty()));
+        assertThat(url.scheme(), is(""));
+    }
+
+
+    @Test
+    public void decodesAbsoluteForm() {
+        DefaultFullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, GET, "http://example.com/foo");
+
+        Url url = UrlDecoder.decodeUrl(x -> x, request);
+
+        assertThat(url.authority().isPresent(), is(true));
+        assertThat(url.path(), is("/foo"));
+        assertThat(url.encodedUri(), is("http://example.com/foo"));
+        assertThat(url.isAbsolute(), is(true));
+        assertThat(url.isRelative(), is(false));
+        assertThat(url.host(), is(Optional.of("example.com")));
+        assertThat(url.query(), is(Optional.empty()));
+        assertThat(url.scheme(), is("http"));
+    }
+
+
+}