You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2012/03/09 11:57:25 UTC
svn commit: r1298787 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
Author: kristwaa
Date: Fri Mar 9 10:57:25 2012
New Revision: 1298787
URL: http://svn.apache.org/viewvc?rev=1298787&view=rev
Log:
DERBY-5631: Extend SecurityManagerSetup to add extra privileges to the set of default privileges (merge two policy files)
Added missing privileged block in conversion from File -> URI -> URL -> String.
Replaced a block of code with an existing utility method.
Patch file: derby-5631-1f-merge_policy_files_fix-priv.diff
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java?rev=1298787&r1=1298786&r2=1298787&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java Fri Mar 9 10:57:25 2012
@@ -27,7 +27,9 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.security.AccessController;
import java.security.Policy;
+import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.Enumeration;
import java.util.Properties;
@@ -247,7 +249,7 @@ public final class SecurityManagerSetup
return;
// and install
- AccessController.doPrivileged(new java.security.PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -269,21 +271,13 @@ public final class SecurityManagerSetup
set.setProperty("java.security.policy", policyResource);
return;
}
- URL policyURL = BaseTestCase.getTestResource(policyResource);
-
- // maybe the passed in resource was an URL to begin with
- if ( policyURL == null )
- {
- try { policyURL = new URL( policyResource ); }
- catch (Exception e) { System.out.println( "Unreadable url: " + policyResource ); }
- }
-
- if (policyURL != null) {
- set.setProperty("java.security.policy",
- policyURL.toExternalForm());
+ try {
+ URL policyURL = getResourceURL(policyResource);
+ set.setProperty("java.security.policy", policyURL.toExternalForm());
+ } catch (MalformedURLException mue) {
+ BaseTestCase.alarm("Unreadable policy URL: " + policyResource);
}
}
-
/**
* Determine the settings of the classpath in order to configure
@@ -442,7 +436,7 @@ public final class SecurityManagerSetup
static URL getURL(final Class cl)
{
return (URL)
- AccessController.doPrivileged(new java.security.PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -467,7 +461,7 @@ public final class SecurityManagerSetup
AccessController.doPrivileged
(
- new java.security.PrivilegedAction()
+ new PrivilegedAction()
{
public Object run() {
System.setSecurityManager(null);
@@ -548,7 +542,7 @@ public final class SecurityManagerSetup
// Read the contents of both policy files and write them out to
// a new policy file. Construct a somewhat informative file name.
- File mergedPF = new File(varDir,
+ final File mergedPF = new File(varDir,
new File(policy2.getPath()).getName() +
"-MERGED_WITH-" +
new File(policy1.getPath()).getName());
@@ -567,7 +561,16 @@ public final class SecurityManagerSetup
}
i2.close();
o.close();
- return mergedPF.toURI().toURL().toExternalForm();
+ try {
+ return (String)
+ AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ public Object run() throws MalformedURLException {
+ return mergedPF.toURI().toURL().toExternalForm();
+ }
+ });
+ } catch (PrivilegedActionException pae) {
+ throw (MalformedURLException)pae.getException();
+ }
}
/** Opens the resource stream in a privileged block. */
@@ -575,7 +578,7 @@ public final class SecurityManagerSetup
throws IOException {
try {
return (InputStream)AccessController.doPrivileged(
- new java.security.PrivilegedExceptionAction(){
+ new PrivilegedExceptionAction(){
public Object run() throws IOException {
return resource.openStream();
}
@@ -589,7 +592,7 @@ public final class SecurityManagerSetup
/** Creates the specified directory if it doesn't exist. */
private static void mkdir(final File dir) {
AccessController.doPrivileged(
- new java.security.PrivilegedAction(){
+ new PrivilegedAction(){
public Object run(){
if (!dir.exists() && !dir.mkdir()) {
fail("failed to create directory: " + dir.getPath());