[jboss-cvs] JBossAS SVN: r100723 - in projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test: resources/ldap and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2010-02-08 16:59:45 -0500 (Mon, 08 Feb 2010)
New Revision: 100723

Added:
   projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/resources/ldap/ldap-attributes-config.xml
Modified:
   projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/mapping/LdapAttributeMappingProviderUnitTestCase.java
Log:
use a config file

Modified: projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/mapping/LdapAttributeMappingProviderUnitTestCase.java
===================================================================
--- projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/mapping/LdapAttributeMappingProviderUnitTestCase.java	2010-02-08 21:48:25 UTC (rev 100722)
+++ projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/mapping/LdapAttributeMappingProviderUnitTestCase.java	2010-02-08 21:59:45 UTC (rev 100723)
@@ -26,6 +26,8 @@
 import java.util.HashMap;
 import java.util.List;
 
+import javax.security.auth.login.Configuration;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -33,16 +35,14 @@
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityContextFactory;
 import org.jboss.security.SimplePrincipal;
+import org.jboss.security.auth.login.XMLLoginConfigImpl;
 import org.jboss.security.config.ApplicationPolicy;
-import org.jboss.security.config.MappingInfo;
-import org.jboss.security.config.ModuleOption;
 import org.jboss.security.config.SecurityConfiguration;
+import org.jboss.security.config.parser.StaxBasedConfigParser;
 import org.jboss.security.identity.Attribute;
 import org.jboss.security.mapping.MappingContext;
 import org.jboss.security.mapping.MappingManager;
 import org.jboss.security.mapping.MappingType;
-import org.jboss.security.mapping.config.MappingModuleEntry;
-import org.jboss.security.mapping.providers.attribute.LdapAttributeMappingProvider;
 import org.jboss.test.security.ldap.OpenDSUnitTestsAdapter;
 
 /**
@@ -66,6 +66,9 @@
    protected void setUp() throws Exception
    {
       super.setUp();
+      XMLLoginConfigImpl xmlLogin = XMLLoginConfigImpl.getInstance();
+      Configuration.setConfiguration(xmlLogin);
+      
       ApplicationPolicy ap = new ApplicationPolicy("test"); 
       SecurityConfiguration.addApplicationPolicy(ap);
       
@@ -76,29 +79,17 @@
    }
    
    public void testLDAPAttributes() throws Exception
-   {  
-      ApplicationPolicy ap = SecurityConfiguration.getApplicationPolicy("test"); 
-      MappingModuleEntry mme = new MappingModuleEntry(LdapAttributeMappingProvider.class.getName());
+   {    
+      StaxBasedConfigParser parser = new StaxBasedConfigParser();
+      parser.parse(Thread.currentThread().getContextClassLoader().getResourceAsStream("ldap/ldap-attributes-config.xml"));
       
-      String attributeList = "mail,cn,commonname,givenname,surname,employeeType," +
-                       "employeeNumber,facsimileTelephoneNumber";
-      mme.add(new ModuleOption("bindDN",this.adminDN));
-      mme.add(new ModuleOption("bindCredential",this.adminPW));
-      mme.add(new ModuleOption("baseFilter","(uid={0})"));
-      mme.add(new ModuleOption("java.naming.provider.url", "ldap://" + serverHost  + ":" + port));
-      mme.add(new ModuleOption("baseCtxDN", "ou=People,dc=jboss,dc=org"));
-      mme.add(new ModuleOption("attributeList", attributeList));
-
-      MappingInfo attributeMappingInfo = new MappingInfo();
-      attributeMappingInfo.add(mme);
-      ap.setMappingInfo(MappingType.ATTRIBUTE.name(),attributeMappingInfo); 
-      
       SecurityContext sc = SecurityContextFactory.createSecurityContext("test");
       MappingManager mm = sc.getMappingManager();
       assertNotNull("MappingManager != null", mm);
       
       MappingContext<List<Attribute<String>>> mc = mm.getMappingContext(MappingType.ATTRIBUTE.name());
       assertNotNull("MappingContext != null", mc);
+      assertEquals("1 module", 1,mc.getModules().size());
       HashMap<String,Object> map = new HashMap<String,Object>();
      
       map.put(SecurityConstants.PRINCIPAL_IDENTIFIER, new SimplePrincipal("jduke"));
@@ -112,6 +103,8 @@
       boolean foundEmployeeType = false;
       boolean foundEmployeeNumber = false;
       
+      assertNotNull("Attribute List is not null?", attList);
+      
       for(Attribute<String> att: attList)
       {
          String attName = att.getName();

Added: projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/resources/ldap/ldap-attributes-config.xml
===================================================================
--- projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/resources/ldap/ldap-attributes-config.xml	                        (rev 0)
+++ projects/security/picketbox/trunk/security-jboss-sx/jbosssx/src/test/resources/ldap/ldap-attributes-config.xml	2010-02-08 21:59:45 UTC (rev 100723)
@@ -0,0 +1,25 @@
+
+<policy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="urn:jboss:security-config:5.0"
+         xmlns="urn:jboss:security-config:5.0"
+         xmlns:jbxb="urn:jboss:security-config:5.0">
+
+<application-policy name="test">
+	<mapping>
+		<mapping-module
+			code="org.jboss.security.mapping.providers.attribute.LdapAttributeMappingProvider"
+			type="attribute">
+			<module-option 
+			name="attributeList">mail,cn,commonname,givenname,surname,employeeType,employeeNumber,facsimileTelephoneNumber</module-option>
+			<module-option name="bindDN">cn=Directory Manager</module-option>
+			<module-option name="bindCredential">password</module-option>
+			<module-option name="baseFilter">(uid={0})</module-option>
+			<module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
+			<module-option name="java.naming.provider.url">ldap://localhost:10389</module-option>
+			<module-option name="baseCtxDN">ou=People,dc=jboss,dc=org</module-option>
+		</mapping-module>
+	</mapping>
+</application-policy>  
+
+
+</policy> 
\ No newline at end of file