archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8293590: Some syntax checks performed by URL.openConnection() could be performed earlier, at URL construction

Browse source 
Reviewed-by: jpai, michaelm
This commit is contained in:
Daniel Fuchs 2022-10-18 14:30:51 +00:00
parent 78fed9d307
commit bd41428a56
4 changed files with 638 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/java.base/share/classes/java/net/URLStreamHandler.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -504,10 +504,23 @@ public abstract class URLStreamHandler {
String query, String ref) {
if (this != u.handler) {
throw new SecurityException("handler for url different from " +
"this handler");
} else if (host != null && u.isBuiltinStreamHandler(this)) {
String s = IPAddressUtil.checkHostString(host);
if (s != null) throw new IllegalArgumentException(s);
"this handler");
}
// if early parsing, perform additional checks here rather than waiting
// for openConnection()
boolean earlyURLParsing = IPAddressUtil.earlyURLParsing();
boolean isBuiltInHandler = u.isBuiltinStreamHandler(this);
if (host != null && isBuiltInHandler) {
String errMsg = IPAddressUtil.checkHostString(host);
if (errMsg != null) throw new IllegalArgumentException(errMsg);
}
if (userInfo != null && isBuiltInHandler && earlyURLParsing) {
String errMsg = IPAddressUtil.checkUserInfo(userInfo);
if (errMsg != null) throw new IllegalArgumentException(errMsg);
}
if (authority != null && isBuiltInHandler && earlyURLParsing) {
String errMsg = IPAddressUtil.checkAuth(authority);
if (errMsg != null) throw new IllegalArgumentException(errMsg);
}
// ensure that no one can reset the protocol on a given URL.
u.set(u.getProtocol(), host, port, authority, userInfo, path, query, ref);