[jboss-cvs] JBossAS SVN: r99912 - in projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src: test/java/org/jboss/test/security/config and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 25 13:09:00 EST 2010
Author: anil.saldhana at jboss.com
Date: 2010-01-25 13:08:59 -0500 (Mon, 25 Jan 2010)
New Revision: 99912
Modified:
projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/StaxBasedConfigParser.java
projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/config/StaxConfigParserUnitTestCase.java
Log:
update the JAAS configuration
Modified: projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/StaxBasedConfigParser.java
===================================================================
--- projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/StaxBasedConfigParser.java 2010-01-25 18:07:09 UTC (rev 99911)
+++ projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/StaxBasedConfigParser.java 2010-01-25 18:08:59 UTC (rev 99912)
@@ -24,6 +24,7 @@
import java.io.InputStream;
import java.util.List;
+import javax.security.auth.login.Configuration;
import javax.xml.stream.EventFilter;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
@@ -31,8 +32,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
-import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.security.config.ApplicationPolicy;
+import org.jboss.security.config.ApplicationPolicyRegistration;
/**
* Configuration Parser based on Stax
@@ -72,8 +73,12 @@
*/
public void parse(InputStream configStream) throws XMLStreamException
{
- XMLLoginConfigImpl config = XMLLoginConfigImpl.getInstance();
+ Configuration config = Configuration.getConfiguration();
+ if(config instanceof ApplicationPolicyRegistration == false)
+ throw new IllegalStateException("JAAS Configuration does not support application policy registration");
+ ApplicationPolicyRegistration appPolicyRegistration = (ApplicationPolicyRegistration) config;
+
XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
XMLEventReader xmlEventReader = xmlInputFactory.createXMLEventReader(configStream);
@@ -99,7 +104,7 @@
List<ApplicationPolicy> appPolicies = appPolicyParser.parse(xmlEventReader);
for(ApplicationPolicy appPolicy: appPolicies)
{
- config.addApplicationPolicy(appPolicy.getName(), appPolicy);
+ appPolicyRegistration.addApplicationPolicy(appPolicy.getName(), appPolicy);
}
}
}
Modified: projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/config/StaxConfigParserUnitTestCase.java
===================================================================
--- projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/config/StaxConfigParserUnitTestCase.java 2010-01-25 18:07:09 UTC (rev 99911)
+++ projects/security/picketbox/fresh/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/config/StaxConfigParserUnitTestCase.java 2010-01-25 18:08:59 UTC (rev 99912)
@@ -26,6 +26,7 @@
import java.util.Map;
import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
import junit.framework.Assert;
@@ -34,15 +35,16 @@
import org.jboss.security.auth.container.config.AuthModuleEntry;
import org.jboss.security.auth.login.BaseAuthenticationInfo;
import org.jboss.security.auth.login.LoginModuleStackHolder;
-import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.security.authorization.config.AuthorizationModuleEntry;
import org.jboss.security.config.ACLInfo;
import org.jboss.security.config.ApplicationPolicy;
+import org.jboss.security.config.ApplicationPolicyRegistration;
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.StandaloneConfiguration;
import org.jboss.security.config.parser.StaxBasedConfigParser;
import org.jboss.security.identitytrust.config.IdentityTrustModuleEntry;
import org.jboss.security.mapping.MappingType;
@@ -60,9 +62,10 @@
{
super(name);
}
-
+
public void testSecurityConfig5() throws Exception
{
+ Configuration.setConfiguration(StandaloneConfiguration.getInstance());
ClassLoader tcl = Thread.currentThread().getContextClassLoader();
InputStream is = tcl.getResourceAsStream("config/securityConfig5.xml");
StaxBasedConfigParser parser = new StaxBasedConfigParser();
@@ -76,6 +79,7 @@
public void testIdentityTrustConfig() throws Exception
{
+ Configuration.setConfiguration(StandaloneConfiguration.getInstance());
ClassLoader tcl = Thread.currentThread().getContextClassLoader();
InputStream is = tcl.getResourceAsStream("config/identitytrust-config.xml");
StaxBasedConfigParser parser = new StaxBasedConfigParser();
@@ -84,12 +88,22 @@
TestIdentityTrustConfig.testConfJavaEE();
}
+ private static ApplicationPolicy getApplicationPolicy(String domainName)
+ {
+ Configuration config = Configuration.getConfiguration();
+ if(config instanceof ApplicationPolicyRegistration == false)
+ throw new RuntimeException("Config is not of type ApplicationPolicyRegistration");
+
+ ApplicationPolicyRegistration apr = (ApplicationPolicyRegistration) config;
+ return apr.getApplicationPolicy(domainName);
+ }
+
// Internal class to represent the securityConfig5.xml validation
private static class TestSecurityConfig5
{
public static void validateJAASConfiguration()
{
- ApplicationPolicy jaasConfig = XMLLoginConfigImpl.getInstance().getApplicationPolicy("conf-jaas");
+ ApplicationPolicy jaasConfig = getApplicationPolicy("conf-jaas");
BaseAuthenticationInfo authInfo = jaasConfig.getAuthenticationInfo();
List<?> entries = authInfo.getModuleEntries();
assertEquals("Number of entries = 2", 2, entries.size());
@@ -123,7 +137,7 @@
public static void validateJASPIConfiguration()
{
- ApplicationPolicy jaspiConfig = XMLLoginConfigImpl.getInstance().getApplicationPolicy("conf-jaspi");
+ ApplicationPolicy jaspiConfig = getApplicationPolicy("conf-jaspi");
BaseAuthenticationInfo authInfo = jaspiConfig.getAuthenticationInfo();
List<?> entries = authInfo.getModuleEntries();
assertEquals("Number of entries = 2", 2, entries.size());
@@ -167,7 +181,7 @@
public static void validateCompleteConfiguration()
{
- ApplicationPolicy completeConfig = XMLLoginConfigImpl.getInstance().getApplicationPolicy("conf-complete");
+ ApplicationPolicy completeConfig = getApplicationPolicy("conf-complete");
BaseAuthenticationInfo authInfo = completeConfig.getAuthenticationInfo();
List<?> entries = authInfo.getModuleEntries();
assertEquals("Number of entries = 1", 1, entries.size());
@@ -274,7 +288,7 @@
public static void validateApplicationPolicyExtension()
{
- ApplicationPolicy completeConfig = XMLLoginConfigImpl.getInstance().getApplicationPolicy("conf-jaas-extend");
+ ApplicationPolicy completeConfig = getApplicationPolicy("conf-jaas-extend");
assertNotNull("conf-jaas-extend is not null", completeConfig);
BaseAuthenticationInfo bai = completeConfig.getAuthenticationInfo();
assertNotNull("BaseAuthenticationInfo is not null", bai);
@@ -324,13 +338,13 @@
assertEquals("IdentityTrustModuleEntry length=1", 1, itilist.length);
// JASPI authentication policy extension
- ApplicationPolicy jaspiPolicy = XMLLoginConfigImpl.getInstance().getApplicationPolicy("conf-jaspi-extend");
+ ApplicationPolicy jaspiPolicy = getApplicationPolicy("conf-jaspi-extend");
assertNotNull("Unexpected null conf-jaspi-extend application policy", jaspiPolicy);
BaseAuthenticationInfo authInfo = jaspiPolicy.getAuthenticationInfo();
assertNotNull("Unexpected null jaspi configuration", authInfo);
List<?> entries = authInfo.getModuleEntries();
assertEquals("Invalid number of auth modules", 3, entries.size());
- }
+ }
} //End class TestSecurityConfig5
@@ -339,7 +353,7 @@
{
public static void testConfJavaEE()
{
- ApplicationPolicy javaeeConfig = XMLLoginConfigImpl.getInstance().getApplicationPolicy("conf-javaee");
+ ApplicationPolicy javaeeConfig = getApplicationPolicy("conf-javaee");
IdentityTrustInfo identityTrust = javaeeConfig.getIdentityTrustInfo();
assertNotNull("IdentityTrustInfo", identityTrust);
More information about the jboss-cvs-commits
mailing list