cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java
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 ChangesPath
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.java9 Jun 2002 02:19:43 - 1.8
+++ UserDatabaseRealm.java27 Feb 2004 22:08:25 - 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]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java
craigmcc02/02/08 09:07:42
Modified:catalina/src/conf server.xml
catalina/src/share/org/apache/catalina/realm
UserDatabaseRealm.java
Log:
Stop playing games with the "resourceName" property setter. (Manveen, you
will want to add a validation on the "java:" prefix in the admin app.)
Revision ChangesPath
1.53 +1 -1 jakarta-tomcat-4.0/catalina/src/conf/server.xml
Index: server.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- server.xml23 Jan 2002 17:42:19 - 1.52
+++ server.xml8 Feb 2002 17:07:42 - 1.53
@@ -164,7 +164,7 @@
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
+ debug="0" resourceName="java:UserDatabase"/>
1.6 +6 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDatabaseRealm.java3 Feb 2002 00:56:58 - 1.5
+++ UserDatabaseRealm.java8 Feb 2002 17:07:42 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v
1.5 2002/02/03 00:56:58 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/03 00:56:58 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v
1.6 2002/02/08 17:07:42 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/08 17:07:42 $
*
*
*
@@ -96,7 +96,7 @@
* of UserDatabase that we should consult.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/02/03 00:56:58 $
+ * @version $Revision: 1.6 $ $Date: 2002/02/08 17:07:42 $
* @since 4.1
*/
@@ -131,7 +131,7 @@
* The global JNDI name of the UserDatabase resource
* we will be utilizing.
*/
-protected String resourceName = "java:/UserDatabase";
+protected String resourceName = "java:UserDatabase";
/**
@@ -175,7 +175,7 @@
*/
public void setResourceName(String resourceName) {
-this.resourceName = "java:" + resourceName;
+this.resourceName = resourceName;
}
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java
craigmcc02/01/19 19:16:35 Modified:catalina/src/conf server.xml Added: catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java Log: Add a new realm that knows how to authenticate against a UserDatabase object that is configured in the global resources. This provides equivalent behavior to the old MemoryRealm, but allows the database to be edited and saved at the same time. Modify server.xml as follows: * Define a resource for the MemoryUserDatabase implementation, configuring the relative pathname of the XML file containing the data, under name "catalina/UserDatabase" in the global JNDI resources. * Change the default to an instance of UserDatabaseRealm that uses this exact same UserDatabase instance (identified by the resource name being "catalina/UserDatabase" and matching the global JNDI resource name). * Add a commented-out example of how you would define a resource link to make the user database available as a JNDI-accessible object to a web application. Note that an application can *not* do this itself (in web.xml -- it must be deliberately enabled by editing server.xml). Doc updates to cover all this stuff are coming soon. Revision ChangesPath 1.50 +49 -0 jakarta-tomcat-4.0/catalina/src/conf/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- server.xml17 Jan 2002 20:16:53 - 1.49 +++ server.xml20 Jan 2002 03:16:35 - 1.50 @@ -21,7 +21,27 @@ + + + + + + + + +factory +org.apache.catalina.users.MemoryUserDatabaseFactory + + +pathname +conf/tomcat-users.xml + + + + + + + + @@ -224,6 +255,24 @@ + + + + +
