Update jakarta-tomcat to 3.1.1. This is a security fix release, and the

vulnerabilities file will be updated.

Changes from jakarta-tomcat-3.1:

===============================================================================
6.  SECURITY VULNERABILITIES FIXED IN TOMCAT 3.1.1


6.1 Administrative Application Enabled By Default

The administrative application (at context path "/admin") was enabled by
default in Tomcat 3.1, which allowed unauthenticated remote users to add and
remove appliations from a running Tomcat 3.1 installation if it was left
installed.

To avoid such problems, the administrative application has been removed from
the binary distribution of Tomcat 3.1.1.  It can be installed if desired by:
- Downloading the source distribution of Tomcat 3.1.1.
- Modifying the "build.xml" file to remove the commenting around the
  logic that creates the adminstrative application.
- Running the build.sh or build.bat script.


6.2 Case Sensitive Matches on Static Resources

In Tomcat 3.1, matches against the filenames of static resources was done in a
case insensitive manner on case insensitive platforms (such as Microsoft
Windows).  This can cause sensitive information to be exposed to remote users
who experiment with differently cased request URIs.

To avoid such problems, Tomcat 3.1.1 performs filename comparisons for static
resources in a case sensitive manner, even on Windows.  This means that your
hyperlinks must specify the correct case, or a 404 error will be returned.

Because this can cause significant conversion problems for existing
applications deployed on Tomcat 3.1, a configuration option is provided to
temporarily turn off case sensitive matching.  Edit the file "conf/web.xml"
and modify the value for the "caseSensitive" initialization parameter to the
default file-serving servlet.

WARNING:  CHANGING THIS SETTING WILL RE-INTRODUCE THE SECURITY VULNERABILITY
PRESENT IN TOMCAT 3.1 -- IT IS *STRONGLY* RECOMMENDED THAT YOU CORRECT YOUR
URLS TO MATCH CORRECTLY INSTEAD OF USING THIS OPTION.  Note:  All later
versions of Tomcat perform filename matches in a case sensitive manner.


6.3 Snoop Servlet Mappings in Example Application

In the deployment descriptor for the example application delivered with
Tomcat 3.1, a "snoop" servlet was mapped to URL patterns "/snoop" and
"*.snp".  Theses mappings (in particular the second one) could cause exposure
of sensitive information on the internal organization of your web application
(for example, when a non-existent page "foo.snp" is requested).

To avoid these problems, the offending mappings have been commented out.


6.4 Show Source Vulnerability

The example application delivered with Tomcat 3.1 included a mechanism to
display the source code for the JSP page examples.  This mechanism could
be used to bypass the restrictions on displaying sensitive information in
the WEB-INF and META-INF directories.  This vulnerability has been removed.


6.5 Requesting Unknown JSP Pages

In Tomcat 3.1, the error message in response to a request for an unknown JSP
page would include the absolute disk file pathname of the corresponding file
which could not be found, which exposes sensitive information about how your
application is deployed.  The error message has been adjusted to include only
the context-relative path of the JSP page which could not be found.


6.6 Session ID Vulnerability

