471464 - Parsing issues with HttpURI
+ Adding documented and annotated tests cases showing problems (Note: some tests are @Ignore'd at the moment)
This commit is contained in:
Joakim Erdfelt
parent
4897fd605d
commit
f3fe4331c4
|
|
@ -21,8 +21,10 @@ package org.eclipse.jetty.http;
|
|||
|
||||
import static org.hamcrest.Matchers.*;
|
||||
import static org.junit.Assert.*;
|
||||
import static org.junit.Assume.*;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -43,12 +45,23 @@ public class HttpURIParseTest
|
|||
public static List<String[]> data()
|
||||
{
|
||||
String[][] tests = {
|
||||
|
||||
// Basic path reference
|
||||
|
||||
{"/path/to/context",null,null,"-1","/path/to/context",null,null,null},
|
||||
|
||||
// Basic with encoded query
|
||||
|
||||
{"http://example.com/path/to/context;param?query=%22value%22#fragment","http","example.com","-1","/path/to/context;param","param","query=%22value%22","fragment"},
|
||||
{"http://[::1]/path/to/context;param?query=%22value%22#fragment","http","[::1]","-1","/path/to/context;param","param","query=%22value%22","fragment"},
|
||||
|
||||
// Basic with parameters and query
|
||||
|
||||
{"http://example.com:8080/path/to/context;param?query=%22value%22#fragment","http","example.com","8080","/path/to/context;param","param","query=%22value%22","fragment"},
|
||||
{"http://[::1]:8080/path/to/context;param?query=%22value%22#fragment","http","[::1]","8080","/path/to/context;param","param","query=%22value%22","fragment"},
|
||||
|
||||
// Path References
|
||||
|
||||
{"/path/info",null,null,null,"/path/info",null,null,null},
|
||||
{"/path/info#fragment",null,null,null,"/path/info",null,null,"fragment"},
|
||||
{"/path/info?query",null,null,null,"/path/info",null,"query",null},
|
||||
|
|
@ -57,10 +70,17 @@ public class HttpURIParseTest
|
|||
{"/path/info;param#fragment",null,null,null,"/path/info;param","param",null,"fragment"},
|
||||
{"/path/info;param?query",null,null,null,"/path/info;param","param","query",null},
|
||||
{"/path/info;param?query#fragment",null,null,null,"/path/info;param","param","query","fragment"},
|
||||
|
||||
// Protocol Less (aka scheme-less) URIs
|
||||
|
||||
// FIXME (these have host and port)
|
||||
{"//host/path/info",null,null,null,"//host/path/info",null,null,null},
|
||||
{"//user@host/path/info",null,null,null,"//user@host/path/info",null,null,null},
|
||||
{"//user@host:8080/path/info",null,null,null,"//user@host:8080/path/info",null,null,null},
|
||||
{"//host:8080/path/info",null,null,null,"//host:8080/path/info",null,null,null},
|
||||
|
||||
// Host Less
|
||||
|
||||
{"http:/path/info","http",null,null,"/path/info",null,null,null},
|
||||
{"http:/path/info#fragment","http",null,null,"/path/info",null,null,"fragment"},
|
||||
{"http:/path/info?query","http",null,null,"/path/info",null,"query",null},
|
||||
|
|
@ -69,33 +89,95 @@ public class HttpURIParseTest
|
|||
{"http:/path/info;param#fragment","http",null,null,"/path/info;param","param",null,"fragment"},
|
||||
{"http:/path/info;param?query","http",null,null,"/path/info;param","param","query",null},
|
||||
{"http:/path/info;param?query#fragment","http",null,null,"/path/info;param","param","query","fragment"},
|
||||
|
||||
// Everything and the kitchen sink
|
||||
|
||||
// FIXME ("user@" authentication information is lost during parse and toString)
|
||||
{"http://user@host:8080/path/info;param?query#fragment","http","host","8080","/path/info;param","param","query","fragment"},
|
||||
{"xxxxx://user@host:8080/path/info;param?query#fragment","xxxxx","host","8080","/path/info;param","param","query","fragment"},
|
||||
|
||||
// No host, parameter with no content
|
||||
|
||||
// FIXME (no host, should result in null for host, not empty string)
|
||||
{"http:///;?#","http","",null,"/;","","",""},
|
||||
|
||||
// Path with query that has no value
|
||||
|
||||
{"/path/info?a=?query",null,null,null,"/path/info",null,"a=?query",null},
|
||||
|
||||
// Path with query alt syntax
|
||||
|
||||
{"/path/info?a=;query",null,null,null,"/path/info",null,"a=;query",null},
|
||||
|
||||
// Scheme-less, with host and port (overlapping with path)
|
||||
|
||||
// FIXME (this has host and port)
|
||||
{"//host:8080//",null,null,null,"//host:8080//",null,null,null},
|
||||
|
||||
// File reference
|
||||
|
||||
// FIXME (no host, should result in null for host, not empty string)
|
||||
{"file:///path/info","file","",null,"/path/info",null,null,null},
|
||||
{"file:/path/info","file",null,null,"/path/info",null,null,null},
|
||||
|
||||
// Without Authority (this is a bad URI according to spec)
|
||||
|
||||
{"//",null,null,null,"//",null,null,null},
|
||||
|
||||
// Simple Localhost references
|
||||
|
||||
{"http://localhost/","http","localhost",null,"/",null,null,null},
|
||||
{"http://localhost:8080/", "http", "localhost","8080","/", null, null,null},
|
||||
{"http://localhost/?x=y", "http", "localhost",null,"/", null,"x=y",null},
|
||||
|
||||
// Simple path with parameter
|
||||
|
||||
{"/;param",null, null,null,"/;param", "param",null,null},
|
||||
|
||||
// Simple path with query
|
||||
|
||||
{"/?x=y",null, null,null,"/", null,"x=y",null},
|
||||
{"/?abc=test",null, null,null,"/", null,"abc=test",null},
|
||||
|
||||
// Simple path with fragment
|
||||
|
||||
{"/#fragment",null, null,null,"/", null,null,"fragment"},
|
||||
|
||||
// Simple IPv4 host with port (default path)
|
||||
|
||||
{"http://192.0.0.1:8080/","http","192.0.0.1","8080","/",null,null,null},
|
||||
|
||||
// Simple IPv6 host with port (default path)
|
||||
|
||||
{"http://[2001:db8::1]:8080/","http","[2001:db8::1]","8080","/",null,null,null},
|
||||
|
||||
// IPv6 authenticated host with port (default path)
|
||||
|
||||
// FIXME ("user@" authentication information is lost during parse and toString)
|
||||
{"http://user@[2001:db8::1]:8080/","http","[2001:db8::1]","8080","/",null,null,null},
|
||||
|
||||
// Simple IPv6 host no port (default path)
|
||||
|
||||
{"http://[2001:db8::1]/","http","[2001:db8::1]",null,"/",null,null,null},
|
||||
|
||||
// Scheme-less IPv6, host with port (default path)
|
||||
|
||||
// FIXME (this has host and port)
|
||||
{"//[2001:db8::1]:8080/",null,null,null,"//[2001:db8::1]:8080/",null,null,null},
|
||||
{"http://user@[2001:db8::1]:8080/","http","[2001:db8::1]","8080","/",null,null,null},
|
||||
|
||||
// Interpreted as relative path of "*" (no host/port/scheme/query/fragment)
|
||||
|
||||
{"*",null,null,null,"*",null, null,null},
|
||||
|
||||
// Path detection Tests (seen from JSP/JSTL and <c:url> use
|
||||
{"http://host:8080/path/info?q1=v1&q2=v2","http","host","8080","/path/info",null,"q1=v1&q2=v2",null},
|
||||
{"/path/info?q1=v1&q2=v2",null,null,null,"/path/info",null,"q1=v1&q2=v2",null},
|
||||
{"/info?q1=v1&q2=v2",null,null,null,"/info",null,"q1=v1&q2=v2",null},
|
||||
// FIXME (Bad Path/Query results) {"info?q1=v1&q2=v2",null,null,null,"info",null,"q1=v1&q2=v2",null},
|
||||
// FIXME (StringIndexOutOfBoundsException) {"info;q1=v1?q2=v2",null,null,null,"info;q1=v1",null,"q2=v2",null},
|
||||
|
||||
// Path-less, query only (seen from JSP/JSTL and <c:url> use
|
||||
// FIXME (path should be null in parse(URI) version)
|
||||
{"?q1=v1&q2=v2",null,null,null,null,null,"q1=v1&q2=v2",null}
|
||||
};
|
||||
|
||||
|
|
@ -131,47 +213,69 @@ public class HttpURIParseTest
|
|||
{
|
||||
HttpURI httpUri = new HttpURI(input);
|
||||
|
||||
assertThat("["+input+"] .scheme", httpUri.getScheme(), is(scheme));
|
||||
assertThat("["+input+"] .host", httpUri.getHost(), is(host));
|
||||
assertThat("["+input+"] .port", httpUri.getPort(), is(port==null?-1:Integer.parseInt(port)));
|
||||
assertThat("["+input+"] .path", httpUri.getPath(), is(path));
|
||||
assertThat("["+input+"] .param", httpUri.getParam(), is(param));
|
||||
assertThat("["+input+"] .query", httpUri.getQuery(), is(query));
|
||||
assertThat("["+input+"] .fragment", httpUri.getFragment(), is(fragment));
|
||||
assertThat("["+input+"] .toString", httpUri.toString(), is(input));
|
||||
assertThat("[" + input + "] .scheme",httpUri.getScheme(),is(scheme));
|
||||
assertThat("[" + input + "] .host",httpUri.getHost(),is(host));
|
||||
assertThat("[" + input + "] .port",httpUri.getPort(),is(port == null ? -1 : Integer.parseInt(port)));
|
||||
assertThat("[" + input + "] .path",httpUri.getPath(),is(path));
|
||||
assertThat("[" + input + "] .param",httpUri.getParam(),is(param));
|
||||
assertThat("[" + input + "] .query",httpUri.getQuery(),is(query));
|
||||
assertThat("[" + input + "] .fragment",httpUri.getFragment(),is(fragment));
|
||||
assertThat("[" + input + "] .toString",httpUri.toString(),is(input));
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("There are many examples of inconsistent results from .testParseString()")
|
||||
public void testParseURI() throws Exception
|
||||
{
|
||||
URI javaUri = new URI(input);
|
||||
HttpURI httpUri = new HttpURI(javaUri);
|
||||
URI javaUri = null;
|
||||
try
|
||||
{
|
||||
javaUri = new URI(input);
|
||||
assumeNotNull(javaUri);
|
||||
}
|
||||
catch (URISyntaxException e)
|
||||
{
|
||||
// Ignore, as URI is invalid anyway
|
||||
assumeNoException(e);
|
||||
}
|
||||
|
||||
assertThat("["+input+"] .scheme", httpUri.getScheme(), is(scheme));
|
||||
assertThat("["+input+"] .host", httpUri.getHost(), is(host));
|
||||
assertThat("["+input+"] .port", httpUri.getPort(), is(port==null?-1:Integer.parseInt(port)));
|
||||
assertThat("["+input+"] .path", httpUri.getPath(), is(path));
|
||||
assertThat("["+input+"] .param", httpUri.getParam(), is(param));
|
||||
assertThat("["+input+"] .query", httpUri.getQuery(), is(query));
|
||||
assertThat("["+input+"] .fragment", httpUri.getFragment(), is(fragment));
|
||||
assertThat("["+input+"] .toString", httpUri.toString(), is(input));
|
||||
HttpURI httpUri = new HttpURI(javaUri);
|
||||
|
||||
assertThat("[" + input + "] .scheme",httpUri.getScheme(),is(scheme));
|
||||
assertThat("[" + input + "] .host",httpUri.getHost(),is(host));
|
||||
assertThat("[" + input + "] .port",httpUri.getPort(),is(port == null ? -1 : Integer.parseInt(port)));
|
||||
assertThat("[" + input + "] .path",httpUri.getPath(),is(path));
|
||||
assertThat("[" + input + "] .param",httpUri.getParam(),is(param));
|
||||
assertThat("[" + input + "] .query",httpUri.getQuery(),is(query));
|
||||
assertThat("[" + input + "] .fragment",httpUri.getFragment(),is(fragment));
|
||||
assertThat("[" + input + "] .toString",httpUri.toString(),is(input));
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("There are many examples of inconsistent results from .testParseString()")
|
||||
public void testCompareToJavaNetURI() throws Exception
|
||||
{
|
||||
URI javaUri = new URI(input);
|
||||
URI javaUri = null;
|
||||
try
|
||||
{
|
||||
javaUri = new URI(input);
|
||||
assumeNotNull(javaUri);
|
||||
}
|
||||
catch (URISyntaxException e)
|
||||
{
|
||||
// Ignore, as URI is invalid anyway
|
||||
assumeNoException(e);
|
||||
}
|
||||
|
||||
HttpURI httpUri = new HttpURI(javaUri);
|
||||
|
||||
assertThat("["+input+"] .scheme", httpUri.getScheme(), is(javaUri.getScheme()));
|
||||
assertThat("["+input+"] .host", httpUri.getHost(), is(javaUri.getHost()));
|
||||
assertThat("["+input+"] .port", httpUri.getPort(), is(javaUri.getPort()));
|
||||
assertThat("["+input+"] .path", httpUri.getPath(), is(javaUri.getPath()));
|
||||
// Not Relevant for java.net.URI assertThat("["+input+"] .param", httpUri.getParam(), is(param));
|
||||
assertThat("["+input+"] .query", httpUri.getQuery(), is(javaUri.getRawQuery()));
|
||||
assertThat("["+input+"] .fragment", httpUri.getFragment(), is(javaUri.getFragment()));
|
||||
assertThat("["+input+"] .toString", httpUri.toString(), is(javaUri.toASCIIString()));
|
||||
assertThat("[" + input + "] .scheme",httpUri.getScheme(),is(javaUri.getScheme()));
|
||||
assertThat("[" + input + "] .host",httpUri.getHost(),is(javaUri.getHost()));
|
||||
assertThat("[" + input + "] .port",httpUri.getPort(),is(javaUri.getPort()));
|
||||
assertThat("[" + input + "] .path",httpUri.getPath(),is(javaUri.getPath()));
|
||||
// Not Relevant for java.net.URI -- assertThat("["+input+"] .param", httpUri.getParam(), is(param));
|
||||
assertThat("[" + input + "] .query",httpUri.getQuery(),is(javaUri.getRawQuery()));
|
||||
assertThat("[" + input + "] .fragment",httpUri.getFragment(),is(javaUri.getFragment()));
|
||||
assertThat("[" + input + "] .toString",httpUri.toString(),is(javaUri.toASCIIString()));
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue