stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance

Browse Source 
Reviewed-by: dfuchs
This commit is contained in:
Dhamoder Nalla 2023-06-07 09:50:08 +00:00 committed by Daniel Fuchs
parent 3ccb3c0e09
commit 749d480193
1 changed files with 29 additions and 9 deletions

38
src/java.base/share/classes/java/net/URI.java

@ -3276,6 +3276,7 @@ public final class URI
boolean serverChars;
boolean regChars;
boolean skipParseException;
if (scan(p, n, "]") > p) {
// contains a literal IPv6 address, therefore % is allowed
@ -3291,15 +3292,28 @@ public final class URI
return n;
}
// When parsing a URI, skip creating exception objects if the server-based
// authority is not required and the registry parse is successful.
//
skipParseException = (!requireServerAuthority && regChars);
if (serverChars) {
// Might be (probably is) a server-based authority, so attempt
// to parse it as such. If the attempt fails, try to treat it
// as a registry-based authority.
try {
q = parseServer(p, n);
if (q < n)
failExpecting("end of authority", q);
authority = input.substring(p, n);
q = parseServer(p, n, skipParseException);
if (q < n) {
if (skipParseException) {
userInfo = null;
host = null;
port = -1;
q = p;
} else {
failExpecting("end of authority", q);
}
} else {
authority = input.substring(p, n);
}
} catch (URISyntaxException x) {
// Undo results of failed parse
userInfo = null;
@ -3337,7 +3351,7 @@ public final class URI
// [<userinfo>@]<host>[:<port>]
//
private int parseServer(int start, int n)
private int parseServer(int start, int n, boolean skipParseException)
throws URISyntaxException
{
int p = start;
@ -3377,7 +3391,7 @@ public final class URI
} else {
q = parseIPv4Address(p, n);
if (q <= p)
q = parseHostname(p, n);
q = parseHostname(p, n, skipParseException);
p = q;
}
@ -3394,7 +3408,10 @@ public final class URI
}
p = q;
}
} else if (p < n && skipParseException) {
return p;
}
if (p < n)
failExpecting("port number", p);
@ -3497,7 +3514,7 @@ public final class URI
// domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
// toplabel = alpha | alpha *( alphanum | "-" ) alphanum
//
private int parseHostname(int start, int n)
private int parseHostname(int start, int n, boolean skipParseException)
throws URISyntaxException
{
int p = start;
@ -3523,9 +3540,12 @@ public final class URI
p = q;
} while (p < n);
if ((p < n) && !at(p, n, ':'))
if ((p < n) && !at(p, n, ':')) {
if (skipParseException) {
return p;
}
fail("Illegal character in hostname", p);
}
if (l < 0)
failExpecting("hostname", start);