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

8345223: Remove stray doPrivileged in java.base java.net and sun.net classes after JEP 486 integration

Browse source 
Reviewed-by: alanb, aefimov, michaelm
This commit is contained in:
Daniel Fuchs 2024-11-29 15:58:57 +00:00
parent a80ccf2cd2
commit e9136b5e08
6 changed files with 30 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
View file

@ -710,13 +710,13 @@ public class FtpClient extends sun.net.ftp.FtpClient {
} else if (address.isLoopbackAddress() && s.startsWith("127.")) { // can be 127.0
return new InetSocketAddress(s, port);
} else if (address.isLoopbackAddress()) {
if (privilegedLocalHost().getHostAddress().equals(s)) {
if (getLocalHost().getHostAddress().equals(s)) {
return new InetSocketAddress(s, port);
} else {
throw new FtpProtocolException(ERROR_MSG);
}
} else if (s.startsWith("127.")) {
if (privilegedLocalHost().equals(address)) {
if (getLocalHost().equals(address)) {
return new InetSocketAddress(s, port);
} else {
throw new FtpProtocolException(ERROR_MSG);
@ -724,7 +724,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
String hostName = address.getHostName();
if (!(IPAddressUtil.isIPv4LiteralAddress(hostName) || IPAddressUtil.isIPv6LiteralAddress(hostName))) {
InetAddress[] names = privilegedGetAllByName(hostName);
InetAddress[] names = getAllByName(hostName);
String resAddress = Arrays
.stream(names)
.map(InetAddress::getHostAddress)
@ -738,7 +738,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
throw new FtpProtocolException(ERROR_MSG);
}
private static InetAddress privilegedLocalHost() throws FtpProtocolException {
private static InetAddress getLocalHost() throws FtpProtocolException {
try {
return InetAddress.getLocalHost();
} catch (Exception e) {
@ -748,7 +748,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
}
private static InetAddress[] privilegedGetAllByName(String hostName) throws FtpProtocolException {
private static InetAddress[] getAllByName(String hostName) throws FtpProtocolException {
try {
return InetAddress.getAllByName(hostName);
} catch (Exception e) {