cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs realm-howto.xml
markt 2004/11/27 10:29:44
Modified:catalina/src/share/org/apache/catalina/realm
DataSourceRealm.java JAASRealm.java JDBCRealm.java
LocalStrings.properties MemoryRealm.java
RealmBase.java UserDatabaseRealm.java
webapps/tomcat-docs realm-howto.xml
Log:
Fix bug 19767. Port support for digested passwords with DIGEST
authentication for JDBC and DataSource realms from TC5.
Remove unused imports in o.a.c.realm package
Revision ChangesPath
1.4 +135 -73
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
Index: DataSourceRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DataSourceRealm.java 26 Aug 2004 21:37:21 - 1.3
+++ DataSourceRealm.java 27 Nov 2004 18:29:44 - 1.4
@@ -18,36 +18,20 @@
package org.apache.catalina.realm;
-import java.io.File;
-import java.security.MessageDigest;
import java.security.Principal;
import java.sql.Connection;
-import java.sql.Driver;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Properties;
-import javax.naming.InitialContext;
import javax.naming.Context;
-import javax.naming.NamingException;
import javax.sql.DataSource;
-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.Logger;
-import org.apache.catalina.Realm;
-import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.util.HexUtils;
-import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.util.Base64;
/**
*
@@ -323,64 +307,37 @@
*/
private Principal authenticate(Connection dbConnection,
String username,
- String credentials)
-throws SQLException {
+ String credentials) {
-ResultSet rs = null;
-PreparedStatement stmt = null;
-ArrayList list = null;
-try {
-// Look up the user's credentials
-String dbCredentials = null;
-stmt = credentials(dbConnection, username);
-rs = stmt.executeQuery();
-while (rs.next()) {
-dbCredentials = rs.getString(1).trim();
-}
-rs.close();
-rs = null;
-stmt.close();
-stmt = null;
-if (dbCredentials == null) {
-return (null);
-}
-
-// Validate the user's credentials
-boolean validated = false;
-if (hasMessageDigest()) {
-// Hex hashes should be compared case-insensitive
-validated =
(digest(credentials).equalsIgnoreCase(dbCredentials));
-} else
-validated = (digest(credentials).equals(dbCredentials));
-
-if (validated) {
-if (debug = 2)
-log(sm.getString(dataSourceRealm.authenticateSuccess,
- username));
-} else {
-if (debug = 2)
-log(sm.getString(dataSourceRealm.authenticateFailure,
- username));
-return (null);
-}
-
-// Accumulate the user's roles
-list = new ArrayList();
-stmt = roles(dbConnection, username);
-rs = stmt.executeQuery();
-while (rs.next()) {
-list.add(rs.getString(1).trim());
-}
-} finally {
-if (rs != null) {
-rs.close();
-}
-if (stmt != null) {
-stmt.close();
-}
+// No user - can't possibly authenticate
+if (username == null) {
+return (null);
}
+String dbCredentials = getPassword(username);
+
+// Validate the user's credentials
+boolean validated = false;
+if (hasMessageDigest()) {
+// Hex hashes should be compared case-insensitive
+validated =
DO NOT REPLY [Bug 19767] - Digest authentication doesn't work with JDBCRealm
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=19767. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=19767 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED OS/Version||All Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-11-27 19:31 --- Fixed in CVS. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Re: Document
Here is the file. --- Trend GateLock [EMAIL PROTECTED] (higp1.gatelock.com.tw) ** your_document.pif Trend GateLock [EMAIL PROTECTED] (higp1.gatelock.com.tw) ** your_document.pif WORM_NETSKY.D - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp SimpleTcpCluster.java
pero2004/11/27 13:10:20
Modified:modules/cluster build.xml to-do.txt
modules/cluster/src/share/org/apache/catalina/cluster
ClusterDeployer.java mbeans-descriptors.xml
modules/cluster/src/share/org/apache/catalina/cluster/deploy
FarmWarDeployer.java FileMessageFactory.java
WarWatcher.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
Log:
Fix cluster FarmWarDeployer
add controlled WarWatcher with engine backgroundProcess()
add more log messages
Revision ChangesPath
1.9 +1 -0 jakarta-tomcat-catalina/modules/cluster/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 13 Jul 2004 15:24:47 - 1.8
+++ build.xml 27 Nov 2004 21:10:19 - 1.9
@@ -18,6 +18,7 @@
path id=cluster.classpath
pathelement location=${catalina.build}/server/lib/catalina.jar/
pathelement location=${catalina.build}/server/lib/tomcat-util.jar/
+pathelement location=${commons-modeler.jar}/
pathelement location=${commons-logging.jar}/
pathelement location=${jmx.jar}/
pathelement location=${catalina.build}/common/lib/servlet-api.jar/
1.4 +20 -1 jakarta-tomcat-catalina/modules/cluster/to-do.txt
Index: to-do.txt
===
RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/to-do.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- to-do.txt 29 Sep 2004 18:59:32 - 1.3
+++ to-do.txt 27 Nov 2004 21:10:19 - 1.4
@@ -1,12 +1,31 @@
1. Fix farm deployment for 5.5
+ pero:
+ Every start all application are deployed only to all running cluster
nodes
+ New registered nodes don't get the applications!
+ Deploy must send a GET_ALL_APP to all other Deployers.
+ Only watchEnabled Deployer send this member all
deployed application.
+ Add JMX Support
+ Resend Deployed Applications to all or one cluster node.
+ Show all watch Resource
+ Processing Time
+ Change fileMessage Buffersize.
+ Start/Stop Cluster wide application
+ Deployer and Watcher sync with engine background thread!
+ Fixed!
+ Last FileMessage fragment need longe ackTimeout
+ Cluster .. Sender ... ackTimeout=6/ /Cluster
2. Extend StandardSession if possible
3. Implement primary/secondary replication logic
4. Implement fragmentation of large replication objects
-5. Implementa NonSerializable interface for session attributes that do not
+5. Implement a NonSerializable interface for session attributes that do not
wish to be replicated
6. Implement context attribute replication (?)
+ pero:
+ Also send Start/Stop messages from Context to complete cluster!
7. JMX friendly
8. Documentation
9. Add a flag for replicated attribute events, to enable or disable them -
+ pero:
+ Why different defaults from notifyListenersOnReplication at
SimpleTcpCluster and DeltaManager exists?
COMPLETED
1.4 +6 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterDeployer.java
Index: ClusterDeployer.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterDeployer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClusterDeployer.java 26 Oct 2004 14:29:02 - 1.3
+++ ClusterDeployer.java 27 Nov 2004 21:10:20 - 1.4
@@ -98,4 +98,9 @@
* removal
*/
public void remove(String contextPath, boolean undeploy) throws
IOException;
+
+/**
+ * call from container Background Process
+ */
+public void backgroundProcess();
}
1.2 +0 -8
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mbeans-descriptors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbeans-descriptors.xml25 Apr 2003 21:14:36 - 1.1
+++ mbeans-descriptors.xml27 Nov 2004 21:10:20 - 1.2
@@ -37,10 +37,6 @@
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2004/11/27 13:11:07 Modified:webapps/docs changelog.xml Log: Fix cluster FarmWarDeployer Revision ChangesPath 1.185 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- changelog.xml 24 Nov 2004 18:52:44 - 1.184 +++ changelog.xml 27 Nov 2004 21:11:07 - 1.185 @@ -98,6 +98,13 @@ add Better log support to DeltaManager to see detail information at debug level. (pero) /add +fix + Fix FarmWarDeployer based on new HostConfig deployer. (pero) + /fix +fix + FarmWarDeployer controlled WarWatcher with engine backgroundProcess call. + Added processExpiresFrequency attribute to Deployer server.xml element. (pero) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy FarmWarDeployer.java
pero2004/11/27 13:16:14
Modified:modules/cluster/src/share/org/apache/catalina/cluster/deploy
FarmWarDeployer.java
Log:
fix comment!
Revision ChangesPath
1.5 +0 -12
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Index: FarmWarDeployer.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FarmWarDeployer.java 27 Nov 2004 21:10:20 - 1.4
+++ FarmWarDeployer.java 27 Nov 2004 21:16:14 - 1.5
@@ -54,18 +54,6 @@
* @author Peter Rossbach
* @version 1.1
*/
-/**
- * @author peter
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-/**
- * @author peter
- *
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
public class FarmWarDeployer implements ClusterDeployer, FileChangeListener {
/*--Static Variables*/
public static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32319] - Idle connection disconnect - free waiting tomcat threads
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32319. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32319 --- Additional Comments From [EMAIL PROTECTED] 2004-11-28 01:08 --- Created an attachment (id=13560) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=13560action=view) Call new jk method hook maintain from apache 1.3 jk_handler Part one of the patch: apached-1.3 patch -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32319] - Idle connection disconnect - free waiting tomcat threads
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32319. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32319 --- Additional Comments From [EMAIL PROTECTED] 2004-11-28 01:10 --- Created an attachment (id=13561) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=13561action=view) Implement maintain jk method hook + minor bug fixes part 2: patch for the common files to implement maintain hook -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32319] - Idle connection disconnect - free waiting tomcat threads
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32319. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32319 --- Additional Comments From [EMAIL PROTECTED] 2004-11-28 01:25 --- 'check' renamed to 'maintain' OK time(NULL) called globally OK diff -u attached close_idle_endpoints function: closes all endpoints of a worker from inside the maintain call, if the endpoint was not used at least idle_timeout seconds (default: disabled). Note: 1) All changes are included inside defines: KPDT_MAINTAIN_HOOK: add maintain hook KPDT_IDLE_TIMEOUT: add idle timeout (needs also KPDT_MAINTAIN) KPDT_BUG_FIX: some very small bug fixes KPDT_DEBUG: Adds more debug log output (not for production) 2) I didn't have the time to compile and test. Since I changes the names (check - maintain) and the position of the time() calls, I might have introduced errors. I will not be able to test before wesdnesday. The original code was OK and is productive. 3) I'm not sure, if there are implications for multi-threaded use, e.g. Apache 2.0. I think wc_maintain has to be checked. 4) To use the feature: Define attribute maintain_interval (seconds) for the workers in the worker list in workers.properties. If you are using a load balancing worker, you only have to define the attribute for the lb itself. Define attribute idle_timeout (seconds) for all the ajp13 or ajp14 workers used. Whenever a request processed and maintain_interval has passed for any worker in the worker list, if the worker is ajp13 or ajp14 and the connections is idle for longer then idle_timeout, is it closed. If the worker is lb and any of its balanced workers is ajp13 or ajp14 and idle for more than its idle_timeout, its connections is also closed. I hope this is understandable ;) -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Document
-- Virus Warning Message (on uusnwa0p) Found virus WORM_NETSKY.Z in file Notice.txt .exe (in Notice.zip) The file is deleted. - Important notice! -- Virus Warning Message (on uusnwa0p) Notice.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
