[jboss-cvs] JBossAS SVN: r72458 - in projects/security/security-jboss-sx/trunk/jbosssx/src: main/org/jboss/security and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 18 20:20:01 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-04-18 20:20:01 -0400 (Fri, 18 Apr 2008)
New Revision: 72458
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/AbstractPasswordCredentialLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/CallerIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/GetPrincipalInfoAction.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/PBEIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SecureIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SubjectActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRoleRef.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationModuleEntry.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/SecurityConfigObjectModelFactory.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/resources/JavaEEResource.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/config/IdentityTrustModuleEntry.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestAuthConfigProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestClientAuthConfig.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestServerAuthConfig.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthZMgrSafetyUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthorizationManagerUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/acl/JBossAuthorizationManagerACLUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/ejb/EJBAuthorizationUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/web/WebAuthorizationUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/client/JBossSecurityClientTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/IdentityUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/SubjectInfoUnitTestCase.java
Log:
SECURITY-198: security helper implementation and other cleanup
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/AbstractPasswordCredentialLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/AbstractPasswordCredentialLoginModule.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/AbstractPasswordCredentialLoginModule.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -22,6 +22,7 @@
package org.jboss.resource.security;
import java.util.Map;
+
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/CallerIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/CallerIdentityLoginModule.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/CallerIdentityLoginModule.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -21,18 +21,19 @@
*/
package org.jboss.resource.security;
+import java.security.Principal;
import java.security.acl.Group;
-import java.security.Principal;
import java.util.Map;
import java.util.Set;
+
import javax.resource.spi.security.PasswordCredential;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
+import org.jboss.logging.Logger;
+import org.jboss.security.RunAsIdentity;
import org.jboss.security.SimplePrincipal;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.logging.Logger;
/**
* A simple login module that simply associates the principal making the
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/GetPrincipalInfoAction.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/GetPrincipalInfoAction.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/GetPrincipalInfoAction.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -21,13 +21,13 @@
*/
package org.jboss.resource.security;
+import java.io.UnsupportedEncodingException;
import java.security.AccessController;
+import java.security.Principal;
import java.security.PrivilegedAction;
-import java.security.Principal;
-import java.io.UnsupportedEncodingException;
+import org.jboss.security.RunAsIdentity;
import org.jboss.security.SecurityAssociation;
-import org.jboss.security.RunAsIdentity;
/** PrivilegedActions used by this package
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -21,21 +21,22 @@
*/
package org.jboss.resource.security;
-import java.security.acl.Group;
+import java.security.AccessController;
import java.security.Principal;
+import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
+import java.security.acl.Group;
import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
import javax.resource.spi.security.PasswordCredential;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
+import org.jboss.logging.Logger;
import org.jboss.security.SimplePrincipal;
-import org.jboss.logging.Logger;
/** A login module for statically defining a data source username and password
that uses a password that has been ecrypted by a JaasSecurityDomain. The
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/PBEIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/PBEIdentityLoginModule.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/PBEIdentityLoginModule.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -21,23 +21,24 @@
*/
package org.jboss.resource.security;
+import java.security.Principal;
import java.security.acl.Group;
-import java.security.Principal;
import java.util.Map;
-import javax.resource.spi.security.PasswordCredential;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.LoginException;
+
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
+import javax.resource.spi.security.PasswordCredential;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginException;
+import org.jboss.logging.Logger;
import org.jboss.security.Base64Utils;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.Util;
-import org.jboss.logging.Logger;
/** An example of how one could encrypt the database password for a jca
connection factory. The corresponding login config entry illustrates
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SecureIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SecureIdentityLoginModule.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SecureIdentityLoginModule.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -21,24 +21,25 @@
*/
package org.jboss.resource.security;
+import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
import java.security.acl.Group;
-import java.security.Principal;
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidKeyException;
import java.util.Map;
-import java.math.BigInteger;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.SecretKeySpec;
import javax.resource.spi.security.PasswordCredential;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
+import org.jboss.logging.Logger;
import org.jboss.security.SimplePrincipal;
-import org.jboss.logging.Logger;
/** An example of how one could encrypt the database password for a jca
connection factory. The corresponding
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SubjectActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SubjectActions.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/resource/security/SubjectActions.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -27,6 +27,7 @@
import java.security.acl.Group;
import java.util.Iterator;
import java.util.Set;
+
import javax.resource.spi.ManagedConnectionFactory;
import javax.resource.spi.security.PasswordCredential;
import javax.security.auth.Subject;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -27,8 +27,6 @@
import javax.security.auth.Subject;
-import org.jboss.security.SecurityContextAssociation;
-
/** A PrivilegedAction implementation for setting the SecurityAssociation
* principal and credential
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRoleRef.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRoleRef.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRoleRef.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -29,84 +29,6 @@
* @since Jul 21, 2006
* @version $Revision$
*/
-public class SecurityRoleRef
+public class SecurityRoleRef extends org.jboss.security.javaee.SecurityRoleRef
{
- private String name;
- private String link;
- private String description;
-
- public SecurityRoleRef()
- {
- }
-
- public SecurityRoleRef(String name, String link)
- {
- this.name = name;
- this.link = link;
- }
-
- public SecurityRoleRef(String name, String link, String description)
- {
- this.name = name;
- this.link = link;
- this.description = description;
- }
-
- /**
- * Get the description.
- *
- * @return the description.
- */
- public String getDescription()
- {
- return description;
- }
-
- /**
- * Set the description.
- */
- public void setDescription(String desc)
- {
- this.description = desc;
- }
-
- /**
- * Get the link.
- * @return link
- */
- public String getLink()
- {
- return this.link;
- }
-
-
- /**
- * Set the link.
- */
- public void setLink(String l)
- {
- this.link = l;
- }
-
-
- /**
- * Get the name.
- *
- * @return the name.
- */
- public String getName()
- {
- return this.name;
- }
-
-
- /**
- * Set the name.
- *
- * @return the name.
- */
- public void setName(String n)
- {
- this.name = n;
- }
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -25,7 +25,7 @@
import java.util.Map;
import javax.xml.namespace.QName;
-
+
import org.jboss.security.config.ModuleOption;
import org.jboss.xb.binding.GenericValueContainer;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -26,8 +26,8 @@
import javax.xml.namespace.QName;
+import org.jboss.security.config.ControlFlag;
import org.jboss.security.config.ModuleOption;
-import org.jboss.security.config.ControlFlag;
import org.jboss.xb.binding.GenericValueContainer;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationModuleEntry.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationModuleEntry.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationModuleEntry.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -24,8 +24,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.jboss.security.config.ControlFlag;
import org.jboss.security.config.ModuleOption;
-import org.jboss.security.config.ControlFlag;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/SecurityConfigObjectModelFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/SecurityConfigObjectModelFactory.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/SecurityConfigObjectModelFactory.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -24,13 +24,13 @@
import org.jboss.logging.Logger;
import org.jboss.security.audit.config.AuditProviderEntry;
import org.jboss.security.auth.login.LoginConfigObjectModelFactory;
-import org.jboss.security.config.ModuleOption;
import org.jboss.security.config.ApplicationPolicy;
import org.jboss.security.config.AuditInfo;
import org.jboss.security.config.AuthorizationInfo;
import org.jboss.security.config.ControlFlag;
import org.jboss.security.config.IdentityTrustInfo;
import org.jboss.security.config.MappingInfo;
+import org.jboss.security.config.ModuleOption;
import org.jboss.security.identitytrust.config.IdentityTrustModuleEntry;
import org.jboss.security.mapping.config.MappingModuleEntry;
import org.jboss.util.StringPropertyReplacer;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -143,7 +143,7 @@
authorizationDecision = delegate.authorize(resource,this.subject, this.role);
}
catch(Exception e)
- {
+ {
log.debug("Error with delegate:",e);
IllegalStateException ise = new IllegalStateException(e.getLocalizedMessage());
ise.initCause(e);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -33,7 +33,6 @@
import org.jboss.security.AnybodyPrincipal;
import org.jboss.security.RunAs;
import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityRoleRef;
import org.jboss.security.authorization.AuthorizationContext;
import org.jboss.security.authorization.PolicyRegistration;
import org.jboss.security.authorization.Resource;
@@ -44,6 +43,7 @@
import org.jboss.security.identity.RoleGroup;
import org.jboss.security.identity.plugins.SimpleRole;
import org.jboss.security.identity.plugins.SimpleRoleGroup;
+import org.jboss.security.javaee.SecurityRoleRef;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/resources/JavaEEResource.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/resources/JavaEEResource.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/resources/JavaEEResource.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -30,9 +30,9 @@
import javax.security.auth.Subject;
import org.jboss.security.RunAs;
-import org.jboss.security.SecurityRoleRef;
import org.jboss.security.authorization.Resource;
import org.jboss.security.authorization.ResourceType;
+import org.jboss.security.javaee.SecurityRoleRef;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -27,9 +27,9 @@
import javax.security.auth.login.LoginException;
import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SecurityContextFactory;
import org.jboss.security.SimplePrincipal;
-import org.jboss.security.SecurityContextAssociation;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/config/IdentityTrustModuleEntry.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/config/IdentityTrustModuleEntry.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/config/IdentityTrustModuleEntry.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -24,8 +24,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.jboss.security.config.ControlFlag;
import org.jboss.security.config.ModuleOption;
-import org.jboss.security.config.ControlFlag;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -35,8 +35,8 @@
import org.jboss.security.RunAsIdentity;
import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SubjectInfo;
-import org.jboss.security.SecurityContextAssociation;
/** A PolicyContextHandler for the current authenticated Subject.
* @author Scott.Stark at jboss.org
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -51,11 +51,11 @@
import org.jboss.security.RealmMapping;
import org.jboss.security.SecurityConstants;
import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SecurityUtil;
import org.jboss.security.SubjectSecurityManager;
import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.auth.callback.SecurityAssociationHandler;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.util.CachePolicy;
import org.jboss.util.TimedCachePolicy;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -164,7 +164,7 @@
}
catch (PrivilegedActionException e)
{
- Exception exc = e.getException();
+ Exception exc = e.getException();
if(trace)
log.trace("Error in authorize:", exc);
invokeAbort();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -29,13 +29,13 @@
import javax.servlet.http.HttpServletResponse;
import org.jboss.security.AuthenticationManager;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.security.auth.message.GenericMessageInfo;
import org.jboss.security.plugins.JBossAuthenticationManager;
import org.jboss.security.plugins.JBossSecurityContext;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.test.SecurityActions;
import org.jboss.test.util.TestHttpServletRequest;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -37,12 +37,12 @@
import junit.framework.TestCase;
import org.jboss.security.SecurityConstants;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.security.auth.message.GenericMessageInfo;
import org.jboss.security.auth.message.config.JBossAuthConfigProvider;
import org.jboss.security.plugins.JBossSecurityContext;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.test.SecurityActions;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -36,12 +36,12 @@
import junit.framework.TestCase;
import org.jboss.security.SecurityConstants;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.security.auth.message.GenericMessageInfo;
import org.jboss.security.auth.message.config.JBossAuthConfigProvider;
import org.jboss.security.plugins.JBossSecurityContext;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.test.SecurityActions;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestAuthConfigProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestAuthConfigProvider.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestAuthConfigProvider.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -27,7 +27,6 @@
import javax.security.auth.message.config.ClientAuthConfig;
import javax.security.auth.message.config.ServerAuthConfig;
-//$Id$
/**
* Test AuthConfigProvider
@@ -37,8 +36,6 @@
*/
public class TestAuthConfigProvider implements AuthConfigProvider
{
- private CallbackHandler theHandler;
-
public ClientAuthConfig getClientAuthConfig(String layer,
String appcontext, CallbackHandler handler) throws AuthException,
SecurityException
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestClientAuthConfig.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestClientAuthConfig.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestClientAuthConfig.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -29,8 +29,6 @@
import javax.security.auth.message.config.ClientAuthConfig;
import javax.security.auth.message.config.ClientAuthContext;
-//$Id$
-
/**
* Test ClientAuthConfig
* @author Anil.Saldhana at redhat.com
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestServerAuthConfig.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestServerAuthConfig.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authentication/jaspi/helpers/TestServerAuthConfig.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -29,7 +29,6 @@
import javax.security.auth.message.config.ServerAuthConfig;
import javax.security.auth.message.config.ServerAuthContext;
-//$Id$
/**
* Test ServerAuthConfig
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthZMgrSafetyUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthZMgrSafetyUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthZMgrSafetyUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -31,22 +31,14 @@
import junit.framework.TestCase;
-import org.jboss.security.SecurityConstants;
import org.jboss.security.authorization.AuthorizationContext;
import org.jboss.security.authorization.Resource;
import org.jboss.security.authorization.ResourceType;
-import org.jboss.security.authorization.config.AuthorizationModuleEntry;
-import org.jboss.security.authorization.modules.DelegatingAuthorizationModule;
import org.jboss.security.config.ApplicationPolicy;
-import org.jboss.security.config.AuthorizationInfo;
-import org.jboss.security.config.SecurityConfiguration;
import org.jboss.security.identity.RoleGroup;
-import org.jboss.security.identity.plugins.SimpleRole;
-import org.jboss.security.identity.plugins.SimpleRoleGroup;
import org.jboss.security.plugins.JBossAuthorizationManager;
-
-//$Id$
-
+import org.jboss.test.util.SecurityTestUtil;
+
/**
* Test the concurrency correctness of JBossAuthorizationManager
* @author Anil.Saldhana at redhat.com
@@ -59,7 +51,8 @@
protected void setUp() throws Exception
{
- setUpRegularConfiguration();
+ ApplicationPolicy ap = SecurityTestUtil.getApplicationPolicy("other", null);
+ SecurityTestUtil.setUpRegularConfiguration(ap);
}
public void testThreadSafety() throws Exception
@@ -84,7 +77,7 @@
private TestResource resource = new TestResource();
public Boolean call() throws Exception
{
- RoleGroup role = getRoleGroup("roleA");
+ RoleGroup role = SecurityTestUtil.getRoleGroup("roleA");
Subject subject = new Subject();
return am.authorize(resource, subject, role) == AuthorizationContext.PERMIT;
}
@@ -95,7 +88,7 @@
private TestResource resource = new TestResource();
public Boolean call() throws Exception
{
- RoleGroup role = getRoleGroup("roleA");
+ RoleGroup role = SecurityTestUtil.getRoleGroup("roleA");
Subject subject = new Subject();
return am.authorize(resource, subject, role) == AuthorizationContext.PERMIT;
}
@@ -112,28 +105,5 @@
{
return new HashMap<String,Object>();
}
- }
-
- private void setUpRegularConfiguration() throws Exception
- {
- SecurityConfiguration.addApplicationPolicy(getApplicationPolicy("other"));
- }
-
- private ApplicationPolicy getApplicationPolicy(String domain)
- {
- AuthorizationInfo ai = new AuthorizationInfo(domain);
- String moduleName = DelegatingAuthorizationModule.class.getName();
- AuthorizationModuleEntry ame = new AuthorizationModuleEntry(moduleName);
- ai.add(ame);
- ApplicationPolicy ap = new ApplicationPolicy(domain);
- ap.setAuthorizationInfo(ai);
- return ap;
- }
-
- private RoleGroup getRoleGroup(String rolename)
- {
- SimpleRoleGroup srg = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
- srg.getRoles().add(new SimpleRole(rolename));
- return srg;
- }
+ }
}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthorizationManagerUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthorizationManagerUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/JBossAuthorizationManagerUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -32,6 +32,7 @@
import org.jboss.security.AuthorizationManager;
import org.jboss.security.SecurityConstants;
import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SecurityContextFactory;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.authorization.config.AuthorizationModuleEntry;
@@ -44,7 +45,6 @@
import org.jboss.security.identity.plugins.SimpleRoleGroup;
import org.jboss.security.jacc.SubjectPolicyContextHandler;
import org.jboss.security.plugins.JBossAuthorizationManager;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.test.util.TestHttpServletRequest;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/acl/JBossAuthorizationManagerACLUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/acl/JBossAuthorizationManagerACLUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/acl/JBossAuthorizationManagerACLUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -38,7 +38,6 @@
import org.jboss.security.identity.Role;
import org.jboss.security.plugins.JBossAuthorizationManager;
-//$Id$
/**
* ACL Unit Tests using JBossAuthorizationManager
@@ -86,6 +85,8 @@
{
return new Identity()
{
+ private static final long serialVersionUID = 1L;
+
public Group asGroup()
{
return null;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/ejb/EJBAuthorizationUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/ejb/EJBAuthorizationUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/ejb/EJBAuthorizationUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -23,7 +23,6 @@
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -31,26 +30,18 @@
import junit.framework.TestCase;
-import org.jboss.security.SecurityConstants;
-import org.jboss.security.SecurityRoleRef;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.authorization.AuthorizationContext;
import org.jboss.security.authorization.AuthorizationException;
import org.jboss.security.authorization.ResourceKeys;
-import org.jboss.security.authorization.config.AuthorizationModuleEntry;
-import org.jboss.security.authorization.modules.DelegatingAuthorizationModule;
import org.jboss.security.authorization.resources.EJBResource;
import org.jboss.security.config.ApplicationPolicy;
-import org.jboss.security.config.AuthorizationInfo;
-import org.jboss.security.config.SecurityConfiguration;
-import org.jboss.security.identity.Role;
import org.jboss.security.identity.RoleGroup;
-import org.jboss.security.identity.plugins.SimpleRole;
-import org.jboss.security.identity.plugins.SimpleRoleGroup;
+import org.jboss.security.javaee.SecurityRoleRef;
import org.jboss.security.plugins.authorization.JBossAuthorizationContext;
+import org.jboss.test.util.SecurityTestUtil;
-//$Id$
/**
* EJB Authorization Unit Test Case
@@ -62,7 +53,8 @@
{
protected void setUp() throws Exception
{
- setUpRegularConfiguration();
+ ApplicationPolicy ap = SecurityTestUtil.getApplicationPolicy("test", null);
+ SecurityTestUtil.setUpRegularConfiguration(ap);
}
/**
@@ -73,7 +65,7 @@
*/
public void testRegularEJBAuthorizationPass() throws Exception
{
- RoleGroup principalRole = this.getRoleGroup(new String[] {"roleA"});
+ RoleGroup principalRole = SecurityTestUtil.getRoleGroup(new String[] {"roleA"});
//Create a ContextMap
Map<String,Object> cmap = new HashMap<String,Object>();
@@ -83,7 +75,7 @@
ejbResource.setEjbName("TestEJB");
ejbResource.setEjbMethod(DummyClass.class.getMethod("someMethod", new Class[0]));
ejbResource.setEjbMethodInterface("void someMethod");
- ejbResource.setEjbMethodRoles(this.getRoleGroup(new String[]{"roleA", "roleC"}));
+ ejbResource.setEjbMethodRoles(SecurityTestUtil.getRoleGroup(new String[]{"roleA", "roleC"}));
AuthorizationContext ac = new JBossAuthorizationContext("test",
new AppCallbackHandler("a","b".toCharArray()));
@@ -101,7 +93,7 @@
*/
public void testInvalidRegularEJBAuthorization() throws Exception
{
- RoleGroup principalRole = this.getRoleGroup(new String[] {"badRole"});
+ RoleGroup principalRole = SecurityTestUtil.getRoleGroup(new String[] {"badRole"});
//Create a ContextMap
Map<String,Object> cmap = new HashMap<String,Object>();
@@ -110,7 +102,7 @@
ejbResource.setEjbName("TestEJB");
ejbResource.setEjbMethod(DummyClass.class.getMethod("someMethod", new Class[0]));
ejbResource.setEjbMethodInterface("void someMethod");
- ejbResource.setEjbMethodRoles(this.getRoleGroup(new String[]{"roleA", "roleC"}));
+ ejbResource.setEjbMethodRoles(SecurityTestUtil.getRoleGroup(new String[]{"roleA", "roleC"}));
AuthorizationContext ac = new JBossAuthorizationContext("test",
new AppCallbackHandler("a","b".toCharArray()));
@@ -130,7 +122,7 @@
public void testSecurityRoleRef() throws Exception
{
- RoleGroup principalRole = this.getRoleGroup(new String[] {"roleA"});
+ RoleGroup principalRole = SecurityTestUtil.getRoleGroup(new String[] {"roleA"});
//Create a ContextMap
Map<String,Object> cmap = new HashMap<String,Object>();
@@ -139,7 +131,7 @@
ejbResource.setEjbName("TestEJB");
ejbResource.setEjbMethod(DummyClass.class.getMethod("someMethod", new Class[0]));
ejbResource.setEjbMethodInterface("void someMethod");
- ejbResource.setEjbMethodRoles(getRoleGroup(new String[]{"roleA"}));
+ ejbResource.setEjbMethodRoles(SecurityTestUtil.getRoleGroup(new String[]{"roleA"}));
//For Security Role Refs, we check that there is a principal
ejbResource.setPrincipal(new SimplePrincipal("SomePrincipal"));
@@ -158,35 +150,6 @@
assertEquals(AuthorizationContext.PERMIT, result);
}
- private void setUpRegularConfiguration() throws Exception
- {
- SecurityConfiguration.addApplicationPolicy(getApplicationPolicy("test"));
- }
-
- private ApplicationPolicy getApplicationPolicy(String domain)
- {
- AuthorizationInfo ai = new AuthorizationInfo(domain);
- String moduleName = DelegatingAuthorizationModule.class.getName();
- AuthorizationModuleEntry ame = new AuthorizationModuleEntry(moduleName);
- ai.add(ame);
- ApplicationPolicy ap = new ApplicationPolicy(domain);
- ap.setAuthorizationInfo(ai);
- return ap;
- }
-
- private RoleGroup getRoleGroup(String[] roles)
- {
- SimpleRoleGroup srg = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
-
- List<Role> roleList = srg.getRoles();
-
- for(String role:roles)
- {
- roleList.add(new SimpleRole(role));
- }
- return srg;
- }
-
/**
* Dummy Class just to get a Method instance
* by calling DummyClass.class.getMethod()
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/web/WebAuthorizationUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/web/WebAuthorizationUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/web/WebAuthorizationUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -22,7 +22,6 @@
package org.jboss.test.authorization.web;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import javax.security.auth.Subject;
@@ -30,25 +29,15 @@
import junit.framework.TestCase;
-import org.jboss.security.SecurityConstants;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.authorization.AuthorizationContext;
-import org.jboss.security.authorization.config.AuthorizationModuleEntry;
-import org.jboss.security.authorization.modules.DelegatingAuthorizationModule;
import org.jboss.security.authorization.resources.WebResource;
import org.jboss.security.config.ApplicationPolicy;
-import org.jboss.security.config.AuthorizationInfo;
-import org.jboss.security.config.SecurityConfiguration;
-import org.jboss.security.identity.Role;
-import org.jboss.security.identity.RoleGroup;
-import org.jboss.security.identity.plugins.SimpleRole;
-import org.jboss.security.identity.plugins.SimpleRoleGroup;
import org.jboss.security.plugins.authorization.JBossAuthorizationContext;
+import org.jboss.test.util.SecurityTestUtil;
import org.jboss.test.util.TestHttpServletRequest;
-//$Id$
-
/**
* Unit Test the Web Authorization Modules
* @author Anil.Saldhana at redhat.com
@@ -57,50 +46,41 @@
*/
public class WebAuthorizationUnitTestCase extends TestCase
{
- public void testRegularWebAccess() throws Exception
+ private WebResource webResource;
+
+ protected void setUp() throws Exception
{
- setUpRegularConfiguration();
+ Map<String,Object> moduleOptions = SecurityTestUtil.getWebDelegateOptions();
+ ApplicationPolicy ap = SecurityTestUtil.getApplicationPolicy("test", moduleOptions);
+ SecurityTestUtil.setUpRegularConfiguration(ap);
- //Create a ContextMap
- Map<String,Object> cmap = new HashMap<String,Object>();
-
HttpServletRequest hsr = new TestHttpServletRequest(new SimplePrincipal("someprincipal"),
"/someuri", "GET");
- WebResource webResource = new WebResource(cmap);
- webResource.setServletRequest(hsr);
-
+ //Create a ContextMap
+ Map<String,Object> cmap = new HashMap<String,Object>();
+ webResource = new WebResource(cmap);
+ webResource.setServletRequest(hsr);
+ webResource.setCanonicalRequestURI("/someuri");
+
+ //Mainly for the TestWebAuthorizationModuleDelegate
+ System.setProperty("/someuri", "roleA");
+ }
+
+ public void testRegularWebAccess() throws Exception
+ {
AuthorizationContext ac = new JBossAuthorizationContext("test",
new Subject(), new AppCallbackHandler("a","b".toCharArray()));
- int result = ac.authorize(webResource, new Subject(), getRoleGroup(new String[]{"roleA"}));
+ int result = ac.authorize(webResource, new Subject(),
+ SecurityTestUtil.getRoleGroup(new String[]{"roleA"}));
assertEquals(AuthorizationContext.PERMIT, result);
}
- private void setUpRegularConfiguration() throws Exception
- {
- SecurityConfiguration.addApplicationPolicy(getApplicationPolicy("test"));
- }
-
- private ApplicationPolicy getApplicationPolicy(String domain)
+ public void testInvalidWebAccess() throws Exception
{
- AuthorizationInfo ai = new AuthorizationInfo(domain);
- String moduleName = DelegatingAuthorizationModule.class.getName();
- AuthorizationModuleEntry ame = new AuthorizationModuleEntry(moduleName);
- ai.add(ame);
- ApplicationPolicy ap = new ApplicationPolicy(domain);
- ap.setAuthorizationInfo(ai);
- return ap;
- }
-
- private RoleGroup getRoleGroup(String[] roles)
- {
- SimpleRoleGroup srg = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
-
- List<Role> roleList = srg.getRoles();
-
- for(String role:roles)
- {
- roleList.add(new SimpleRole(role));
- }
- return srg;
- }
+ AuthorizationContext ac = new JBossAuthorizationContext("test",
+ new Subject(), new AppCallbackHandler("a","b".toCharArray()));
+ int result = ac.authorize(webResource, new Subject(),
+ SecurityTestUtil.getRoleGroup(new String[]{"roleA"}));
+ assertEquals(AuthorizationContext.PERMIT, result);
+ }
}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/client/JBossSecurityClientTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/client/JBossSecurityClientTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/client/JBossSecurityClientTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -22,11 +22,11 @@
package org.jboss.test.security.client;
import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SubjectInfo;
import org.jboss.security.client.JBossSecurityClient;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.test.AbstractJBossSXTest;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -27,9 +27,9 @@
import org.jboss.security.RunAsIdentity;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.plugins.JBossSecurityContext;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.test.AbstractJBossSXTest;
//$Id$
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/IdentityUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/IdentityUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/IdentityUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -32,9 +32,7 @@
import org.jboss.security.SecurityContextUtil;
import org.jboss.security.identity.Identity;
import org.jboss.security.identity.Role;
-
-//$Id$
-
+
/**
* Identity in Security Context Unit Tests
* @author Anil.Saldhana at redhat.com
@@ -64,7 +62,9 @@
}
private class Identity1 implements Identity
- {
+ {
+ private static final long serialVersionUID = 1L;
+
public Group asGroup()
{
return null;
@@ -88,6 +88,8 @@
private class Identity2 implements Identity
{
+ private static final long serialVersionUID = 1L;
+
public Group asGroup()
{
return null;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/SubjectInfoUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/SubjectInfoUnitTestCase.java 2008-04-19 00:16:44 UTC (rev 72457)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/SubjectInfoUnitTestCase.java 2008-04-19 00:20:01 UTC (rev 72458)
@@ -25,12 +25,12 @@
import javax.security.auth.Subject;
+import junit.framework.TestCase;
+
import org.jboss.security.SecurityContext;
import org.jboss.security.SecurityContextFactory;
import org.jboss.security.SimplePrincipal;
-import junit.framework.TestCase;
-
//$Id$
/**
More information about the jboss-cvs-commits
mailing list