[portal-commits] JBoss Portal SVN: r12640 - in modules/identity/trunk: sso/src/main/java/org/jboss/portal/identity/sso/cas and 1 other directories.

Author: sohil.shah(a)jboss.com Date: 2009-01-26 11:28:32 -0500 (Mon, 26 Jan 2009) New Revision: 12640 Modified: modules/identity/trunk/build/pom.xml modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java Log: * fix the logic bug pointed to by the security team * changing common dependency from snaphost to 1.2.0. module fails to compile without it Modified: modules/identity/trunk/build/pom.xml =================================================================== --- modules/identity/trunk/build/pom.xml 2009-01-26 15:56:19 UTC (rev 12639) +++ modules/identity/trunk/build/pom.xml 2009-01-26 16:28:32 UTC (rev 12640) @@ -28,8 +28,8 @@ <version.junit>3.8.1</version.junit> <version.cargo>0.9-portal</version.cargo> <version.ant>1.6.5</version.ant> - <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common> - <version.jboss.portal.test>1.2.0.Beta2</version.jboss.portal.test> + <version.jboss.portal.common>1.2.0</version.jboss.portal.common> + <version.jboss.portal.test>1.2.1</version.jboss.portal.test> <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> <version.sun.opends>1.0.0-BUILD04</version.sun.opends> <version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs> Modified: modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java =================================================================== --- modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 15:56:19 UTC (rev 12639) +++ modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 16:28:32 UTC (rev 12640) @@ -126,7 +126,7 @@ { //Check and make sure the user account is enabled Boolean enabled = (Boolean)this.profileModule.getProperty(user, User.INFO_USER_ENABLED); - if(enabled != null || enabled.booleanValue()) + if(enabled != null && enabled.booleanValue()) { //Check and make sure user has proper role setup if(this.havingRole != null && this.havingRole.trim().length()>0) Modified: modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java =================================================================== --- modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 15:56:19 UTC (rev 12639) +++ modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 16:28:32 UTC (rev 12640) @@ -190,7 +190,7 @@ { //Check and make sure the user account is enabled Boolean enabled = (Boolean)this.profileModule.getProperty(user, User.INFO_USER_ENABLED); - if(enabled != null || enabled.booleanValue()) + if(enabled != null && enabled.booleanValue()) { //Now perform validation status = user.validatePassword(password);