taylor 02/04/16 19:04:56
Modified: src/java/org/apache/jetspeed/services/rundata
DefaultJetspeedRunData.java
src/java/org/apache/jetspeed/services/security
JetspeedDBSecurityService.java
Log:
Fixed bug in JetspeedDBSecurityService to honor forced upper and lower case settings
on usernames in the auto-disable feature
Revision Changes Path
1.8 +8 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java
Index: DefaultJetspeedRunData.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultJetspeedRunData.java 16 Apr 2002 18:12:47 -0000 1.7
+++ DefaultJetspeedRunData.java 17 Apr 2002 02:04:56 -0000 1.8
@@ -62,6 +62,7 @@
import org.apache.jetspeed.capability.CapabilityMapFactory;
import org.apache.turbine.services.rundata.DefaultTurbineRunData;
import org.apache.turbine.om.security.TurbineUser;
+import org.apache.turbine.om.ObjectKey;
import java.util.Stack;
@@ -75,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Raphaël Luta</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
- * @version $Id: DefaultJetspeedRunData.java,v 1.7 2002/04/16 18:12:47 taylor Exp $
+ * @version $Id: DefaultJetspeedRunData.java,v 1.8 2002/04/17 02:04:56 taylor Exp $
*/
public class DefaultJetspeedRunData extends DefaultTurbineRunData
implements JetspeedRunData
@@ -335,7 +336,12 @@
{
return 0;
}
- return ((Number)(turbineUser.getPrimaryKey().getValue())).intValue();
+ ObjectKey okey = turbineUser.getPrimaryKey();
+ if (okey == null)
+ {
+ return 0;
+ }
+ return ((Number)(okey.getValue())).intValue();
}
}
1.18 +5 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedDBSecurityService.java
Index: JetspeedDBSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedDBSecurityService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JetspeedDBSecurityService.java 20 Mar 2002 06:55:48 -0000 1.17
+++ JetspeedDBSecurityService.java 17 Apr 2002 02:04:56 -0000 1.18
@@ -101,7 +101,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: JetspeedDBSecurityService.java,v 1.17 2002/03/20 06:55:48 paulsp
Exp $
+ * @version $Id: JetspeedDBSecurityService.java,v 1.18 2002/04/17 02:04:56 taylor
Exp $
*/
@@ -495,6 +495,8 @@
public boolean disableUserCheck(String username)
{
+ username = convertUserName(username);
+
// TODO: make this work across a cluster of servers
UserLogonStats stat = (UserLogonStats)users.get(username);
if (stat == null)
@@ -532,6 +534,7 @@
try
{
// disable the account
+ username = convertUserName(username);
JetspeedUser user = (JetspeedUser)JetspeedSecurity.getUser(username);
if (user != null)
{
@@ -548,6 +551,7 @@
public void resetUserCheck(String username)
{
// TODO: make this work across a cluster of servers
+ username = convertUserName(username);
UserLogonStats stat = (UserLogonStats)users.get(username);
if (stat == null)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
