[jboss-svn-commits] JBoss Common SVN: r3705 - in shrinkwrap/trunk/impl-base/src: test/java/org/jboss/shrinkwrap/impl/base/asset and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Nov 15 08:17:43 EST 2009
Author: aslak
Date: 2009-11-15 08:17:43 -0500 (Sun, 15 Nov 2009)
New Revision: 3705
Added:
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/SecurityActions.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/SecurityActions.java
Modified:
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassAsset.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/TestUtils.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/UrlAssetTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
Log:
SHRINKWRAP-59 Ensured use of Privileged actions when operating on TCCL and Reflection calls for both impl and test cases
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassAsset.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassAsset.java 2009-11-15 13:05:43 UTC (rev 3704)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassAsset.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -75,7 +75,7 @@
*/
ClassLoader classLoader= clazz.getClassLoader();
if(classLoader == null) {
- classLoader = Thread.currentThread().getContextClassLoader();
+ classLoader = SecurityActions.getThreadContextClassLoader();
}
return new ClassLoaderAsset(getResourceNameOfClass(clazz), classLoader).openStream();
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/TestUtils.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/TestUtils.java 2009-11-15 13:05:43 UTC (rev 3704)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/TestUtils.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -85,7 +85,7 @@
static int findLengthOfClass(Class<?> clazz) throws Exception
{
String classResourceName = getResourceNameForClass(clazz);
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(classResourceName);
+ InputStream in = SecurityActions.getThreadContextClassLoader().getResourceAsStream(classResourceName);
return findLengthOfStream(in);
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/UrlAssetTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/UrlAssetTestCase.java 2009-11-15 13:05:43 UTC (rev 3704)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/UrlAssetTestCase.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -38,7 +38,7 @@
@Test
public void shouldBeAbleToReadURL() throws Exception
{
- Asset asset = new UrlAsset(Thread.currentThread().getContextClassLoader().getResource(EXISTING_RESOURCE));
+ Asset asset = new UrlAsset(SecurityActions.getThreadContextClassLoader().getResource(EXISTING_RESOURCE));
InputStream io = asset.openStream();
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java 2009-11-15 13:05:43 UTC (rev 3704)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -42,7 +42,7 @@
Archive<?> archive = Archives.create("test.jar", ExplodedImporter.class)
.importDirectory(
- Thread.currentThread().getContextClassLoader()
+ SecurityActions.getThreadContextClassLoader()
.getResource(EXISTING_DIRECTORY_RESOURCE).toURI().getPath()
)
.as(JavaArchive.class);
@@ -65,7 +65,7 @@
Archives.create("test.jar", ExplodedImporter.class)
.importDirectory(
- Thread.currentThread().getContextClassLoader()
+ SecurityActions.getThreadContextClassLoader()
.getResource(EXISTING_FILE_RESOURCE).toURI().getPath()
);
}
Added: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/SecurityActions.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/SecurityActions.java (rev 0)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/SecurityActions.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.shrinkwrap.impl.base.importer;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * SecurityActions
+ *
+ * A set of privileged actions that are not to leak out
+ * of this package
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+final class SecurityActions
+{
+
+ //-------------------------------------------------------------------------------||
+ // Constructor ------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------||
+
+ /**
+ * No external instantiation
+ */
+ private SecurityActions()
+ {
+
+ }
+
+ //-------------------------------------------------------------------------------||
+ // Utility Methods --------------------------------------------------------------||
+ //-------------------------------------------------------------------------------||
+
+ /**
+ * Obtains the Thread Context ClassLoader
+ */
+ static ClassLoader getThreadContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java 2009-11-15 13:05:43 UTC (rev 3704)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -74,7 +74,7 @@
{
ZipFile testZip = new ZipFile(
new File(
- Thread.currentThread().getContextClassLoader().getResource(EXISTING_ZIP_RESOURCE).toURI()));
+ SecurityActions.getThreadContextClassLoader().getResource(EXISTING_ZIP_RESOURCE).toURI()));
Archive<?> archive = Archives.create("test.jar", ZipImporter.class)
.importZip(testZip)
@@ -84,7 +84,7 @@
assertContent(
archive,
- Thread.currentThread().getContextClassLoader().getResource(EXISTING_ZIP_RESOURCE).toURI());
+ SecurityActions.getThreadContextClassLoader().getResource(EXISTING_ZIP_RESOURCE).toURI());
}
@@ -92,7 +92,7 @@
public void shouldBeAbleToImportAddAndExport() throws Exception
{
ZipInputStream stream = new ZipInputStream(
- Thread.currentThread().getContextClassLoader().getResourceAsStream(EXISTING_ZIP_RESOURCE));
+ SecurityActions.getThreadContextClassLoader().getResourceAsStream(EXISTING_ZIP_RESOURCE));
Archive<?> archive = Archives.create("test.jar", ZipImporter.class)
.importZip(stream)
@@ -114,7 +114,7 @@
public void shouldBeAbleToImportZipInputStream() throws Exception
{
ZipInputStream stream = new ZipInputStream(
- Thread.currentThread().getContextClassLoader().getResourceAsStream(EXISTING_ZIP_RESOURCE));
+ SecurityActions.getThreadContextClassLoader().getResourceAsStream(EXISTING_ZIP_RESOURCE));
Archive<?> archive = Archives.create("test.jar", ZipImporter.class)
.importZip(stream)
@@ -124,7 +124,7 @@
assertContent(
archive,
- Thread.currentThread().getContextClassLoader().getResource(EXISTING_ZIP_RESOURCE).toURI());
+ SecurityActions.getThreadContextClassLoader().getResource(EXISTING_ZIP_RESOURCE).toURI());
}
/**
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java 2009-11-15 13:05:43 UTC (rev 3704)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -56,7 +56,7 @@
protected abstract LibraryContainer<T> getLibraryContainer();
protected URL getURLForClassResource(String name) {
- return Thread.currentThread().getContextClassLoader().getResource(name);
+ return SecurityActions.getThreadContextClassLoader().getResource(name);
}
protected File getFileForClassResource(String name) throws Exception {
Added: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/SecurityActions.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/SecurityActions.java (rev 0)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/SecurityActions.java 2009-11-15 13:17:43 UTC (rev 3705)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.shrinkwrap.impl.base.test;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * SecurityActions
+ *
+ * A set of privileged actions that are not to leak out
+ * of this package
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+final class SecurityActions
+{
+
+ //-------------------------------------------------------------------------------||
+ // Constructor ------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------||
+
+ /**
+ * No external instantiation
+ */
+ private SecurityActions()
+ {
+
+ }
+
+ //-------------------------------------------------------------------------------||
+ // Utility Methods --------------------------------------------------------------||
+ //-------------------------------------------------------------------------------||
+
+ /**
+ * Obtains the Thread Context ClassLoader
+ */
+ static ClassLoader getThreadContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+}
More information about the jboss-svn-commits
mailing list