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

442048 fixed sendRedirect %2F encoding

This commit is contained in:
Greg Wilkins 2014-08-27 12:34:15 +10:00
parent b49fefd626
commit 9a52d92f03
2 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -690,58 +690,26 @@ public class Response implements HttpServletResponse
if (!URIUtil.hasScheme(location))
{
StringBuilder buf = _channel.getRequest().getRootURL();
if (location.startsWith("//"))
if (location.startsWith("/"))
{
buf.delete(0, buf.length());
buf.append(_channel.getRequest().getScheme());
buf.append(":");
buf.append(location);
// absolute in context
location=URIUtil.canonicalPath(location);
}
else if (location.startsWith("/"))
buf.append(location);
else
{
String path = _channel.getRequest().getRequestURI();
String parent = (path.endsWith("/")) ? path : URIUtil.parentPath(path);
location = URIUtil.addPaths(parent, location);
if (location == null)
throw new IllegalStateException("path cannot be above root");
// relative to request
String path=_channel.getRequest().getRequestURI();
String parent=(path.endsWith("/"))?path:URIUtil.parentPath(path);
location=URIUtil.canonicalPath(URIUtil.addPaths(parent,location));
if (!location.startsWith("/"))
buf.append('/');
buf.append(location);
}
location = buf.toString();
HttpURI uri = new HttpURI(location);
String path = uri.getDecodedPath();
String canonical = URIUtil.canonicalPath(path);
if (canonical == null)
throw new IllegalArgumentException();
if (!canonical.equals(path))
{
buf = _channel.getRequest().getRootURL();
buf.append(URIUtil.encodePath(canonical));
String param=uri.getParam();
if (param!=null)
{
buf.append(';');
buf.append(param);
}
String query=uri.getQuery();
if (query!=null)
{
buf.append('?');
buf.append(query);
}
String fragment=uri.getFragment();
if (fragment!=null)
{
buf.append('#');
buf.append(fragment);
}
location = buf.toString();
}
if(location==null)
throw new IllegalStateException("path cannot be above root");
buf.append(location);
location=buf.toString();
}
resetBuffer();

3
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
View File

@ -476,7 +476,8 @@ public class ResponseTest
{"l%20cation", "http://@HOST@@PORT@/path/l%20cation"},
{"./l%20cation", "http://@HOST@@PORT@/path/l%20cation"},
{"../l%20cation","http://@HOST@@PORT@/l%20cation"},
{"../locati%C3%abn", "http://@HOST@@PORT@/locati%C3%ABn"},
{"../locati%C3%abn", "http://@HOST@@PORT@/locati%C3%abn"},
{"../other%2fplace", "http://@HOST@@PORT@/other%2fplace"},
{"http://somehost.com/other/location","http://somehost.com/other/location"},
};