[portal-commits] JBoss Portal SVN: r12645 - in modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso: josso and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2009-01-26 12:19:31 -0500 (Mon, 26 Jan 2009)
New Revision: 12645
Modified:
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
Log:
fix the logic bug pointed to by the security team
Modified:
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
===================================================================
---
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26
16:57:08 UTC (rev 12644)
+++
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26
17:19:31 UTC (rev 12645)
@@ -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/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
===================================================================
---
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26
16:57:08 UTC (rev 12644)
+++
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26
17:19:31 UTC (rev 12645)
@@ -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);