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

Issue #1480 Optimised canonicalPath implementation

This commit is contained in:
Greg Wilkins 2017-04-19 13:13:15 +10:00
parent 19f28a5a8c
commit 7e61570481
2 changed files with 105 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,8 +22,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.regex.Pattern;
import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception;
import org.eclipse.jetty.util.log.Log;
@ -47,7 +45,6 @@ public class URIUtil
public static final String SLASH="/";
public static final String HTTP="http";
public static final String HTTPS="https";
private static final Pattern __PATH_SPLIT = Pattern.compile("(?<=\\/)");
// 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 ;
@ -554,40 +551,105 @@ public class URIUtil
*/
public static String canonicalPath(String path)
{
if (path == null || path.isEmpty() || !path.contains("."))
if (path == null || path.isEmpty())
return path;
if(path.startsWith("/.."))
return null;
List<String> directories = new ArrayList<>();
Collections.addAll(directories, __PATH_SPLIT.split(path));
boolean slash = true;
int end = path.length();
int i = 0;
for(ListIterator<String> iterator = directories.listIterator(); iterator.hasNext();)
loop:
while (i<end)
{
switch (iterator.next()) {
case "./":
case ".":
if (iterator.hasNext() && directories.get(iterator.nextIndex()).equals("/"))
break;
iterator.remove();
char c = path.charAt(i);
switch(c)
{
case '/':
slash = true;
break;
case "../":
case "..":
if(iterator.previousIndex() == 0)
return null;
iterator.remove();
if(iterator.previous().equals("/") && iterator.nextIndex() == 0)
return null;
iterator.remove();
case '.':
if (slash)
break loop;
slash = false;
break;
case '?':
return path;
default:
slash = false;
}
i++;
}
return String.join("", directories);
if(i==end)
return path;
StringBuilder canonical = new StringBuilder(path.length());
canonical.append(path,0,i);
int dots = 1;
i++;
while (i<=end)
{
char c = i<end?path.charAt(i):'\0';
switch(c)
{
case '\0':
case '/':
case '?':
switch(dots)
{
case 0:
if (c!='\0')
canonical.append(c);
break;
case 1:
if (c=='?')
canonical.append(c);
break;
case 2:
if (canonical.length()<2)
return null;
canonical.setLength(canonical.length()-1);
canonical.setLength(canonical.lastIndexOf("/")+1);
if (c=='?')
canonical.append(c);
break;
default:
while (dots-->0)
canonical.append('.');
if (c!='\0')
canonical.append(c);
}
slash = true;
dots = 0;
break;
case '.':
if (dots>0)
dots++;
else if (slash)
dots = 1;
slash = false;
break;
default:
while (dots-->0)
canonical.append('.');
canonical.append(c);
dots = 0;
slash = false;
}
i++;
}
return canonical.toString();
}
/* ------------------------------------------------------------ */

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

@ -239,13 +239,15 @@ public class URIUtilTest
{"/aaa///bbb/","/aaa///bbb/"},
{"/aaa/./bbb/","/aaa/bbb/"},
{"/aaa/../bbb/","/bbb/"},
{"/aaa..bbb/","/aaa..bbb/"},
{"/aaa/..bbb/","/aaa/..bbb/"},
{"/aaa/./../bbb/","/bbb/"},
{"/aaa/bbb/ccc/../../ddd/","/aaa/ddd/"},
{"./bbb/","bbb/"},
{"./aaa/../bbb/","bbb/"},
{"./",""},
{".//",".//"},
{".///",".///"},
{".//","/"},
{".///","//"},
{"/.","/"},
{"//.","//"},
{"///.","///"},
@ -280,13 +282,20 @@ public class URIUtilTest
{"a/../..",null},
{"/foo/../../bar",null},
{"/foo/../bar//","/bar//"},
{"/....","/...."},
};
for (int t=0;t<canonical.length;t++)
{
assertEquals( "canonical "+canonical[t][0],
canonical[t][1],
URIUtil.canonicalPath(canonical[t][0])
);
canonical[t][1],
URIUtil.canonicalPath(canonical[t][0])
);
assertEquals( "canonical "+canonical[t][0]+"?a=1",
canonical[t][1]==null?null:(canonical[t][1]+"?a=1"),
URIUtil.canonicalPath(canonical[t][0]+"?a=1")
);
}
}