Added proper security check for Bundle.getEntry()/getEntryPath()/getResource().
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@375271 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java
index 161b1de..dcb81d4 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java
@@ -178,4 +178,13 @@
// TODO: Implement Bundle.findEntries()
return null;
}
+
+ public boolean equals(Object obj)
+ {
+ if (obj instanceof BundleImpl)
+ {
+ return (((BundleImpl) obj).getInfo().getBundleId() == getInfo().getBundleId());
+ }
+ return false;
+ }
}
\ No newline at end of file
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
index 01820b0..a202c51 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -961,7 +961,16 @@
}
else if (System.getSecurityManager() != null)
{
- AccessController.checkPermission(m_adminPerm);
+ try
+ {
+ AccessController.checkPermission(
+ new AdminPermission(bundle, AdminPermission.RESOURCE));
+ }
+ catch (SecurityException ex)
+ {
+ // Spec says to return null if there is a security exception.
+ return null;
+ }
}
return bundle.getInfo().getCurrentModule().getResource(name);
}
@@ -975,10 +984,18 @@
{
throw new IllegalStateException("The bundle is uninstalled.");
}
-// TODO: SECURITY - Implement correct check.
else if (System.getSecurityManager() != null)
{
- AccessController.checkPermission(m_adminPerm);
+ try
+ {
+ AccessController.checkPermission(
+ new AdminPermission(bundle, AdminPermission.RESOURCE));
+ }
+ catch (SecurityException ex)
+ {
+ // Spec says to return null if there is a security exception.
+ return null;
+ }
}
return ((ContentLoaderImpl) bundle.getInfo().getCurrentModule()
.getContentLoader()).getResourceFromContent(name);
@@ -993,10 +1010,18 @@
{
throw new IllegalStateException("The bundle is uninstalled.");
}
-// TODO: SECURITY - Implement correct check.
else if (System.getSecurityManager() != null)
{
- AccessController.checkPermission(m_adminPerm);
+ try
+ {
+ AccessController.checkPermission(
+ new AdminPermission(bundle, AdminPermission.RESOURCE));
+ }
+ catch (SecurityException ex)
+ {
+ // Spec says to return null if there is a security exception.
+ return null;
+ }
}
// Strip leading '/' if present.
if (path.charAt(0) == '/')