markt 2004/02/27 14:08:25
Modified: catalina/src/share/org/apache/catalina/realm
UserDatabaseRealm.java
Log:
Provide an implementation for getName() and getPassword(). Found this whilst trying
to use CLIENT-CERT authentication with the Sun web services developement kit.
Ported from TC5.
Revision Changes Path
1.9 +12 -17
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
Index: UserDatabaseRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UserDatabaseRealm.java 9 Jun 2002 02:19:43 -0000 1.8
+++ UserDatabaseRealm.java 27 Feb 2004 22:08:25 -0000 1.9
@@ -69,25 +69,14 @@
import java.util.ArrayList;
import java.util.Iterator;
import javax.naming.Context;
-import javax.naming.InitialContext;
-import org.apache.catalina.Container;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Engine;
import org.apache.catalina.Group;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Realm;
import org.apache.catalina.Role;
-import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.digester.Digester;
/**
@@ -270,7 +259,13 @@
*/
protected String getPassword(String username) {
- return (null);
+ User user = database.findUser(username);
+
+ if (user == null) {
+ return (null);
+ }
+
+ return (user.getPassword());
}
@@ -280,7 +275,7 @@
*/
protected Principal getPrincipal(String username) {
- return (null);
+ return (database.findUser(username));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
