remm 01/07/05 22:02:22
Modified: src/wrappers/catalina SlideRealm.java
Log:
- Will now refuse to authenticate a user if there is no password property on the
user object in the Slide namespace.
- The password property now belongs to the Slide namespace.
Revision Changes Path
1.6 +15 -7 jakarta-slide/src/wrappers/catalina/SlideRealm.java
Index: SlideRealm.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideRealm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SlideRealm.java 2001/06/13 04:39:41 1.5
+++ SlideRealm.java 2001/07/06 05:02:17 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideRealm.java,v 1.5
2001/06/13 04:39:41 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2001/06/13 04:39:41 $
+ * $Header: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideRealm.java,v 1.6
2001/07/06 05:02:17 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/07/06 05:02:17 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* to tomcat, webdav or default.
*
* @author Remy Maucherat
- * @version $Revision: 1.5 $ $Date: 2001/06/13 04:39:41 $
+ * @version $Revision: 1.6 $ $Date: 2001/07/06 05:02:17 $
*/
public final class SlideRealm
@@ -242,7 +242,7 @@
return null;
}
- String passwordValue = username;
+ String passwordValue = null;
try {
@@ -251,13 +251,21 @@
NodeRevisionDescriptor revisionDescriptor =
contentHelper.retrieve(slideToken, revisionDescriptors);
NodeProperty password =
- revisionDescriptor.getProperty("password");
- if (password != null)
+ revisionDescriptor.getProperty
+ ("password", NodeProperty.SLIDE_NAMESPACE);
+ if (password != null) {
passwordValue = (String) password.getValue();
+ }
} catch (SlideException e) {
// Whatever happens doesn't really matter
// The stack trace is displayed for now for debug purposes
+ }
+
+ if (passwordValue == null) {
+ log("User " + username
+ + " doesn't have his password property set : "
+ + "can't authenticate");
}
return passwordValue;
