diff options
author | Jesse McConnell | 2012-11-29 17:30:02 +0000 |
---|---|---|
committer | Jesse McConnell | 2012-11-29 17:30:02 +0000 |
commit | a22f2a25ebd93f5d361dbc6b3c07deb2697be450 (patch) | |
tree | e05f159ce42872119ed2b4da4166856be6a78b41 /jetty-rewrite | |
parent | 51bb01e14b11f144bc8ebef6bad351cce05f447c (diff) | |
download | org.eclipse.jetty.project-a22f2a25ebd93f5d361dbc6b3c07deb2697be450.tar.gz org.eclipse.jetty.project-a22f2a25ebd93f5d361dbc6b3c07deb2697be450.tar.xz org.eclipse.jetty.project-a22f2a25ebd93f5d361dbc6b3c07deb2697be450.zip |
tweak tests and add some commenting
Diffstat (limited to 'jetty-rewrite')
-rw-r--r-- | jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java | 11 | ||||
-rw-r--r-- | jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java index 195f451bce..688859a2ad 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java @@ -25,6 +25,15 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.util.URIUtil; +/** + * This rule can be used to protect against invalid unicode characters in a url making it into applications. + * + * The logic is as follows. + * + * - if decoded uri character is an iso control character return code/reason + * - if no UnicodeBlock is found for character return code/reason + * - if character is in UnicodeBlock.SPECIALS return code/reason + */ public class ValidUrlRule extends Rule { String _code = "400"; @@ -81,10 +90,12 @@ public class ValidUrlRule extends Rule response.setStatus(code); } + // we have matched, return target and consider it is handled return target; } } + // we have not matched so return null return null; } diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java index 4513d80331..1ba760721a 100644 --- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java +++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java @@ -58,14 +58,16 @@ public class ValidUrlRuleTest extends AbstractRuleTestCase } @Test - public void testInvalidUrl2() throws Exception + public void testInvalidUrlWithReason() throws Exception { - _rule.setCode("404"); + _rule.setCode("405"); + _rule.setReason("foo"); _request.setRequestURI("/%00/"); String result = _rule.matchAndApply(_request.getRequestURI(), _request, _response); - assertEquals(404,_response.getStatus()); + assertEquals(405,_response.getStatus()); + assertEquals("foo",_response.getReason()); } @Test |