The algorithm used to calculate session identifiers for new sessions was
subject to attack by attempting to guess what the next session identifier will
be, and therefore hijack the session.  In addition, the generated identifier
exposed sensitive information (the number of sessions that have been created
since this web application was started.

To avoid these problems, the session identifier generation algorithm has been
replaced by the algorithm used in Tomcat 3.2, which is not subject to these
attacks, and does not expose session count information.


6.7 Server Shutdown Vulnerability

In Tomcat 3.1, it was possible to establish a remote network connection to the
AJP12 connector and cause Tomcat to shut itself down.  Now, this network
connection must be created from the same server that Tomcat is running on.

NOTE:  While this is more secure than Tomcat 3.1 (and mirrors the protection
provided by Tomcat 3.2), it is still vulnerable to attack by users who can
create socket connections from the server.  Suitable use of firewalls and
"TCP Wrappers" applications are suggested around the APJ12 port.

6 files changed, 52 insertions, 53 deletions

diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index bd4f4dd0a08..52481c59c34 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2000/09/03 13:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/12/13 03:49:30 jwise Exp $
 
 DISTNAME=	jakarta-tomcat.src
-PKGNAME=	jakarta-tomcat-3.1
+PKGNAME=	jakarta-tomcat-3.1.1
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/tomcat/release/v3.1/src/
-DISTFILES=	jakarta-tomcat.tar.gz jakarta-tools.tar.gz jakarta-ant.tar.gz
+MASTER_SITES=	http://jakarta.apache.org/builds/tomcat/release/v3.1.1/src/
+DISTFILES=	jakarta-tomcat-3.1.1-src.tar.gz jakarta-tools.tar.gz jakarta-ant.tar.gz
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 
-DIST_SUBDIR=	jakarta-3.1
+DIST_SUBDIR=	jakarta-3.1.1
 
 USE_JAVA=	yes
 
-WRKSRC=		${WRKDIR}/jakarta-tomcat
+WRKSRC=		${WRKDIR}/jakarta-tomcat-3.1.1-src
 
 JAKARTA_HOME=	${PREFIX}/jakarta
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
diff --git a/www/jakarta-tomcat/files/md5 b/www/jakarta-tomcat/files/md5
index 1cc6fabbae1..24ac8ea15bf 100644
--- a/www/jakarta-tomcat/files/md5
+++ b/www/jakarta-tomcat/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.3 2000/05/14 23:35:27 jwise Exp $
+$NetBSD: md5,v 1.4 2000/12/13 03:49:30 jwise Exp $
 
-MD5 (jakarta-3.1/jakarta-tomcat.tar.gz) = 32025cd19b28c416532eb17e7cda1218
-MD5 (jakarta-3.1/jakarta-tools.tar.gz) = c9a7d3860b862e8b66200d2cc573ba0b
-MD5 (jakarta-3.1/jakarta-ant.tar.gz) = f3c6f2df40562b36eed067a8b6580526
+MD5 (jakarta-3.1.1/jakarta-tomcat-3.1.1-src.tar.gz) = 1c1091acc6fc3116d0ffbc5d8bac34de
+MD5 (jakarta-3.1.1/jakarta-tools.tar.gz) = c9a7d3860b862e8b66200d2cc573ba0b
+MD5 (jakarta-3.1.1/jakarta-ant.tar.gz) = f3c6f2df40562b36eed067a8b6580526
diff --git a/www/jakarta-tomcat/files/patch-sum b/www/jakarta-tomcat/files/patch-sum
index 1d29a1866aa..4744ece12fb 100644
--- a/www/jakarta-tomcat/files/patch-sum
+++ b/www/jakarta-tomcat/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/05/31 22:47:28 jwise Exp $
+$NetBSD: patch-sum,v 1.5 2000/12/13 03:49:30 jwise Exp $
 
-MD5 (patch-aa) = e092af614d52c333443970cbe61b3257
-MD5 (patch-ab) = abdbe33cda4ab2eab28bb1c396d3bca2
+MD5 (patch-aa) = 8965bfb0403833d22e92c963ebb78674
+MD5 (patch-ab) = c53b218d07d676bd8a5a8b351f5467c1
 MD5 (patch-ac) = 4dc7fd9b8fe64cd3726ae64b0fc32411
diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa
index a7f2a7e459e..a86be3ed5f5 100644
--- a/www/jakarta-tomcat/patches/patch-aa
+++ b/www/jakarta-tomcat/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2000/09/03 13:38:49 wiz Exp $
---- build.xml.orig	Sun May 14 17:16:26 2000
-+++ build.xml	Sun May 14 17:17:45 2000
+$NetBSD: patch-aa,v 1.4 2000/12/13 03:49:30 jwise Exp $
+--- build.xml.orig	Tue Dec 12 14:50:46 2000
++++ build.xml	Tue Dec 12 18:53:17 2000
 @@ -6,7 +6,7 @@
-     <property name="ant.home" value="../jakarta-ant" />

-     <property name="build.compiler" value="classic"/>

-     <property name="tomcat.build" value="../build/tomcat"/>

--    <property name="tomcat.home" value="../dist/tomcat"/>

-+    <property name="tomcat.home" value="@JAKARTA_HOME@/tomcat"/>

-   </target>

- 

-   <!-- ==================== Copy static files ==================== -->

+     <property name="ant.home" value="../jakarta-ant" />
+     <property name="build.compiler" value="classic"/>
+     <property name="tomcat.build" value="../build/tomcat"/>
+-    <property name="tomcat.home" value="../dist/tomcat"/>
++    <property name="tomcat.home" value="@JAKARTA_HOME@/tomcat"/>
+   </target>
+ 
+   <!-- ==================== Copy static files ==================== -->
diff --git a/www/jakarta-tomcat/patches/patch-ab b/www/jakarta-tomcat/patches/patch-ab
index 34704764c9a..a096b997422 100644
--- a/www/jakarta-tomcat/patches/patch-ab
+++ b/www/jakarta-tomcat/patches/patch-ab
@@ -1,28 +1,28 @@
-$NetBSD: patch-ab,v 1.3 2000/09/03 13:38:49 wiz Exp $
---- ./src/share/org/apache/tomcat/task/ApacheConfig.java.orig	Sun May 14 18:11:20 2000
-+++ ./src/share/org/apache/tomcat/task/ApacheConfig.java	Sun May 14 18:13:28 2000
+--- src/share/org/apache/tomcat/task/ApacheConfig.java.orig	Tue Dec 12 14:51:28 2000
++++ src/share/org/apache/tomcat/task/ApacheConfig.java	Tue Dec 12 18:58:28 2000
 @@ -97,7 +97,7 @@
- 	    } else {

- 		// XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat

- 		// home

--		pw.println("LoadModule jserv_module libexec/mod_jserv.so");

-+		pw.println("LoadModule jserv_module @LOCALBASE@/lib/httpd/mod_jserv.so");

- 	    }

