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

Issue #570 

Encoding mechanism was based on if the first encodable character found was unicode or not.  Changed to not be
order dependent!
This commit is contained in:
Greg Wilkins 2016-05-13 10:52:49 +10:00
parent 51dd5c902c
commit 0a1f4ac98c
2 changed files with 170 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
View File

@ -18,6 +18,7 @@
package org.eclipse.jetty.util; package org.eclipse.jetty.util;
import java.net.URI;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -46,9 +47,7 @@ public class URIUtil
private static final Logger LOG = Log.getLogger(URIUtil.class); private static final Logger LOG = Log.getLogger(URIUtil.class);
public static final String SLASH="/"; public static final String SLASH="/";
public static final String HTTP="http"; public static final String HTTP="http";
public static final String HTTP_COLON="http:";
public static final String HTTPS="https"; public static final String HTTPS="https";
public static final String HTTPS_COLON="https:";
// Use UTF-8 as per http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars // Use UTF-8 as per http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars
public static final Charset __CHARSET=StandardCharsets.UTF_8 ; public static final Charset __CHARSET=StandardCharsets.UTF_8 ;
@ -68,7 +67,7 @@ public class URIUtil
if (path==null || path.length()==0) if (path==null || path.length()==0)
return path; return path;
StringBuilder buf = encodePath(null,path); StringBuilder buf = encodePath(null,path,0);
return buf==null?path:buf.toString(); return buf==null?path:buf.toString();
} }
@ -79,11 +78,22 @@ public class URIUtil
* @return The StringBuilder or null if no substitutions required. * @return The StringBuilder or null if no substitutions required.
*/ */
public static StringBuilder encodePath(StringBuilder buf, String path) public static StringBuilder encodePath(StringBuilder buf, String path)
{
return encodePath(buf,path,0);
}
/* ------------------------------------------------------------ */
/** Encode a URI path.
* @param path The path the encode
* @param buf StringBuilder to encode path into (or null)
* @return The StringBuilder or null if no substitutions required.
*/
private static StringBuilder encodePath(StringBuilder buf, String path, int offset)
{ {
byte[] bytes=null; byte[] bytes=null;
if (buf==null) if (buf==null)
{ {
loop: for (int i=0;i<path.length();i++) loop: for (int i=offset;i<path.length();i++)
{ {
char c=path.charAt(i); char c=path.charAt(i);
switch(c) switch(c)
@ -92,13 +102,19 @@ public class URIUtil
case '?': case '?':
case ';': case ';':
case '#': case '#':
case '\'':
case '"': case '"':
case '\'':
case '<': case '<':
case '>': case '>':
case ' ': case ' ':
case '[': case '[':
case '\\':
case ']': case ']':
case '^':
case '`':
case '{':
case '|':
case '}':
buf=new StringBuilder(path.length()*2); buf=new StringBuilder(path.length()*2);
break loop; break loop;
default: default:
@ -114,9 +130,78 @@ public class URIUtil
return null; return null;
} }
int i;
loop: for (i=offset;i<path.length();i++)
{
char c=path.charAt(i);
switch(c)
{
case '%':
buf.append("%25");
continue;
case '?':
buf.append("%3F");
continue;
case ';':
buf.append("%3B");
continue;
case '#':
buf.append("%23");
continue;
case '"':
buf.append("%22");
continue;
case '\'':
buf.append("%27");
continue;
case '<':
buf.append("%3C");
continue;
case '>':
buf.append("%3E");
continue;
case ' ':
buf.append("%20");
continue;
case '[':
buf.append("%5B");
continue;
case '\\':
buf.append("%5C");
continue;
case ']':
buf.append("%5D");
continue;
case '^':
buf.append("%5E");
continue;
case '`':
buf.append("%60");
continue;
case '{':
buf.append("%7B");
continue;
case '|':
buf.append("%7C");
continue;
case '}':
buf.append("%7D");
continue;
default:
if (c>127)
{
bytes=path.getBytes(URIUtil.__CHARSET);
break loop;
}
buf.append(c);
}
}
if (bytes!=null) if (bytes!=null)
{ {
for (int i=0;i<bytes.length;i++) for (;i<bytes.length;i++)
{ {
byte c=bytes[i]; byte c=bytes[i];
switch(c) switch(c)
@ -151,9 +236,27 @@ public class URIUtil
case '[': case '[':
buf.append("%5B"); buf.append("%5B");
continue; continue;
case '\\':
buf.append("%5C");
continue;
case ']': case ']':
buf.append("%5D"); buf.append("%5D");
continue; continue;
case '^':
buf.append("%5E");
continue;
case '`':
buf.append("%60");
continue;
case '{':
buf.append("%7B");
continue;
case '|':
buf.append("%7C");
continue;
case '}':
buf.append("%7D");
continue;
default: default:
if (c<0) if (c<0)
{ {
@ -162,57 +265,9 @@ public class URIUtil
} }
else else
buf.append((char)c); buf.append((char)c);
continue;
} }
} }
} }
else
{
for (int i=0;i<path.length();i++)
{
char c=path.charAt(i);
switch(c)
{
case '%':
buf.append("%25");
continue;
case '?':
buf.append("%3F");
continue;
case ';':
buf.append("%3B");
continue;
case '#':
buf.append("%23");
continue;
case '"':
buf.append("%22");
continue;
case '\'':
buf.append("%27");
continue;
case '<':
buf.append("%3C");
continue;
case '>':
buf.append("%3E");
continue;
case ' ':
buf.append("%20");
continue;
case '[':
buf.append("%5B");
continue;
case ']':
buf.append("%5D");
continue;
default:
buf.append(c);
continue;
}
}
}
return buf; return buf;
} }
@ -230,33 +285,29 @@ public class URIUtil
{ {
if (buf==null) if (buf==null)
{ {
loop:
for (int i=0;i<path.length();i++) for (int i=0;i<path.length();i++)
{ {
char c=path.charAt(i); char c=path.charAt(i);
if (c=='%' || encode.indexOf(c)>=0) if (c=='%' || encode.indexOf(c)>=0)
{ {
buf=new StringBuilder(path.length()<<1); buf=new StringBuilder(path.length()<<1);
break loop; break;
} }
} }
if (buf==null) if (buf==null)
return null; return null;
} }
synchronized(buf) for (int i=0;i<path.length();i++)
{ {
for (int i=0;i<path.length();i++) char c=path.charAt(i);
if (c=='%' || encode.indexOf(c)>=0)
{ {
char c=path.charAt(i); buf.append('%');
if (c=='%' || encode.indexOf(c)>=0) StringUtil.append(buf,(byte)(0xff&c),16);
{
buf.append('%');
StringUtil.append(buf,(byte)(0xff&c),16);
}
else
buf.append(c);
} }
else
buf.append(c);
} }
return buf; return buf;
@ -666,7 +717,7 @@ public class URIUtil
if (state<2) if (state<2)
return path; return path;
StringBuffer buf = new StringBuffer(path.length()); StringBuilder buf = new StringBuilder(path.length());
buf.append(path,0,i); buf.append(path,0,i);
loop2: loop2:
@ -850,6 +901,45 @@ public class URIUtil
} }
return a==lenA && b==lenB; return a==lenA && b==lenB;
} }
public static boolean equalsIgnoreEncodings(URI uriA, URI uriB)
{
if (uriA.equals(uriB))
return true;
if (uriA.getScheme()==null)
{
if (uriB.getScheme()!=null)
return false;
}
else if (!uriA.getScheme().equals(uriB.getScheme()))
return false;
if (uriA.getAuthority()==null)
{
if (uriB.getAuthority()!=null)
return false;
}
else if (!uriA.getAuthority().equals(uriB.getAuthority()))
return false;
return equalsIgnoreEncodings(uriA.getPath(),uriB.getPath());
}
public static URI addDecodedPath(URI uri, String path)
{
String base = uri.toASCIIString();
StringBuilder buf = new StringBuilder(base.length()+path.length()*3);
buf.append(base);
if (buf.charAt(base.length()-1)!='/')
buf.append('/');
byte[] bytes=null;
int offset=path.charAt(0)=='/'?1:0;
encodePath(buf,path,offset);
return URI.create(buf.toString());
}
} }

