Author: bdaw Date: 2006-12-20 17:09:59 -0500 (Wed, 20 Dec 2006) New Revision: 5917 Modified: trunk/common/src/main/org/jboss/portal/common/util/Tools.java trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java trunk/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/User.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/LDAPTestCase.java trunk/identity/src/resources/test/config/opends-config.xml trunk/identity/src/resources/test/config/profile-config.xml trunk/test/src/etc/directories.xml Log: - few small fixes and updates Modified: trunk/common/src/main/org/jboss/portal/common/util/Tools.java =================================================================== --- trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2006-12-20 22:09:59 UTC (rev 5917) @@ -642,7 +642,7 @@ md.update(text.getBytes()); byte[] encoded = md.digest(); - if ("hex".equals(encoding)) + if ("HEX".equalsIgnoreCase(encoding)) { return toHexString(encoded); } Modified: trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2006-12-20 22:09:59 UTC (rev 5917) @@ -718,6 +718,11 @@ try { role = roleModule.findRoleByName(name); + //in case that exception was not thrown + if (role == null) + { + return true; + } } catch (IllegalArgumentException e) { Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/identity/build.xml 2006-12-20 22:09:59 UTC (rev 5917) @@ -449,11 +449,11 @@ <!--<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.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"/> + <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/>--> </x-test> <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> Modified: trunk/identity/src/main/org/jboss/portal/identity/User.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/User.java 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/identity/src/main/org/jboss/portal/identity/User.java 2006-12-20 22:09:59 UTC (rev 5917) @@ -23,6 +23,7 @@ package org.jboss.portal.identity; import org.jboss.portal.identity.ProfileMap; +import org.jboss.portal.common.p3p.P3PConstants; import java.util.Date; import java.util.Locale; @@ -37,31 +38,31 @@ */ public interface User { - String INFO_USER_NAME_GIVEN = "portal.user.name.given"; - String INFO_USER_NAME_FAMILY = "portal.user.name.family"; - String INFO_USER_LOCATION = "portal.user.location"; - String INFO_USER_OCCUPATION = "portal.user.occupation"; - String INFO_USER_EXTRA = "portal.user.extra"; - String INFO_USER_SIGNATURE = "portal.user.signature"; - String INFO_USER_INTERESTS = "portal.user.interests"; - String INFO_USER_LOCALE = "portal.user.locale"; - String INFO_USER_IM_ICQ = "portal.user.im.icq"; - String INFO_USER_IM_AIM = "portal.user.im.aim"; - String INFO_USER_IM_MSNM = "portal.user.im.msnm"; - String INFO_USER_IM_YIM = "portal.user.im.yim"; - String INFO_USER_IM_SKYPE = "portal.user.im.skype"; - String INFO_USER_HOMEPAGE = "portal.user.homepage"; - String INFO_USER_TIME_ZONE_OFFSET = "portal.user.time-zone-offset"; - String INFO_USER_THEME = "portal.user.theme"; - String INFO_USER_SECURITY_QUESTION = "portal.user.security.question"; - String INFO_USER_SECURITY_ANSWER = "portal.user.security.answer"; - String INFO_USER_EMAIL_FAKE = "portal.user.email.fake"; - String INFO_USER_VIEW_EMAIL_VIEW_REAL = "portal.user.email.view-real"; - String INFO_USER_LAST_LOGIN_DATE = "portal.user.last-login-date"; - String INFO_USER_REGISTRATION_DATE = "portal.user.registration-date"; + public static final String INFO_USER_NAME_GIVEN = "portal.user.name.given"; + public static final String INFO_USER_NAME_FAMILY = "portal.user.name.family"; + public static final String INFO_USER_LOCATION = "portal.user.location"; + public static final String INFO_USER_OCCUPATION = "portal.user.occupation"; + public static final String INFO_USER_EXTRA = "portal.user.extra"; + public static final String INFO_USER_SIGNATURE = "portal.user.signature"; + public static final String INFO_USER_INTERESTS = "portal.user.interests"; + public static final String INFO_USER_LOCALE = "portal.user.locale"; + public static final String INFO_USER_IM_ICQ = "portal.user.im.icq"; + public static final String INFO_USER_IM_AIM = "portal.user.im.aim"; + public static final String INFO_USER_IM_MSNM = "portal.user.im.msnm"; + public static final String INFO_USER_IM_YIM = "portal.user.im.yim"; + public static final String INFO_USER_IM_SKYPE = "portal.user.im.skype"; + public static final String INFO_USER_HOMEPAGE = "portal.user.homepage"; + public static final String INFO_USER_TIME_ZONE_OFFSET = "portal.user.time-zone-offset"; + public static final String INFO_USER_THEME = "portal.user.theme"; + public static final String INFO_USER_SECURITY_QUESTION = "portal.user.security.question"; + public static final String INFO_USER_SECURITY_ANSWER = "portal.user.security.answer"; + public static final String INFO_USER_EMAIL_FAKE = "portal.user.email.fake"; + public static final String INFO_USER_VIEW_EMAIL_VIEW_REAL = "portal.user.email.view-real"; + public static final String INFO_USER_LAST_LOGIN_DATE = "portal.user.last-login-date"; + public static final String INFO_USER_REGISTRATION_DATE = "portal.user.registration-date"; - String INFO_USER_ENABLED = "portal.user.enabled"; - String INFO_USER_EMAIL_REAL = "portal.user.email.real"; + public static final String INFO_USER_ENABLED = "portal.user.enabled"; + public static final String INFO_USER_EMAIL_REAL = P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL; Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2006-12-20 22:09:59 UTC (rev 5917) @@ -170,21 +170,7 @@ attrs.put(attr); } - //TODO:testcase password behaviour -// String algorithm = getHashAlgorightm(); -// if (algorithm == null) -// { -// attrs.put(getPasswordAttributeId(), password); -// } -// else -// { -// attrs.put(getPasswordAttributeId(), Tools.hashAndEncodeString(password,algorithm, getHashEncoding())); -// } - attrs.put(getPasswordAttributeId(), password); - // - //email - //attrs.put(getEmailAttributeId(), realEmail); String dn = getUidAttributeID().concat("=").concat(userName); @@ -195,7 +181,7 @@ // { // throw new IdentityException("Failed to create user", e); // } - catch (NamingException e) + catch (Exception e) { throw new IdentityException("Failed to create user", e); } 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 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2006-12-20 22:09:59 UTC (rev 5917) @@ -25,10 +25,19 @@ import junit.framework.TestSuite; import org.jboss.portal.identity.UserModule; import org.jboss.portal.identity.ldap.LDAPUserImpl; +import org.jboss.portal.identity.ldap.LDAPRoleImpl; import org.jboss.portal.identity.IdentityServiceControllerImpl; import org.jboss.portal.identity.IdentityContext; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.MembershipModule; +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.Role; import org.jboss.portal.test.identity.ldap.LDAPTestCase; +import java.util.Set; +import java.util.HashSet; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ @@ -45,6 +54,14 @@ UserModule userModule; + RoleModule roleModule; + + MembershipModule membershipModule; + + UserProfileModule userProfileModule; + + + private String suffix; public void setUp() throws Exception @@ -80,6 +97,10 @@ controller.start(); identityContext = controller.getIdentityContext(); userModule = (UserModule)identityContext.getObject(IdentityContext.TYPE_USER_MODULE); + userModule = (UserModule)identityContext.getObject(IdentityContext.TYPE_USER_MODULE); + roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE); + membershipModule = (MembershipModule)identityContext.getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE); + userProfileModule = (UserProfileModule)identityContext.getObject(IdentityContext.TYPE_USER_PROFILE_MODULE); suffix = getDirectoryServerConfigParameter().getCleanUpDN(); @@ -88,50 +109,74 @@ } - public void testFirstSimple() throws Exception - { - log.info("test framework works ;]"); - } +// public void testFirstSimple() throws Exception +// { +// log.info("test framework works ;]"); +// } - public void testFindUserByName() throws Exception - { - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); - assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); - assertEquals(ldapu.getUserName(), "jduke"); - } +// public void testFindUserByName() throws Exception +// { +// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); +// assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); +// assertEquals(ldapu.getUserName(), "jduke"); +// } +// +// public void testRemoveUser() throws Exception +// { +// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); +// assertNotNull(ldapu); +// assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); +// userModule.removeUser("jduke"); +// ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); +// assertNull(ldapu); +// } +// +// public void testCreateUser() throws Exception +// { +// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.createUser("testUser", "testPassword"); +// assertNotNull(ldapu); +// assertEquals("testUser", ldapu.getUserName()); +// +// ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); +// assertNotNull(ldapu); +// userModule.removeUser("testUser"); +// +// ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); +// assertNull(ldapu); +// +// } +// +// public void testgetUserCount() throws Exception +// { +// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); +// assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); +// assertEquals(ldapu.getUserName(), "jduke"); +// +// int count = userModule.getUserCount(); +// assertEquals(5, count); +// } - public void testRemoveUser() throws Exception + public void testPassword() throws Exception { - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); - assertNotNull(ldapu); - assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); - userModule.removeUser("jduke"); - ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); - assertNull(ldapu); - } + userModule.createUser("testUser", "testPassword"); + User u = userModule.findUserByUserName("testUser"); + assertNotNull(u); + assertEquals("testUser", u.getUserName()); + assertTrue(u.validatePassword("testPassword")); - public void testCreateUser() throws Exception - { - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.createUser("testUser", "testPassword"); - assertNotNull(ldapu); - assertEquals("testUser", ldapu.getUserName()); + Role r = roleModule.createRole("testRole", "testDisplayName"); + Set a = new HashSet(); + a.add(r); + membershipModule.assignRoles(u, a); + assertTrue(u.validatePassword("testPassword")); - ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); - assertNotNull(ldapu); - userModule.removeUser("testUser"); + userProfileModule.setProperty(u, User.INFO_USER_EMAIL_REAL, "testRealEmail"); + assertTrue(u.validatePassword("testPassword")); - ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); - assertNull(ldapu); - } +// assertTrue(!u.validatePassword("1testPassword1")); +// u.updatePassword("1testPassword1"); +// assertTrue(u.validatePassword("1testPassword1")); - public void testgetUserCount() throws Exception - { - LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); - assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); - assertEquals(ldapu.getUserName(), "jduke"); - - int count = userModule.getUserCount(); - assertEquals(5, count); } } Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2006-12-20 22:09:59 UTC (rev 5917) @@ -227,7 +227,7 @@ DirContext org = ctx; - + removeContext(org, removeContext); } catch (Exception e) Modified: trunk/identity/src/resources/test/config/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/opends-config.xml 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/identity/src/resources/test/config/opends-config.xml 2006-12-20 22:09:59 UTC (rev 5917) @@ -106,5 +106,24 @@ <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> + <!--This objectclasses should work with Red Hat Directory--> + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + </option> + <!--Schema requires those to have initial value--> + <option> + <name>cn</name> + <value>none</value> + </option> + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> </options> </identity-configuration> \ No newline at end of file Modified: trunk/identity/src/resources/test/config/profile-config.xml =================================================================== --- trunk/identity/src/resources/test/config/profile-config.xml 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/identity/src/resources/test/config/profile-config.xml 2006-12-20 22:09:59 UTC (rev 5917) @@ -22,31 +22,45 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!DOCTYPE profile PUBLIC + <!--<!DOCTYPE profile PUBLIC "-//JBoss Portal//DTD JBoss User Profile Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/profile-config_1_0.dtd"> + "http://www.jboss.org/portal/dtd/profile-config_1_0.dtd">--> <profile> <!--Database mapping - jbp_user table column mapping--> <property> - <name>portal.user.name.given</name> + <name>user.name.nickName</name> <type>java.lang.String</type> - <access-mode>read-write</access-mode> + <access-mode>read-only</access-mode> <usage>mandatory</usage> <display-name xml:lang="en">Name</display-name> <description xml:lang="en">The user name</description> <mapping> <database> <type>column</type> - <value>jbp_username</value> + <value>jbp_uname</value> </database> </mapping> </property> <property> - <name>portal.user.name.family</name> + <name>user.name.given</name> <type>java.lang.String</type> <access-mode>read-write</access-mode> <usage>mandatory</usage> + <display-name xml:lang="en">Given Name</display-name> + <description xml:lang="en">The user given name</description> + <mapping> + <database> + <type>column</type> + <value>jbp_givenname</value> + </database> + </mapping> + </property> + <property> + <name>user.name.family</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> <display-name xml:lang="en">Family name</display-name> <description xml:lang="en">The user family name</description> <mapping> @@ -57,7 +71,7 @@ </mapping> </property> <property> - <name>portal.user.email.real</name> + <name>user.business-info.online.email</name> <type>java.lang.String</type> <access-mode>read-write</access-mode> <usage>mandatory</usage> @@ -188,9 +202,9 @@ <type>dynamic</type> <value>portal.user.signature</value> </database> - <ldap> + <!--<ldap> <value>personalSignature</value> - </ldap> + </ldap>--> </mapping> </property> <property> @@ -219,9 +233,9 @@ <type>dynamic</type> <value>portal.user.locale</value> </database> - <ldap> - <value>localityName</value> - </ldap> + <!--<ldap>--> + <!--<value>localityName</value>--> + <!--</ldap>--> </mapping> </property> <property> Modified: trunk/test/src/etc/directories.xml =================================================================== --- trunk/test/src/etc/directories.xml 2006-12-20 22:05:33 UTC (rev 5916) +++ trunk/test/src/etc/directories.xml 2006-12-20 22:09:59 UTC (rev 5917) @@ -37,7 +37,7 @@ <!--DN that will be removed to perform cleanup after each test--> <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> </directory> - <!--<directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> @@ -51,5 +51,5 @@ <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> - </directory>--> + </directory> </directories>