jdk-sandbox: comparison src/java.base/share/classes/sun/nio/ch/Net.java

equal deleted inserted replaced

-:203fceb089fc
+:692de65ab293
 */
 package sun.nio.ch;
 import java.io.FileDescriptor;
+import java.io.FilePermission;
 import java.io.IOException;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import sun.security.action.GetPropertyAction;
 public class Net {
-public Net() { }
+private Net() { }
-private static final boolean unixDomainSupported;
+private static final boolean unixDomainSupported =
-//private static final boolean abstractNamesSupported;
+unixDomainSocketSupported();
 // unspecified protocol family
-public static final ProtocolFamily UNSPEC = new ProtocolFamily() {
+static final ProtocolFamily UNSPEC = new ProtocolFamily() {
 public String name() {
 return "UNSPEC";
 }
 };
-static {
-unixDomainSupported = unixDomainSocketSupported();
-String name = GetPropertyAction.privilegedGetProperty("os.name")
-.toLowerCase();
-// Windows claims to support it but doesn't. Disable for now
-//abstractNamesSupported = name.startsWith("linux");
-//  || name.startsWith("windows");
-}
 // set to true if exclusive binding is on for Windows
 private static final boolean exclusiveBind;
 // set to true if the fast tcp loopback should be enabled on Windows
 }
 /**
 * Returns true if exclusive binding is on
 */
-public static boolean useExclusiveBind() {
+static boolean useExclusiveBind() {
 return exclusiveBind;
 }
 /**
 * Tells whether IPv6 sockets can join IPv4 multicast groups
 // -- Socket options
 static final ExtendedSocketOptions extendedOptions =
 ExtendedSocketOptions.getInstance();
-public static void setSocketOption(FileDescriptor fd, SocketOption<?> name, Object value)
+static void setSocketOption(FileDescriptor fd, SocketOption<?> name, Object value)
 throws IOException
 {
 setSocketOption(fd, Net.UNSPEC, name, value);
 }
-public static void setSocketOption(FileDescriptor fd, ProtocolFamily family,
+static void setSocketOption(FileDescriptor fd, ProtocolFamily family,
 SocketOption<?> name, Object value)
 throws IOException
 {
 if (value == null)
 throw new IllegalArgumentException("Invalid option value");
 boolean mayNeedConversion = (family == UNSPEC);
 boolean isIPv6 = (family == StandardProtocolFamily.INET6);
 setIntOption0(fd, mayNeedConversion, key.level(), key.name(), arg, isIPv6);
 }
-public static Object getSocketOption(FileDescriptor fd, SocketOption<?> name)
+static Object getSocketOption(FileDescriptor fd, SocketOption<?> name)
 throws IOException
 {
 return getSocketOption(fd, Net.UNSPEC, name);
 }
-public static Object getSocketOption(FileDescriptor fd, ProtocolFamily family, SocketOption<?> name)
+static Object getSocketOption(FileDescriptor fd, ProtocolFamily family, SocketOption<?> name)
 throws IOException
 {
 Class<?> type = name.type();
 if (extendedOptions.isOptionSupported(name)) {
 boolean preferIPv6 = isIPv6Available() &&
 (family != StandardProtocolFamily.INET);
 return IOUtil.newFD(socket0(preferIPv6, stream, false, fastLoopback));
 }
-public static FileDescriptor serverSocket(boolean stream) {
+static FileDescriptor serverSocket(boolean stream) {
 return IOUtil.newFD(socket0(isIPv6Available(), stream, true, fastLoopback));
 }
 // Due to oddities SO_REUSEADDR on windows reuse is ignored
 private static native int socket0(boolean preferIPv6, boolean stream, boolean reuse,
 private static native void bind0(FileDescriptor fd, boolean preferIPv6,
 boolean useExclBind, InetAddress addr,
 int port)
 throws IOException;
-public static native void listen(FileDescriptor fd, int backlog) throws IOException;
+static native void listen(FileDescriptor fd, int backlog) throws IOException;
 static int connect(FileDescriptor fd, InetAddress remote, int remotePort)
 throws IOException
 {
 return connect(UNSPEC, fd, remote, remotePort);
 public static final int SHUT_RD = 0;
 public static final int SHUT_WR = 1;
 public static final int SHUT_RDWR = 2;
-public static native void shutdown(FileDescriptor fd, int how) throws IOException;
+static native void shutdown(FileDescriptor fd, int how) throws IOException;
 private static native int localPort(FileDescriptor fd)
 throws IOException;
 private static native InetAddress localInetAddress(FileDescriptor fd)
 * Performs a non-blocking poll of a connecting socket to test if the
 * connection has been established.
 *
 * @return true if connected
 */
-public static boolean pollConnectNow(FileDescriptor fd) throws IOException {
+static boolean pollConnectNow(FileDescriptor fd) throws IOException {
 return pollConnect(fd, 0);
 }
 /**
 * Return the number of bytes in the socket input buffer.
 */
-public static native int available(FileDescriptor fd) throws IOException;
+static native int available(FileDescriptor fd) throws IOException;
 /**
 * Send one byte of urgent data (MSG_OOB) on the socket.
 */
 static native int sendOOB(FileDescriptor fd, byte data) throws IOException;
 * Event masks for the various poll system calls.
 * They will be set platform dependent in the static initializer below.
 */
 public static final short POLLIN;
 public static final short POLLOUT;
-public static boolean isUnixDomainSupported() {
-return unixDomainSupported;
-}
 public static UnixDomainSocketAddress checkUnixAddress(SocketAddress sa) {
 if (sa == null)
 throw new NullPointerException();
 if (!(sa instanceof UnixDomainSocketAddress))
 throw new UnsupportedAddressTypeException();
 UnixDomainSocketAddress usa = (UnixDomainSocketAddress)sa;
-//if (usa.isAbstract() && !abstractNamesSupported())
-//throw new UnsupportedAddressTypeException();
 return usa;
 }
-/**
+public static boolean isUnixDomainSupported() {
-* 2 methods to be implemented if fine-grained security to be used
+return unixDomainSupported;
-*/
+}
+private static UnixDomainSocketAddress UNNAMED = new UnixDomainSocketAddress("");
 static UnixDomainSocketAddress getRevealedLocalAddress(UnixDomainSocketAddress addr) {
+SecurityManager sm = System.getSecurityManager();
+if (addr == null || sm == null)
+return addr;
+try{
+FilePermission p = new FilePermission(addr.getPath(), "read");
+sm.checkPermission(p);
+// Security check passed
+} catch (SecurityException e) {
+// Return unnamed address only if security check fails
+addr = UNNAMED;
+}
 return addr;
 }
 static String getRevealedLocalAddressAsString(UnixDomainSocketAddress addr) {
-return addr.toString();
+return System.getSecurityManager() == null ? addr.toString() :
+UNNAMED.toString();
 }
 // -- Socket operations --
 public static FileDescriptor unixDomainSocket() throws IOException {
 return IOUtil.newFD(unixDomainSocket0());
 }
-public static native boolean unixDomainSocketSupported();
 private static native int unixDomainSocket0();
+private static native boolean unixDomainSocketSupported();
 static native void unixDomainBind(FileDescriptor fd, UnixDomainSocketAddress addr)
 throws IOException;
 static native int unixDomainConnect(FileDescriptor fd, UnixDomainSocketAddress remote)
 exclusiveBind = false;
 }
 fastLoopback = isFastTcpLoopbackRequested();
 }
 }

branch	unixdomainchannels
changeset 58847	692de65ab293
parent 58801	119ac9128c1b
child 58848	c3df0f8b6d93