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

8344185: Remove calls to SecurityManager in sun.net.ftp

Browse source 
Reviewed-by: alanb, michaelm, dfuchs
This commit is contained in:
Eirik Bjørsnøs 2024-11-15 09:47:43 +00:00
parent bfee766f03
commit 0c191f6629
3 changed files with 22 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,9 +44,6 @@ import java.net.Proxy;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketAddress;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.text.DateFormat;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
@ -133,31 +130,17 @@ public class FtpClient extends sun.net.ftp.FtpClient {
private DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, java.util.Locale.US);
private static final boolean acceptPasvAddressVal;
static {
final int vals[] = {0, 0};
final String acceptPasvAddress[] = {null};
@SuppressWarnings("removal")
final String enc = AccessController.doPrivileged(
new PrivilegedAction<String>() {
public String run() {
acceptPasvAddress[0] = System.getProperty("jdk.net.ftp.trustPasvAddress", "false");
vals[0] = Integer.getInteger("sun.net.client.defaultReadTimeout", 300_000).intValue();
vals[1] = Integer.getInteger("sun.net.client.defaultConnectTimeout", 300_000).intValue();
return System.getProperty("file.encoding", "ISO8859_1");
}
});
if (vals[0] == 0) {
defaultSoTimeout = Integer.getInteger("sun.net.client.defaultReadTimeout", 300_000).intValue();
if (defaultSoTimeout == 0) {
defaultSoTimeout = -1;
} else {
defaultSoTimeout = vals[0];
}
if (vals[1] == 0) {
defaultConnectTimeout = Integer.getInteger("sun.net.client.defaultConnectTimeout", 300_000).intValue();
if (defaultConnectTimeout == 0) {
defaultConnectTimeout = -1;
} else {
defaultConnectTimeout = vals[1];
}
encoding = enc;
encoding = System.getProperty("file.encoding", "ISO8859_1");
try {
if (!isASCIISuperset(encoding)) {
encoding = "ISO8859_1";
@ -171,7 +154,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
patterns[i] = Pattern.compile(patStrings[i]);
}
acceptPasvAddressVal = Boolean.parseBoolean(acceptPasvAddress[0]);
acceptPasvAddressVal = Boolean.getBoolean("jdk.net.ftp.trustPasvAddress");
}
/**
@ -662,10 +645,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
Socket s;
if (proxy != null) {
if (proxy.type() == Proxy.Type.SOCKS) {
PrivilegedAction<Socket> pa = () -> new Socket(proxy);
@SuppressWarnings("removal")
var tmp = AccessController.doPrivileged(pa);
s = tmp;
s = new Socket(proxy);
} else {
s = new Socket(Proxy.NO_PROXY);
}
@ -673,9 +653,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
s = new Socket();
}
PrivilegedAction<InetAddress> pa = () -> server.getLocalAddress();
@SuppressWarnings("removal")
InetAddress serverAddress = AccessController.doPrivileged(pa);
InetAddress serverAddress = server.getLocalAddress();
// Bind the socket to the same address as the control channel. This
// is needed in case of multi-homed systems.
@ -761,11 +739,8 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
private static InetAddress privilegedLocalHost() throws FtpProtocolException {
PrivilegedExceptionAction<InetAddress> action = InetAddress::getLocalHost;
try {
@SuppressWarnings("removal")
var tmp = AccessController.doPrivileged(action);
return tmp;
return InetAddress.getLocalHost();
} catch (Exception e) {
var ftpEx = new FtpProtocolException(ERROR_MSG);
ftpEx.initCause(e);
@ -774,11 +749,8 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
private static InetAddress[] privilegedGetAllByName(String hostName) throws FtpProtocolException {
PrivilegedExceptionAction<InetAddress[]> pAction = () -> InetAddress.getAllByName(hostName);
try {
@SuppressWarnings("removal")
var tmp =AccessController.doPrivileged(pAction);
return tmp;
return InetAddress.getAllByName(hostName);
} catch (Exception e) {
var ftpEx = new FtpProtocolException(ERROR_MSG);
ftpEx.initCause(e);
@ -1021,10 +993,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
Socket s;
if (proxy != null) {
if (proxy.type() == Proxy.Type.SOCKS) {
PrivilegedAction<Socket> pa = () -> new Socket(proxy);
@SuppressWarnings("removal")
var tmp = AccessController.doPrivileged(pa);
s = tmp;
s = new Socket(proxy);
} else {
s = new Socket(Proxy.NO_PROXY);
}