#18 problem reproduced

yegor256 · Nov 15, 2016 · e8e118b · e8e118b
1 parent c0ca45d
commit e8e118b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/main/java/io/jare/tk/TkRelay.java b/src/main/java/io/jare/tk/TkRelay.java
@@ -32,6 +32,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.regex.Pattern;
 import org.takes.HttpException;
 import org.takes.Request;
 import org.takes.Response;
@@ -49,6 +50,14 @@
  */
 final class TkRelay implements Take {
 
+    /**
+     * Validation pattern for destination URLs.
+     * @link https://tools.ietf.org/html/rfc3986
+     */
+    private static final Pattern PTN = Pattern.compile(
+        "[A-Za-z0-9-._~:/\\?#@!\\$&'\\(\\)\\*\\+,;=`\\[]]+"
+    );
+
     /**
      * Base.
      */

diff --git a/src/test/java/io/jare/tk/TkRelayTest.java b/src/test/java/io/jare/tk/TkRelayTest.java
@@ -27,6 +27,7 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
+import org.takes.HttpException;
 import org.takes.Take;
 import org.takes.facets.fork.FkRegex;
 import org.takes.facets.fork.TkFork;
@@ -98,4 +99,21 @@ public void sendsRequestThroughToHome() throws Exception {
         );
     }
 
+    /**
+     * TkRelay can tolerate complex URLs.
+     * @throws Exception If some problem inside
+     */
+    @Test(expected = HttpException.class)
+    public void catchesInvalidURLs() throws Exception {
+        new TkRelay(new FkBase()).act(
+            new RqFake(
+                Arrays.asList(
+                    "GET /?u=http://www.yegor256.com/i+%D1%85%D0%BC",
+                    "Host: 127.0.0.1"
+                ),
+                ""
+            )
+        );
+    }
+
 }