1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8156007: Refix: TestPolicy should extend the default security policy

Browse Source 
Reviewed-by: mchung, joehw
This commit is contained in:
Frank Yuan 2016-05-05 20:01:18 -07:00 committed by Frank Yuan
parent 88bfcfc1cb
commit c3a6242368
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jaxp/test/javax/xml/jaxp/libs/jaxp/library/TestPolicy.java
View File

@ -36,6 +36,7 @@ import java.util.Enumeration;
import java.util.PropertyPermission; import java.util.PropertyPermission;
import java.util.StringJoiner; import java.util.StringJoiner;
/* /*
* Simple Policy class that supports the required Permissions to validate the * Simple Policy class that supports the required Permissions to validate the
* JAXP concrete classes. * JAXP concrete classes.
@ -45,6 +46,8 @@ import java.util.StringJoiner;
public class TestPolicy extends Policy { public class TestPolicy extends Policy {
protected final PermissionCollection permissions = new Permissions(); protected final PermissionCollection permissions = new Permissions();
private static Policy defaultPolicy = Policy.getPolicy();
/** /**
* Constructor which sets the minimum permissions by default allowing testNG * Constructor which sets the minimum permissions by default allowing testNG
* to work with a SecurityManager. * to work with a SecurityManager.
@ -87,11 +90,8 @@ public class TestPolicy extends Policy {
"read")); "read"));
permissions.add(new PropertyPermission("user.dir", "read")); permissions.add(new PropertyPermission("user.dir", "read"));
permissions.add(new PropertyPermission("test.src", "read")); permissions.add(new PropertyPermission("test.src", "read"));
permissions.add(new PropertyPermission("file.separator", "read"));
permissions.add(new PropertyPermission("line.separator", "read"));
permissions.add(new PropertyPermission("fileStringBuffer", "read")); permissions.add(new PropertyPermission("fileStringBuffer", "read"));
permissions.add(new PropertyPermission("dataproviderthreadcount", "read")); permissions.add(new PropertyPermission("dataproviderthreadcount", "read"));
permissions.add(new RuntimePermission("charsetProvider"));
} }
/* /*
@ -145,6 +145,9 @@ public class TestPolicy extends Policy {
@Override @Override
public boolean implies(ProtectionDomain domain, Permission perm) { public boolean implies(ProtectionDomain domain, Permission perm) {
if (defaultPolicy.implies(domain, perm))
return true;
return permissions.implies(perm); return permissions.implies(perm);
} }
} }