summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKorov <korov9@163.com>2024-03-02 21:46:59 +0800
committerKorov <korov9@163.com>2024-03-02 21:46:59 +0800
commit9ebd6e1279d7fc23ee1683070453ac1cd43f9868 (patch)
treeddd4a19f9b0d44c88d3f8192f16a9753f1912c15
parenta07280d4960218f2e884cd93462d31fea6db9ede (diff)
Modiy the code accordingto the reviewpr/18086
-rw-r--r--src/java.base/share/classes/java/net/SocketPermission.java15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/java.base/share/classes/java/net/SocketPermission.java b/src/java.base/share/classes/java/net/SocketPermission.java
index 544c7df7497..34a75f58cbb 100644
--- a/src/java.base/share/classes/java/net/SocketPermission.java
+++ b/src/java.base/share/classes/java/net/SocketPermission.java
@@ -178,7 +178,7 @@ public final class SocketPermission extends Permission
/**
* No actions
*/
- private static final int NONE = 0x0;
+ private static final int NONE = 0x0;
/**
* All actions
@@ -225,8 +225,6 @@ public final class SocketPermission extends Permission
// port range on host
private transient int[] portrange;
- private transient boolean defaultDeny = false;
-
// true if this SocketPermission represents a hostname
// that failed our reverse mapping heuristic test
private transient boolean untrusted;
@@ -300,10 +298,6 @@ public final class SocketPermission extends Permission
init(getName(), mask);
}
- private void setDeny() {
- defaultDeny = true;
- }
-
private static String getHost(String host) {
if (host.isEmpty()) {
return "localhost";
@@ -611,14 +605,13 @@ public final class SocketPermission extends Permission
if (trusted) return false;
if (invalid || untrusted) return true;
try {
- if (!trustNameService && (defaultDeny ||
- sun.net.www.URLConnection.isProxiedHost(hostname))) {
+ if (!trustNameService && sun.net.www.URLConnection.isProxiedHost(hostname)) {
if (this.cname == null) {
this.getCanonName();
}
if (!match(cname, hostname)) {
// Last chance
- if (!authorized(hostname, addresses[0].getAddress())) {
+ if (!authorized(addresses[0].getAddress())) {
untrusted = true;
Debug debug = getDebug();
if (debug != null && Debug.isOn("failure")) {
@@ -704,7 +697,7 @@ public final class SocketPermission extends Permission
return !cdomain.isEmpty() && !hdomain.isEmpty() && cdomain.equals(hdomain);
}
- private boolean authorized(String cname, byte[] addr) {
+ private boolean authorized(byte[] addr) {
if (addr.length == 4)
return authorizedIPv4(addr);
else if (addr.length == 16)