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

8266459: Implement JEP 411: Deprecate the Security Manager for Removal

Browse source 
Co-authored-by: Sean Mullan <mullan@openjdk.org>
Co-authored-by: Lance Andersen <lancea@openjdk.org>
Co-authored-by: Weijun Wang <weijun@openjdk.org>
Reviewed-by: erikj, darcy, chegar, naoto, joehw, alanb, mchung, kcr, prr, lancea
This commit is contained in:
Weijun Wang 2021-06-02 11:57:31 +00:00
parent 19450b9951
commit 6765f90250
826 changed files with 2734 additions and 757 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/java/security/ProtectionDomain.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -73,6 +73,7 @@ public class ProtectionDomain {
private JavaSecurityAccessImpl() {
}
@SuppressWarnings("removal")
@Override
public <T> T doIntersectionPrivilege(
PrivilegedAction<T> action,
@ -88,6 +89,7 @@ public class ProtectionDomain {
);
}
@SuppressWarnings("removal")
@Override
public <T> T doIntersectionPrivilege(
PrivilegedAction<T> action,
@ -97,10 +99,11 @@ public class ProtectionDomain {
}
@Override
public ProtectionDomain[] getProtectDomains(AccessControlContext context) {
public ProtectionDomain[] getProtectDomains(@SuppressWarnings("removal") AccessControlContext context) {
return context.getContext();
}
@SuppressWarnings("removal")
private static AccessControlContext getCombinedACC(
AccessControlContext context, AccessControlContext stack) {
AccessControlContext acc =
@ -309,6 +312,7 @@ public class ProtectionDomain {
*
* @return true if {@code perm} is implied by this ProtectionDomain.
*/
@SuppressWarnings("removal")
public boolean implies(Permission perm) {
if (hasAllPerm) {
@ -363,6 +367,7 @@ public class ProtectionDomain {
boolean p2Calculated = false;
if (!staticPermissions) {
@SuppressWarnings("removal")
Policy policy = Policy.getPolicyNoCheck();
if (policy instanceof PolicyFile) {
// The PolicyFile implementation supports compatibility
@ -416,6 +421,7 @@ public class ProtectionDomain {
// Check if policy is set; we don't want to load
// the policy prematurely here
@SuppressWarnings("removal")
PermissionCollection pc = Policy.isSet() && seeAllp() ?
mergePermissions():
getPermissions();
@ -449,6 +455,7 @@ public class ProtectionDomain {
* debug is null,
* caller has Policy.getPolicy permission
*/
@SuppressWarnings("removal")
private static boolean seeAllp() {
SecurityManager sm = System.getSecurityManager();
@ -478,6 +485,7 @@ public class ProtectionDomain {
if (staticPermissions)
return permissions;
@SuppressWarnings("removal")
PermissionCollection perms =
java.security.AccessController.doPrivileged
(new java.security.PrivilegedAction<>() {