- 

- 	    pw.println("ApJServManual on");

-@@ -105,13 +105,14 @@
- 	    pw.println("ApJServSecretKey DISABLED");

- 	    pw.println("ApJServMountCopy on");

- 	    pw.println("ApJServLogLevel notice");

-+	    pw.println("ApJServLogFile /var/log/httpd/jserv/mod_jserv.log");

- 	    pw.println();

- 	    

- 	    // XXX read it from ContextManager

- 	    pw.println("ApJServDefaultPort 8007");

- 

- 	    pw.println();

--	    pw.println("AddType test/jsp .jsp");

-+	    pw.println("AddType text/jsp .jsp");

- 	    pw.println("AddHandler jserv-servlet .jsp");

- 

- 	    

+ 	    } else {
+ 		// XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat
+ 		// home
+-		pw.println("LoadModule jserv_module libexec/mod_jserv.so");
++		pw.println("LoadModule jserv_module @LOCALBASE@/lib/httpd/mod_jserv.so");
+ 	    }
+ 
+ 	    pw.println("ApJServManual on");
+@@ -105,13 +105,15 @@
+ 	    pw.println("ApJServSecretKey DISABLED");
+ 	    pw.println("ApJServMountCopy on");
+ 	    pw.println("ApJServLogLevel notice");
++	    pw.println("ApJServLogFile /var/log/httpd/jserv/mod_jserv.log");
++
+ 	    pw.println();
+ 	    
+ 	    // XXX read it from ContextManager
+ 	    pw.println("ApJServDefaultPort 8007");
+ 
+ 	    pw.println();
+-	    pw.println("AddType test/jsp .jsp");
++	    pw.println("AddType text/jsp .jsp");
+ 	    pw.println("AddHandler jserv-servlet .jsp");
+ 
+ 	    
diff --git a/www/jakarta-tomcat/pkg/PLIST b/www/jakarta-tomcat/pkg/PLIST
index c396a77e7b7..b99ce3ec2bc 100644
--- a/www/jakarta-tomcat/pkg/PLIST
+++ b/www/jakarta-tomcat/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/05/14 23:35:28 jwise Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/12/13 03:49:31 jwise Exp $
 jakarta/tomcat/LICENSE
 jakarta/tomcat/bin/ant
 jakarta/tomcat/bin/antRun
@@ -371,7 +371,6 @@ jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlAction.java
 jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlMapper.java
 jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlMatch.java
 jakarta/tomcat/webapps/ROOT.war
-jakarta/tomcat/webapps/admin.war
 jakarta/tomcat/webapps/examples.war
 jakarta/tomcat/webapps/test.war
 @comment these are automatically created at run time