Author: ate
Date: Thu Jun 7 07:54:32 2007
New Revision: 545206
URL: http://svn.apache.org/viewvc?view=rev&rev=545206
Log:
Fix for JS2-502: cannot disable user
See: http://issues.apache.org/jira/browse/JS2-502
Yes, this was a bug which I fixed, but note that Jetspeed currently doesn't
make use of the enabled flag of Principals.
See still pending issue JS2-27 for that.
Modified:
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java
Modified:
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java?view=diff&rev=545206&r1=545205&r2=545206
==============================================================================
---
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java
(original)
+++
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java
Thu Jun 7 07:54:32 2007
@@ -64,6 +64,7 @@
if (null != internalUser)
{
userPrincipal = new
UserPrincipalImpl(UserPrincipalImpl.getPrincipalNameFromFullPath(internalUser.getFullPath()));
+ userPrincipal.setEnabled(internalUser.isEnabled());
}
return userPrincipal;
}
@@ -83,7 +84,9 @@
{
continue;
}
- userPrincipals.add(new
UserPrincipalImpl(UserPrincipalImpl.getPrincipalNameFromFullPath(internalUser.getFullPath())));
+ UserPrincipal userPrincipal = new
UserPrincipalImpl(UserPrincipalImpl.getPrincipalNameFromFullPath(internalUser.getFullPath()));
+ userPrincipal.setEnabled(internalUser.isEnabled());
+ userPrincipals.add(userPrincipal);
}
return userPrincipals;
}
@@ -109,10 +112,13 @@
public void updateUserPrincipal(UserPrincipal userPrincipal) throws
SecurityException
{
InternalUserPrincipal internalUser =
securityAccess.getInternalUserPrincipal(userPrincipal.getName(), false);
- if ( null != internalUser && internalUser.isEnabled() !=
userPrincipal.isEnabled() )
+ if ( null != internalUser )
{
- internalUser.setEnabled(userPrincipal.isEnabled());
- securityAccess.setInternalUserPrincipal(internalUser, false);
+ if ( internalUser.isEnabled() != userPrincipal.isEnabled())
+ {
+ internalUser.setEnabled(userPrincipal.isEnabled());
+ securityAccess.setInternalUserPrincipal(internalUser, false);
+ }
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
