Skip to content
Permalink
Browse files
8245828: Remove unnecessary NetworkPermission checks from jdk/net/Ext…
…endedSocketOptions.java

This fix removes NetworkPermission checks that were made redundant in jdk/net/ExtendedSocketOptions after the socket option SO_FLOW_SLA was removed.

Reviewed-by: alanb
  • Loading branch information
pconcannon committed Jun 9, 2020
1 parent 59428f4 commit 5b6f050fcebcb5ef188f75ab185c2bbd88e05f1a
Showing 3 changed files with 30 additions and 9 deletions.
@@ -217,10 +217,6 @@ public void setOption(FileDescriptor fd,
Object value)
throws SocketException
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkPermission(new NetworkPermission("setOption." + option.name()));

if (fd == null || !fd.valid())
throw new SocketException("socket closed");

@@ -248,10 +244,6 @@ public Object getOption(FileDescriptor fd,
SocketOption<?> option)
throws SocketException
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkPermission(new NetworkPermission("getOption." + option.name()));

if (fd == null || !fd.valid())
throw new SocketException("socket closed");

@@ -31,6 +31,7 @@
* @run main/othervm -Djdk.net.usePlainDatagramSocketImpl OptionsTest
* @run main/othervm -Xcheck:jni -Djava.net.preferIPv4Stack=true OptionsTest
* @run main/othervm --limit-modules=java.base OptionsTest
* @run main/othervm/policy=options.policy OptionsTest
*/

import java.lang.reflect.Method;
@@ -343,7 +344,7 @@ public static void main(String args[]) throws Exception {
static Object getServerSocketTrafficClass(ServerSocket ss) throws Exception {
try {
Class<?> c = Class.forName("jdk.net.Sockets");
Method m = c.getDeclaredMethod("getOption", ServerSocket.class, SocketOption.class);
Method m = c.getMethod("getOption", ServerSocket.class, SocketOption.class);
return m.invoke(null, ss, StandardSocketOptions.IP_TOS);
} catch (ClassNotFoundException e) {
// Ok, jdk.net module not present, just fall back
@@ -0,0 +1,28 @@
//
// Copyright (c) 2020, 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
// under the terms of the GNU General Public License version 2 only, as
// published by the Free Software Foundation.
//
// This code is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// version 2 for more details (a copy is included in the LICENSE file that
// accompanied this code).
//
// You should have received a copy of the GNU General Public License version
// 2 along with this work; if not, write to the Free Software Foundation,
// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
//
// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
// or visit www.oracle.com if you need additional information or have any
// questions.
//

grant {
permission java.net.SocketPermission "localhost:*", "connect, accept, listen, resolve";
permission java.util.PropertyPermission "java.net.preferIPv4Stack", "read";
permission java.util.PropertyPermission "java.net.preferIPv6Addresses", "read";
};

0 comments on commit 5b6f050

Please sign in to comment.