You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2010/06/24 10:08:33 UTC
svn commit: r957448 - in /incubator/river/jtsk/trunk/src:
net/jini/security/policy/ org/apache/river/api/security/
org/apache/river/imp/security/policy/cdc/
org/apache/river/imp/security/policy/concurrent/
org/apache/river/imp/security/policy/util/
Author: peter_firmstone
Date: Thu Jun 24 08:08:31 2010
New Revision: 957448
URL: http://svn.apache.org/viewvc?rev=957448&view=rev
Log:
River-340 Further Refactoring
Modified:
incubator/river/jtsk/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java
incubator/river/jtsk/trunk/src/org/apache/river/api/security/RevokeablePolicy.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/concurrent/DynamicConcurrentPolicyProvider.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrantBuilder.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java
Modified: incubator/river/jtsk/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java Thu Jun 24 08:08:31 2010
@@ -222,10 +222,6 @@ public class DynamicPolicyProvider exten
public Permission[] getGrants(Class cl, Principal[] principals) {
return instance.getGrants(cl, principals);
}
-
- public void revoke(Class cl, Principal[] principals, Permission[] permissions) {
- instance.revoke(cl, principals, permissions);
- }
@Override
public PermissionCollection getPermissions(CodeSource codesource) {
Modified: incubator/river/jtsk/trunk/src/org/apache/river/api/security/RevokeablePolicy.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/api/security/RevokeablePolicy.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/api/security/RevokeablePolicy.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/api/security/RevokeablePolicy.java Thu Jun 24 08:08:31 2010
@@ -23,15 +23,21 @@ import net.jini.security.policy.DynamicP
*/
public interface RevokeablePolicy extends DynamicPolicy {
- /**
- * ClassLoader based permission revocation.
+ /*
+ * ClassLoader based permission revocation is broken and cannot be fixed.
+ * It will be removed shortly.
+ *
+ * The reason is if a Permission is granted to a CodeSource or Certificate's loaded into
+ * a ClassLoader, then that Permission will not be revokeable for that
+ * ClassLoader.
+ *
* @param cl
* @param principals
* @param permissions
* @throws java.lang.UnsupportedOperationException
*/
- public void revoke(Class cl, Principal[] principals, Permission[] permissions)
- throws UnsupportedOperationException;
+// public void revoke(Class cl, Principal[] principals, Permission[] permissions)
+// throws UnsupportedOperationException;
/**
* Revokes permissions based on CodeSource and Principals.
* @param cs
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java Thu Jun 24 08:08:31 2010
@@ -562,9 +562,6 @@ public class DynamicPolicyProviderImpl e
}
}
- public void revoke(Class cl, Principal[] principals, Permission[] permissions) {
- throw new UnsupportedOperationException("Revoke not supported.");
- }
public boolean revokeSupported() {
return false;
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/concurrent/DynamicConcurrentPolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/concurrent/DynamicConcurrentPolicyProvider.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/concurrent/DynamicConcurrentPolicyProvider.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/concurrent/DynamicConcurrentPolicyProvider.java Thu Jun 24 08:08:31 2010
@@ -36,6 +36,8 @@ import net.jini.security.policy.PolicyIn
import org.apache.river.api.security.RevokePermission;
import org.apache.river.imp.security.policy.spi.RevokeableDynamicPolicySpi;
import org.apache.river.api.security.RevokeablePolicy;
+import org.apache.river.imp.security.policy.util.PermissionGrant;
+import org.apache.river.imp.security.policy.util.PermissionGrantBuilder;
import org.apache.river.imp.security.policy.util.PolicyEntry;
import org.apache.river.imp.security.policy.util.PolicyUtils;
import org.apache.river.imp.util.ConcurrentWeakIdentityMap;
@@ -119,7 +121,7 @@ public class DynamicConcurrentPolicyProv
private final ReentrantReadWriteLock rwl;
private final ReadLock rl;
private final WriteLock wl;
- private final Set<PolicyEntry> dynamicGrants; // protected by rwl
+ private final Set<PermissionGrant> dynamicGrants; // protected by rwl
private volatile Policy basePolicy; // effectively final looks after its own sync
private final ConcurrentMap<ProtectionDomain, PermissionCollection> cache;
private volatile boolean basePolicyIsDynamic; // Don't use cache if true.
@@ -135,7 +137,7 @@ public class DynamicConcurrentPolicyProv
rwl = new ReentrantReadWriteLock();
rl = rwl.readLock();
wl = rwl.writeLock();
- dynamicGrants = new HashSet<PolicyEntry>(30);
+ dynamicGrants = new HashSet<PermissionGrant>(30);
basePolicy = null;
cache = new ConcurrentWeakIdentityMap<ProtectionDomain, PermissionCollection>();
basePolicyIsDynamic = false;
@@ -195,7 +197,8 @@ public class DynamicConcurrentPolicyProv
cache.putIfAbsent(own, mypc);
}
- public void revoke(Class cl, Principal[] principals, Permission[] permissions) {
+ public void revoke(CodeSource cs, Principal[] principals,
+ Permission[] permissions) {
if (initialized == false) throw new RuntimeException("Object not initialized");
if (permissions == null) return;
SecurityManager sm = System.getSecurityManager();
@@ -206,7 +209,7 @@ public class DynamicConcurrentPolicyProv
// Revoke not supported unless the base policy supports it.
if (revokeable){
RevokeablePolicy rp = (RevokeablePolicy) basePolicy;
- rp.revoke(cl, principals, permissions);
+ rp.revoke(cs, principals, permissions);
}
return;
}
@@ -217,7 +220,6 @@ public class DynamicConcurrentPolicyProv
* possible to prevent possible deadlocks, increase concurrency at the
* risk of possible positive implies() the the mean time.
*/
- ClassLoader loader = cl.getClassLoader();
if ( principals != null && principals.length > 0) {
principals = principals.clone();
checkNullElements(principals);
@@ -227,23 +229,27 @@ public class DynamicConcurrentPolicyProv
permissions = permissions.clone();
checkNullElements(permissions);
Collection<Permission> permToBeRemoved = Arrays.asList(permissions);
- Collection<PolicyEntry> removed = new HashSet<PolicyEntry>();
+ Collection<PermissionGrant> removed = new HashSet<PermissionGrant>();
try {
wl.lock();
- Iterator<PolicyEntry> it = dynamicGrants.iterator();
+ Iterator<PermissionGrant> it = dynamicGrants.iterator();
while (it.hasNext()) {
- PolicyEntry ge = it.next();
+ PermissionGrant ge = it.next();
// This ignores ServiceItem's context as we want to capture
// and remove all grants that may be granted by other means.
// such as ProtectionDomain or Principals alone.
// When we have Certificates we might want to check that
// too because otherwise we might remove a grant that doesn't
// imply or apply.
- if ( ge.impliesPrincipals(loader == null ? null : principals)
- && ge.impliesClassLoader(loader)) {
+// if ( ge.impliesPrincipals(loader == null ? null : principals)
+// && ge.impliesClassLoader(loader)) {
+// removed.add(ge);
+// it.remove();
+// }
+ if ( ge.implies(cs, principals)) {
removed.add(ge);
it.remove();
- }
+ }
}
if (removed.isEmpty()) return; // nothing to do.
} finally { wl.unlock(); }
@@ -251,14 +257,16 @@ public class DynamicConcurrentPolicyProv
* The cache will populate itself again correctly when implies() is
* called on that PermissionDomain again.
*/
- Collection<PolicyEntry> prevail = new HashSet<PolicyEntry>(removed.size());
- Iterator<PolicyEntry> pdIterator = removed.iterator();
+ Collection<PermissionGrant> prevail = new HashSet<PermissionGrant>(removed.size());
+ Iterator<PermissionGrant> pdIterator = removed.iterator();
while (pdIterator.hasNext()){
- PolicyEntry pe = pdIterator.next();
+ PermissionGrant pe = pdIterator.next();
cache.remove(pe);
Collection<Permission> p = pe.getPermissions();
p.removeAll(permToBeRemoved);
- prevail.add(new PolicyEntry(pe, p));
+ PermissionGrantBuilder pgb = pe.getBuilderTemplate();
+ pgb.permissions(p.toArray(new Permission[p.size()]));
+ prevail.add(pgb.build());
}
/* We must re-enter the remaining grants if any exist. */
try {
@@ -333,9 +341,9 @@ public class DynamicConcurrentPolicyProv
Collection<Permission> dynamicallyGrantedPermissions = new HashSet<Permission>();
try {
rl.lock();
- Iterator<PolicyEntry> it = dynamicGrants.iterator();
+ Iterator<PermissionGrant> it = dynamicGrants.iterator();
while (it.hasNext()) {
- PolicyEntry ge = it.next();
+ PermissionGrant ge = it.next();
if ( ge.implies(domain)) {
dynamicallyGrantedPermissions.addAll( ge.getPermissions());
}
@@ -382,9 +390,9 @@ public class DynamicConcurrentPolicyProv
// Clean up any void grants.
try {
wl.lock();
- Iterator<PolicyEntry> it = dynamicGrants.iterator();
+ Iterator<PermissionGrant> it = dynamicGrants.iterator();
while (it.hasNext()){
- PolicyEntry pe = it.next();
+ PermissionGrant pe = it.next();
if ( pe.isVoid()){
it.remove();
}
@@ -423,13 +431,11 @@ public class DynamicConcurrentPolicyProv
if (sm != null) {
sm.checkPermission(new GrantPermission(permissions));
}
- Collection<Principal> pal = Arrays.asList(principals);
- Collection<Permission> perm = Arrays.asList(permissions);
- ProtectionDomain domain = null;
- if ( cl != null){
- domain = getDomain(cl);
- }
- PolicyEntry pe = new PolicyEntry(domain, context, pal, perm);
+ PermissionGrantBuilder pgb = new PermissionGrantBuilder();
+ PermissionGrant pe = pgb.clazz(cl).principals(principals)
+ .permissions(permissions)
+ .context(context)
+ .build();
if (loggable){
logger.log(Level.FINEST, "Granting: " + pe.toString());
}
@@ -454,19 +460,21 @@ public class DynamicConcurrentPolicyProv
Collection<Permission> cperms = new HashSet();
try {
wl.lock();
- Iterator<PolicyEntry> it = dynamicGrants.iterator();
+ Iterator<PermissionGrant> it = dynamicGrants.iterator();
while (it.hasNext()) {
- PolicyEntry ge = it.next();
+ PermissionGrant ge = it.next();
// This ignores ServiceItem's context as we want to capture
- // and remove all grants that may be granted by other means.
+ // all grants that may be granted by other means.
// such as ProtectionDomain or Principals alone.
// When we have Certificates we might want to check that
- // too because otherwise we might remove a grant that doesn't
- // imply or apply.
- if ( ge.impliesPrincipals(loader == null ? null : principals)
- && ge.impliesClassLoader(loader)) {
+ // too.
+// if ( ge.impliesPrincipals(loader == null ? null : principals)
+// && ge.impliesClassLoader(loader)) {
+// cperms.addAll(ge.getPermissions());
+// }
+ if ( ge.implies(loader, principals)) {
cperms.addAll(ge.getPermissions());
- }
+ }
}
} finally { wl.unlock(); }
Permission[] perms = cperms.toArray(new Permission[cperms.size()]);
@@ -512,11 +520,6 @@ public class DynamicConcurrentPolicyProv
return pd;
}
- public void revoke(CodeSource cs, Principal[] principals,
- Permission[] permissions) throws UnsupportedOperationException {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
public void grantCodeSource(CodeSource cs, Principal[] principals,
Permission[] permissions) throws UnsupportedOperationException {
if (initialized == false) throw new RuntimeException("Object not initialized");
@@ -542,9 +545,13 @@ public class DynamicConcurrentPolicyProv
if (sm != null) {
sm.checkPermission(new GrantPermission(permissions));
}
- Collection<Principal> pal = Arrays.asList(principals);
- Collection<Permission> perm = Arrays.asList(permissions);
- PolicyEntry pe = new PolicyEntry(cs, pal, perm);
+ PermissionGrantBuilder pgb = new PermissionGrantBuilder();
+ PermissionGrant pe = pgb
+ .codeSource(cs)
+ .principals(principals)
+ .permissions(permissions)
+ .context(PermissionGrantBuilder.CODESOURCE)
+ .build();
if (loggable){
logger.log(Level.FINEST, "Granting: " + pe.toString());
}
@@ -556,7 +563,7 @@ public class DynamicConcurrentPolicyProv
public void grantProtectionDomain(Class cl, Permission[] permissions)
throws UnsupportedOperationException {
- grant(cl, PolicyEntry.PROTECTIONDOMAIN, (Principal[]) null, permissions);
+ grant(cl, PermissionGrantBuilder.PROTECTIONDOMAIN, (Principal[]) null, permissions);
}
public void revokeProtectionDomain(Class cl, Permission[] permissions)
@@ -589,9 +596,13 @@ public class DynamicConcurrentPolicyProv
if (sm != null) {
sm.checkPermission(new GrantPermission(permissions));
}
- Collection<Principal> pal = Arrays.asList(principals);
- Collection<Permission> perm = Arrays.asList(permissions);
- PolicyEntry pe = new PolicyEntry(certs, pal, perm);
+ PermissionGrantBuilder pgb = new PermissionGrantBuilder();
+ PermissionGrant pe = pgb
+ .certificates(certs)
+ .principals(principals)
+ .permissions(permissions)
+ .context(PermissionGrantBuilder.CODESOURCE_CERTS)
+ .build();
if (loggable){
logger.log(Level.FINEST, "Granting: " + pe.toString());
}
@@ -607,7 +618,7 @@ public class DynamicConcurrentPolicyProv
}
public void grant(Class cl, Principal[] principals, Permission[] permissions) {
- grant(cl, PolicyEntry.CLASSLOADER, principals, permissions);
+ grant(cl, PermissionGrantBuilder.CLASSLOADER, principals, permissions);
}
}
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java Thu Jun 24 08:08:31 2010
@@ -45,6 +45,26 @@ class CertificateGrant extends CodeSourc
}
}
+ @Override
+ public boolean equals(Object o){
+ if (o == null) return false;
+ if (o == this) return true;
+ if (o instanceof CertificateGrant){
+ CertificateGrant c = (CertificateGrant) o;
+ if ( !super.equals(o)) return false;
+ if (certs.equals(c.certs)) return true;
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 83 * hash + (this.certs != null ? this.certs.hashCode() : 0);
+ hash = 83 * hash + (super.hashCode());
+ return hash;
+ }
+
@Override
public boolean implies(ProtectionDomain pd) {
Certificate[] c = null;
@@ -71,4 +91,11 @@ class CertificateGrant extends CodeSourc
List<Certificate> certificates = Arrays.asList(codeSource.getCertificates());
return certificates.containsAll(certs);
}
+
+ @Override
+ public PermissionGrantBuilder getBuilderTemplate() {
+ PermissionGrantBuilder pgb = super.getBuilderTemplate();
+ return pgb.certificates(certs.toArray(new Certificate[certs.size()]))
+ .context(PermissionGrantBuilder.CODESOURCE_CERTS);
+ }
}
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java Thu Jun 24 08:08:31 2010
@@ -34,6 +34,24 @@ class ClassLoaderGrant extends Protectio
Permission[] perm){
super(domain, groups, perm);
}
+
+ @Override
+ public boolean equals(Object o){
+ if (o == null) return false;
+ if (o == this) return true;
+ if (o instanceof ClassLoaderGrant){
+ ClassLoaderGrant c = (ClassLoaderGrant) o;
+ if ( super.equals(o)) return true;
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 19 * hash + super.hashCode();
+ return hash;
+ }
@Override
public boolean implies(ProtectionDomain pd) {
@@ -46,4 +64,9 @@ class ClassLoaderGrant extends Protectio
return implies(cl, pals);
}
+ @Override
+ public PermissionGrantBuilder getBuilderTemplate() {
+ PermissionGrantBuilder pgb = super.getBuilderTemplate();
+ return pgb.context(PermissionGrantBuilder.CLASSLOADER);
+ }
}
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java Thu Jun 24 08:08:31 2010
@@ -47,6 +47,27 @@ class CodeSourceGrant extends PrincipalG
this.permissions.addAll(Arrays.asList(perm));
}
}
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 67 * hash + (this.cs != null ? this.cs.hashCode() : 0);
+ hash = 67 * hash + (this.permissions != null ? this.permissions.hashCode() : 0);
+ hash = 67 * hash + (super.hashCode());
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object o){
+ if (o == null) return false;
+ if (o == this) return true;
+ if (o instanceof CodeSourceGrant){
+ CodeSourceGrant c = (CodeSourceGrant) o;
+ if ( !super.equals(o)) return false;
+ if (cs.equals(c.cs) && permissions.equals(c.permissions)) return true;
+ }
+ return false;
+ }
/**
* Checks if passed CodeSource matches this PolicyEntry. Null CodeSource of
@@ -92,4 +113,11 @@ class CodeSourceGrant extends PrincipalG
return false;
}
+ @Override
+ public PermissionGrantBuilder getBuilderTemplate() {
+ PermissionGrantBuilder pgb = super.getBuilderTemplate();
+ return pgb.codeSource(cs)
+ .permissions(permissions.toArray(new Permission[permissions.size()]))
+ .context(PermissionGrantBuilder.CODESOURCE);
+ }
}
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrant.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrant.java Thu Jun 24 08:08:31 2010
@@ -65,6 +65,12 @@ public interface PermissionGrant {
*/
public Collection<Permission> getPermissions();
/**
+ * Provides a builder that will replicate the PermissionGrant. Useful
+ * when you want to change the Permission's but not the
+ * context.
+ */
+ public PermissionGrantBuilder getBuilderTemplate();
+ /**
* Returns true if this PermissionGrant defines no Permissions, or if
* a PermissionGrant was made to a ProtectionDomain that no longer exists.
*/
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrantBuilder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrantBuilder.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrantBuilder.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PermissionGrantBuilder.java Thu Jun 24 08:08:31 2010
@@ -118,20 +118,26 @@ public class PermissionGrantBuilder {
* @param cl
* @return
*/
- public PermissionGrantBuilder clazz(Class cl){
- domain = new WeakReference<ProtectionDomain>(cl.getProtectionDomain());
- if (cs == null){
- cs = domain.get().getCodeSource();
- }
- if (certs == null){
- certs = domain.get().getCodeSource().getCertificates();
- }
- if (principals == null){
- principals = domain.get().getPrincipals();
+ public PermissionGrantBuilder clazz(Class cl){
+ if (cl != null){
+ domain = new WeakReference<ProtectionDomain>(cl.getProtectionDomain());
+ if (cs == null){
+ cs = domain.get().getCodeSource();
+ }
+ if (certs == null){
+ certs = domain.get().getCodeSource().getCertificates();
+ }
+ if (principals == null){
+ principals = domain.get().getPrincipals();
+ }
}
return this;
}
+ public PermissionGrantBuilder domain(WeakReference<ProtectionDomain> pd){
+ domain = pd;
+ }
+
/**
* Set the Certificate's for the PermissionGrant.
* @param certs
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java Thu Jun 24 08:08:31 2010
@@ -36,19 +36,37 @@ import java.util.List;
* @author Peter Firmstone.
*/
abstract class PrincipalGrant implements PermissionGrant {
- private final Collection<Principal> principals;
+ private final Collection<Principal> principals;
@SuppressWarnings("unchecked")
- protected PrincipalGrant(Principal[] pals){
- if ( pals != null ){
- principals = new ArrayList<Principal>(pals.length);
- principals.addAll(Arrays.asList(pals));
- }else {
- principals = Collections.EMPTY_LIST;
- }
-
+ protected PrincipalGrant(Principal[] pals){
+ if ( pals != null ){
+ principals = new ArrayList<Principal>(pals.length);
+ principals.addAll(Arrays.asList(pals));
+ }else {
+ principals = Collections.EMPTY_LIST;
}
+
+ }
+
+ @Override
+ public boolean equals(Object o){
+ if (o == null) return false;
+ if (o == this) return true;
+ if (o instanceof PrincipalGrant ){
+ PrincipalGrant p = (PrincipalGrant) o;
+ if (principals.equals(p.principals)) return true;
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 97 * hash + (this.principals != null ? this.principals.hashCode() : 0);
+ return hash;
+ }
- public boolean implies(Principal[] prs) {
+ public boolean implies(Principal[] prs) {
if ( principals.isEmpty()) return true;
if ( prs == null || prs.length == 0 ) return false;
// PolicyEntry Principals match if equal or if they are Groups and
@@ -122,4 +140,8 @@ abstract class PrincipalGrant implements
protected abstract boolean impliesCodeSource(CodeSource codeSource);
+ public PermissionGrantBuilder getBuilderTemplate() {
+ PermissionGrantBuilder pgb = new PermissionGrantBuilder();
+ return pgb.principals(principals.toArray(new Principal[principals.size()]));
+ }
}
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java?rev=957448&r1=957447&r2=957448&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java Thu Jun 24 08:08:31 2010
@@ -57,6 +57,29 @@ class ProtectionDomainGrant extends Prin
}
}
+ @Override
+ public boolean equals(Object o){
+ if (o == null) return false;
+ if (o == this) return true;
+ if (o instanceof ProtectionDomainGrant){
+ ProtectionDomainGrant c = (ProtectionDomainGrant) o;
+ if ( !super.equals(o)) return false;
+ if (domain.equals(c.domain) && permissions.equals(c.permissions)
+ && hasDomain == c.hasDomain) return true;
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 13 * hash + (this.hasDomain ? 1 : 0);
+ hash = 13 * hash + (this.domain != null ? this.domain.hashCode() : 0);
+ hash = 13 * hash + (this.permissions != null ? this.permissions.hashCode() : 0);
+ hash = 13 * hash + super.hashCode();
+ return hash;
+ }
+
/*
* Checks if passed ProtectionDomain matches this PolicyEntry. Null ProtectionDomain of
* PolicyEntry implies any ProtectionDomain; non-null ProtectionDomain's are
@@ -107,5 +130,13 @@ class ProtectionDomainGrant extends Prin
if (hasDomain == true && domain.get() == null) return true;
return false;
}
+
+ public PermissionGrantBuilder getBuilderTemplate() {
+ PermissionGrantBuilder pgb = super.getBuilderTemplate();
+ return pgb
+ .domain(domain)
+ .permissions(permissions.toArray(new Permission[permissions.size()]))
+ .context(PermissionGrantBuilder.PROTECTIONDOMAIN);
+ }
}