Author: bdaw Date: 2007-02-11 16:18:06 -0500 (Sun, 11 Feb 2007) New Revision: 6211 Modified: trunk/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java Log: - change implementation to use LDAP DN as user ID instead of userName Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-02-11 13:37:29 UTC (rev 6210) +++ trunk/identity/build.xml 2007-02-11 21:18:06 UTC (rev 6211) @@ -450,14 +450,12 @@ <x-test> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPIdentityTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.UserProtoTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ConfigurationTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/>--> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPIdentityTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/> </x-test> <x-classpath> Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2007-02-11 13:37:29 UTC (rev 6210) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2007-02-11 21:18:06 UTC (rev 6211) @@ -84,7 +84,7 @@ } else { - memberName = ldapUser.getId().toString(); + memberName = ldapUser.getUserName(); } @@ -250,7 +250,8 @@ } else { - member.add(user.getId().toString()); + //member.add(user.getId().toString()); + member.add(user.getUserName()); } } catch (ClassCastException e) @@ -312,7 +313,8 @@ } else { - memberName = ldapUser.getId().toString(); + //memberName = ldapUser.getId().toString(); + memberName = ldapUser.getUserName(); } Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java 2007-02-11 13:37:29 UTC (rev 6210) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java 2007-02-11 21:18:06 UTC (rev 6211) @@ -48,6 +48,8 @@ private String dn; + private String userName; + //In ldap implementation it acts as a userName private String id; @@ -60,10 +62,6 @@ /** * internal */ - private String algorithm; - - private String encoding; - private LDAPUserImpl() { @@ -172,12 +170,12 @@ public String getUserName() { - return this.id; + return this.userName; } public void setUserName(String userName) { - this.id = userName; + this.userName = userName; } private IdentityConfiguration getIdentityConfiguration() throws IdentityException Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2007-02-11 13:37:29 UTC (rev 6210) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2007-02-11 21:18:06 UTC (rev 6211) @@ -148,15 +148,18 @@ throw new IdentityException("LDAP entry doesn't contain proper attribute:" + getUidAttributeID()); } - ldapu = new LDAPUserImpl(dn,getIdentityContext(), uida.get().toString()); + //ldapu = new LDAPUserImpl(dn,getIdentityContext(), uida.get().toString()); + //make DN as user ID + ldapu = new LDAPUserImpl(dn,getIdentityContext(), dn); + ldapu.setUserName(uida.get().toString()); log.debug("user uid: " + ldapu.getId()); log.debug("user dn: " + ldapu.getDn()); } - catch (NamingException e) + catch (Exception e) { throw new IdentityException("Couldn't create LDAPUserImpl object from ldap entry (SearchResult)", e); } Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2007-02-11 13:37:29 UTC (rev 6210) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2007-02-11 21:18:06 UTC (rev 6211) @@ -109,13 +109,13 @@ { throw new IdentityException("Only String id is suppoted"); } - return findUserById((String)id); + return findUserByDN(id.toString()); } public User findUserById(String id) throws IdentityException, IllegalArgumentException, NoSuchUserException { - return findUserByUserName(id); + return findUserByDN(id); } Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2007-02-11 13:37:29 UTC (rev 6210) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2007-02-11 21:18:06 UTC (rev 6211) @@ -100,20 +100,20 @@ public void testFindUserByName() throws Exception { - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserByUserName("jduke"); assertEquals(ldapu.getDn().toLowerCase(), (userPrefix + "=jduke,ou=People," + suffix).toLowerCase()); assertEquals(ldapu.getUserName(), "jduke"); } public void testRemoveUser() throws Exception { - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserByUserName("jduke"); assertNotNull(ldapu); assertEquals(ldapu.getDn().toLowerCase(), (userPrefix + "=jduke,ou=People," + suffix).toLowerCase()); - userModule.removeUser("jduke"); + userModule.removeUser(ldapu.getId()); try { - userModule.findUserById("jduke"); + userModule.findUserByUserName("jduke"); fail(); } catch (IdentityException e) @@ -129,13 +129,13 @@ assertNotNull(ldapu); assertEquals("testUser", ldapu.getUserName()); - ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); + ldapu = (LDAPUserImpl)userModule.findUserByUserName("testUser"); assertNotNull(ldapu); - userModule.removeUser("testUser"); + userModule.removeUser(ldapu.getId()); try { - ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); + ldapu = (LDAPUserImpl)userModule.findUserByUserName("testUser"); fail(); } catch (IdentityException e) @@ -148,7 +148,7 @@ public void testgetUserCount() throws Exception { - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserByUserName("jduke"); assertEquals(ldapu.getDn().toLowerCase(),(userPrefix + "=jduke,ou=People," + suffix).toLowerCase()); assertEquals(ldapu.getUserName(), "jduke"); Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java 2007-02-11 13:37:29 UTC (rev 6210) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java 2007-02-11 21:18:06 UTC (rev 6211) @@ -79,7 +79,7 @@ public void testSetPropertyWithDB() throws Exception { begin(); - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserByUserName("jduke"); assertEquals(&quot;email(a)email.com&quot;, userProfileModule.getProperty(ldapu, User.INFO_USER_EMAIL_REAL)); userProfileModule.setProperty(ldapu, User.INFO_USER_EMAIL_REAL, &quot;toto(a)toto.com&quot;); assertEquals(&quot;toto(a)toto.com&quot;, userProfileModule.getProperty(ldapu, User.INFO_USER_EMAIL_REAL));