Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolving merge issue

This commit is contained in:
Jesse McConnell 2012-12-27 13:49:31 -03:00
parent 6fca5fc6f9 525aa8b208
commit 863109b552
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java
View File

@ -24,6 +24,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/** /**
* This rule can be used to protect against invalid unicode characters in a url making it into applications. * This rule can be used to protect against invalid unicode characters in a url making it into applications.
@ -36,6 +38,8 @@ import org.eclipse.jetty.util.URIUtil;
*/ */
public class ValidUrlRule extends Rule public class ValidUrlRule extends Rule
{ {
private static final Logger LOG = Log.getLogger(ValidUrlRule.class);
String _code = "400"; String _code = "400";
String _reason = "Illegal Url"; String _reason = "Illegal Url";
@ -72,12 +76,16 @@ public class ValidUrlRule extends Rule
public String matchAndApply(String target, HttpServletRequest request, HttpServletResponse response) throws IOException public String matchAndApply(String target, HttpServletRequest request, HttpServletResponse response) throws IOException
{ {
// best to decide the request uri and validate that // best to decide the request uri and validate that
// String uri = request.getRequestURI();
String uri = URIUtil.decodePath(request.getRequestURI()); String uri = URIUtil.decodePath(request.getRequestURI());
for (int i = 0; i < uri.length(); ++i) for (int i = 0; i < uri.length();)
{ {
if (!isValidChar(uri.charAt(i))) int codepoint = uri.codePointAt(i);
if (!isValidChar(uri.codePointAt(i)))
{ {
int code = Integer.parseInt(_code); int code = Integer.parseInt(_code);
// status code 400 and up are error codes so include a reason // status code 400 and up are error codes so include a reason
@ -93,17 +101,20 @@ public class ValidUrlRule extends Rule
// we have matched, return target and consider it is handled // we have matched, return target and consider it is handled
return target; return target;
} }
i += Character.charCount(codepoint);
} }
// we have not matched so return null // we have not matched so return null
return null; return null;
} }
protected boolean isValidChar(char c) protected boolean isValidChar(int codepoint)
{ {
Character.UnicodeBlock block = Character.UnicodeBlock.of(c); Character.UnicodeBlock block = Character.UnicodeBlock.of(codepoint);
return (!Character.isISOControl(c)) && block != null && block != Character.UnicodeBlock.SPECIALS; LOG.debug("{} {} {} {}", Character.charCount(codepoint), codepoint, block, Character.isISOControl(codepoint));
return (!Character.isISOControl(codepoint)) && block != null && block != Character.UnicodeBlock.SPECIALS;
} }
public String toString() public String toString()

4
jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java
View File

@ -97,7 +97,7 @@ public class ValidUrlRuleTest extends AbstractRuleTestCase
assertEquals("foo",_response.getReason()); assertEquals("foo",_response.getReason());
} }
@Ignore("Not passing (yet)") @Ignore("Not passing (yet), issue in uri decoding")
@Test @Test
public void testValidShamrock() throws Exception public void testValidShamrock() throws Exception
{ {
@ -109,7 +109,7 @@ public class ValidUrlRuleTest extends AbstractRuleTestCase
assertEquals(200,_response.getStatus()); assertEquals(200,_response.getStatus());
} }
@Test @Test
public void testCharacters() throws Exception public void testCharacters() throws Exception
{ {