13
jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java
View File

@ -40,7 +40,6 @@ public class URIUtilTest
// test basic encode/decode // test basic encode/decode
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.setLength(0); buf.setLength(0);
URIUtil.encodePath(buf,"/foo%23+;,:=/b a r/?info "); URIUtil.encodePath(buf,"/foo%23+;,:=/b a r/?info ");
assertEquals("/foo%2523+%3B,:=/b%20a%20r/%3Finfo%20",buf.toString()); assertEquals("/foo%2523+%3B,:=/b%20a%20r/%3Finfo%20",buf.toString());
@ -54,6 +53,14 @@ public class URIUtilTest
buf.setLength(0); buf.setLength(0);
URIUtil.encodePath(buf,"/context/'list'/\"me\"/;<script>window.alert('xss');</script>"); URIUtil.encodePath(buf,"/context/'list'/\"me\"/;<script>window.alert('xss');</script>");
assertEquals("/context/%27list%27/%22me%22/%3B%3Cscript%3Ewindow.alert(%27xss%27)%3B%3C/script%3E", buf.toString()); assertEquals("/context/%27list%27/%22me%22/%3B%3Cscript%3Ewindow.alert(%27xss%27)%3B%3C/script%3E", buf.toString());
buf.setLength(0);
URIUtil.encodePath(buf, "test\u00f6?\u00f6:\u00df");
assertEquals("test%C3%B6%3F%C3%B6:%C3%9F", buf.toString());
buf.setLength(0);
URIUtil.encodePath(buf, "test?\u00f6?\u00f6:\u00df");
assertEquals("test%3F%C3%B6%3F%C3%B6:%C3%9F", buf.toString());
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -64,12 +71,12 @@ public class URIUtilTest
assertEquals("/foo/bar",URIUtil.decodePath("/foo/bar")); assertEquals("/foo/bar",URIUtil.decodePath("/foo/bar"));
assertEquals("/f o/b r",URIUtil.decodePath("/f%20o/b%20r")); assertEquals("/f o/b r",URIUtil.decodePath("/f%20o/b%20r"));
assertEquals("/foo/bar",URIUtil.decodePath("/foo;ignore/bar;ignore")); assertEquals("/foo/bar",URIUtil.decodePath("/foo;ignore/bar;ignore"));
assertEquals("/fää/bar",URIUtil.decodePath("/fää;ignore/bar;ignore")); assertEquals("/fää/bar",URIUtil.decodePath("/f\u00e4\u00e4;ignore/bar;ignore"));
assertEquals("/f\u0629\u0629%23/bar",URIUtil.decodePath("/f%d8%a9%d8%a9%2523;ignore/bar;ignore")); assertEquals("/f\u0629\u0629%23/bar",URIUtil.decodePath("/f%d8%a9%d8%a9%2523;ignore/bar;ignore"));
assertEquals("foo%23;,:=b a r",URIUtil.decodePath("foo%2523%3b%2c:%3db%20a%20r;rubbish")); assertEquals("foo%23;,:=b a r",URIUtil.decodePath("foo%2523%3b%2c:%3db%20a%20r;rubbish"));
assertEquals("/foo/bar%23;,:=b a r=",URIUtil.decodePath("xxx/foo/bar%2523%3b%2c:%3db%20a%20r%3Dxxx;rubbish",3,35)); assertEquals("/foo/bar%23;,:=b a r=",URIUtil.decodePath("xxx/foo/bar%2523%3b%2c:%3db%20a%20r%3Dxxx;rubbish",3,35));
assertEquals("fää%23;,:=b a r=",URIUtil.decodePath("fää%2523%3b%2c:%3db%20a%20r%3D")); assertEquals("f\u00e4\u00e4%23;,:=b a r=", URIUtil.decodePath("fää%2523%3b%2c:%3db%20a%20r%3D"));
assertEquals("f\u0629\u0629%23;,:=b a r",URIUtil.decodePath("f%d8%a9%d8%a9%2523%3b%2c:%3db%20a%20r")); assertEquals("f\u0629\u0629%23;,:=b a r",URIUtil.decodePath("f%d8%a9%d8%a9%2523%3b%2c:%3db%20a%20r"));
// Test for null character (real world ugly test case) // Test for null character (real world ugly test case)