cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
remm02/03/14 12:41:38
Modified:tester/src/bin tester.xml
Log:
- Group the security oriented tests together.
Revision ChangesPath
1.83 +24 -11jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- tester.xml3 Jan 2002 00:56:42 - 1.82
+++ tester.xml14 Mar 2002 20:41:38 - 1.83
@@ -15,7 +15,7 @@
taskdef name=tester classname=org.apache.tester.TestClient/
- target name=all
depends=ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,FilterRequest,FilterResponse,Jndi,Jsp,Lifecycle,RequestDispatcher,Resources,ServletContext,ServletRequest,ServletResponse,HttpSession,XercesTest/
+ target name=all
depends=ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,FilterRequest,FilterResponse,Jndi,Jsp,Lifecycle,RequestDispatcher,Resources,Security,ServletContext,ServletRequest,ServletResponse,HttpSession,XercesTest/
target name=ROOT
@@ -32,11 +32,6 @@
request=${examples.path}/.. debug=${debug}
status=302/
-!-- Should not be able to use relative path above document root --
-tester host=${host} port=${port} protocol=HTTP/1.0
- request=${examples.path}/../.. debug=${debug}
- status=404/
-
!-- Should be able to successfully retrieve a golden file --
tester host=${host} port=${port} protocol=${protocol}
request=${context.path}/Golden01
@@ -211,11 +206,6 @@
request=${examples.path}/jsp/snp/snoop.jsp
status=200/
-!-- DefaultServlet should not decode the path again --
-tester host=${host} port=${port} protocol=HTTP/1.0
- request=${examples.path}/jsp/snp/snoop%252ejsp
- status=400/
-
/target
@@ -1380,6 +1370,29 @@
debug=${debug}
request=${context.path}/Resources06?path=/WEB-INF
outContent=Resources06 PASSED/
+
+ /target
+
+
+ target name=Security
+
+!-- == Security Tests --
+
+!-- Should not be able to use relative path above document root --
+tester host=${host} port=${port} protocol=HTTP/1.0
+ request=${examples.path}/../.. debug=${debug}
+ status=400/
+
+!-- Should not be able to use specially crafted URLs to get around
+ security constraints --
+tester host=${host} port=${port} protocol=HTTP/1.0
+ request=${examples.path}/jsp/security//protected/index.jsp
+ debug=${debug} status=302/
+
+!-- DefaultServlet should not decode the path again --
+tester host=${host} port=${port} protocol=HTTP/1.0
+ request=${examples.path}/jsp/snp/snoop%252ejsp
+ status=404/
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc02/01/02 16:56:42
Modified:tester/src/bin tester.xml
Log:
Default home page is now index.jsp instead of index.html, so update the
test accordingly.
Revision ChangesPath
1.82 +1 -1 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- tester.xml21 Dec 2001 19:15:38 - 1.81
+++ tester.xml3 Jan 2002 00:56:42 - 1.82
@@ -24,7 +24,7 @@
!-- Should be able to see the home page --
tester host=${host} port=${port} protocol=${protocol}
- request=/index.html debug=${debug}
+ request=/index.jsp debug=${debug}
status=200/
!-- Should be able to use relative path to document root --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
remm01/12/20 04:37:02
Modified:tester/src/bin tester.xml
Log:
- Add test case for bug 5497.
Revision ChangesPath
1.80 +5 -1 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- tester.xml2001/12/15 00:44:29 1.79
+++ tester.xml2001/12/20 12:37:02 1.80
@@ -343,7 +343,6 @@
status=200
outContent=ErrorPage10 PASSED/
-
/target
@@ -867,6 +866,11 @@
tester host=${host} port=${port} protocol=${protocol}
request=${context.path}/Include01 debug=${debug}
+ outContent=Include01 PASSED/
+
+tester host=${host} port=${port} protocol=${protocol}
+ request=${context.path}/Include01 debug=${debug}
+ inHeaders=If-modified-since: Mon, 20 Dec 2010 12:12:54 GMT
outContent=Include01 PASSED/
tester host=${host} port=${port} protocol=${protocol}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
remm01/12/20 06:07:14
Modified:tester/src/bin Tag: tomcat_40_branch tester.xml
Log:
- Add test case for bug 5497.
Revision ChangesPath
No revision
No revision
1.69.2.3 +5 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.69.2.2
retrieving revision 1.69.2.3
diff -u -r1.69.2.2 -r1.69.2.3
--- tester.xml2001/10/15 22:33:50 1.69.2.2
+++ tester.xml2001/12/20 14:07:14 1.69.2.3
@@ -750,6 +750,11 @@
request=${context.path}/WrappedInclude01 debug=${debug}
outContent=Include01 PASSED/
+tester host=${host} port=${port} protocol=${protocol}
+ request=${context.path}/Include01 debug=${debug}
+ inHeaders=If-modified-since: Mon, 20 Dec 2010 12:12:54 GMT
+ outContent=Include01 PASSED/
+
!-- == Included Servlet Throwing Exceptions == --
tester host=${host} port=${port} protocol=${protocol}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/12/14 16:44:29
Modified:tester/src/bin tester.xml
Log:
Actually check for no output (i.e. content length is zero).
Revision ChangesPath
1.79 +1 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- tester.xml2001/12/15 00:33:21 1.78
+++ tester.xml2001/12/15 00:44:29 1.79
@@ -1586,6 +1586,7 @@
!-- Also check debug output to make sure no extra content was included --
tester host=${host} port=${port} protocol=
request=${context.path}/Redirect01 debug=${debug}
+ outContent=
status=302 redirect=false/
tester host=${host} port=${port} protocol=
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/12/11 18:26:10
Modified:tester/src/bin tester.xml
Log:
Change tester's script to check for the real result (404 not 500) on an
invalid URL that tries to go above the context root.
Revision ChangesPath
1.74 +1 -1 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- tester.xml2001/11/12 21:37:28 1.73
+++ tester.xml2001/12/12 02:26:10 1.74
@@ -35,7 +35,7 @@
!-- Should not be able to use relative path above document root --
tester host=${host} port=${port} protocol=HTTP/1.0
request=${examples.path}/../.. debug=${debug}
- status=500/
+ status=404/
!-- Should be able to successfully retrieve a golden file --
tester host=${host} port=${port} protocol=${protocol}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
On Sat, 25 Aug 2001, Glenn Nielsen wrote: Date: Sat, 25 Aug 2001 21:12:18 -0500 From: Glenn Nielsen [EMAIL PROTECTED] Reply-To: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: Re: cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml Craig, Would this replacement URL class allow the manager servlet bug which prevents releoading a war file from the same URL to be fixed in Tomcat 4? Are you referring to a specific outstanding Bugzilla bug report? I'm not aware of a current issue (I thought it was addressed already). In principle, the new org.apache.catalina.util.URL is unlikely to deal with problems like this -- it does *not* included any openConnection() or openStream(). The problem that brought this about was that java.net.URL requires a valid URLStreamHandler, which means you cannot use it (for example) to do a response.sendRedirect() to an https server unless the *calling* Tomcat JVM has JSSE available. Regards, Glenn Craig
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/07/17 15:34:53
Modified:tester/src/bin tester.xml
Log:
With the recent change in normalizing request URIs, this path now returns a
302 instead of a 404.
Revision ChangesPath
1.58 +1 -1 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- tester.xml2001/07/13 00:48:56 1.57
+++ tester.xml2001/07/17 22:34:52 1.58
@@ -35,7 +35,7 @@
!-- Should not be able to use relative path above document root --
tester host=${host} port=${port} protocol=${protocol}
request=${examples.path}/../.. debug=${debug}
- status=404/
+ status=302/
!-- Should be able to successfully retrieve a golden file --
tester host=${host} port=${port} protocol=${protocol}
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
amyroh 01/06/20 15:37:08
Modified:tester/src/bin tester.xml
Log:
Remove one of the CGI tests due to OS dependency.
Revision ChangesPath
1.50 +0 -4 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- tester.xml2001/06/01 00:22:38 1.49
+++ tester.xml2001/06/20 22:37:06 1.50
@@ -1221,10 +1221,6 @@
golden=${golden.path}/binary.txt/
tester host=${host} port=${port} protocol=${protocol}
-request=${context.path}/cgi-bin/chores.pl? debug=${debug}
-golden=${golden.path}/chores.txt/
-
- tester host=${host} port=${port} protocol=${protocol}
request=${context.path}/cgi-bin/concat.pl?first_name=janeamp;last_name=johnsonamp;fiance_first=johnamp;fiance_last=smith
debug=${debug}
golden=${golden.path}/concat.txt/
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
amyroh 01/05/31 17:22:39
Modified:tester/src/bin tester.xml
Log:
Add CGI and SSI exec cgi tests.
Revision ChangesPath
1.49 +65 -2 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- tester.xml2001/05/30 21:54:48 1.48
+++ tester.xml2001/06/01 00:22:38 1.49
@@ -15,7 +15,7 @@
taskdef name=tester classname=org.apache.tester.TestClient/
- target name=all
depends=ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,FilterRequest,FilterResponse,Jndi,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession,XercesTest,SSITest/
+ target name=all
depends=ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,FilterRequest,FilterResponse,Jndi,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession,XercesTest,SSITest,CGITest/
target name=ROOT
@@ -1207,8 +1207,71 @@
tester host=${host} port=${port} protocol=${protocol}
request=${context.path}/SSIFsize08.shtml debug=${debug}
golden=${golden.path}/SSIFsize02.txt/
-
+
/target
+ target name=CGITest
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/array.pl debug=${debug}
+golden=${golden.path}/array.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/binary.pl?counter=102 debug=${debug}
+golden=${golden.path}/binary.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/chores.pl? debug=${debug}
+golden=${golden.path}/chores.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+
request=${context.path}/cgi-bin/concat.pl?first_name=janeamp;last_name=johnsonamp;fiance_first=johnamp;fiance_last=smith
debug=${debug}
+golden=${golden.path}/concat.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/days.pl debug=${debug}
+golden=${golden.path}/days.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/dowhile.pl?start=10 debug=${debug}
+golden=${golden.path}/dowhile.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/else.pl?food=spinach debug=${debug}
+golden=${golden.path}/else.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/elsif.pl?food=chocolate debug=${debug}
+golden=${golden.path}/elsif.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/exponents.pl?number=2amp;power=4
debug=${debug}
+golden=${golden.path}/exponents.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/for.pl?start=10 debug=${debug}
+golden=${golden.path}/dowhile.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/getday.pl debug=${debug}
+golden=${golden.path}/getday.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/helloperl.pl debug=${debug}
+golden=${golden.path}/helloperl.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/if.pl?food=spinach debug=${debug}
+golden=${golden.path}/else.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/increment.pl?counter=7 debug=${debug}
+golden=${golden.path}/increment.txt/
+
+ tester host=${host} port=${port} protocol=${protocol}
+request=${context.path}/cgi-bin/modifyall.pl?number=289 debug=${debug}
+golden=${golden.path}/modifyall.txt/
+
+ /target
/project
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/05/08 11:36:27
Modified:tester/src/bin tester.xml
Log:
Make more strings configurable for testing behind a proxy server.
Revision ChangesPath
1.40 +20 -29jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tester.xml2001/05/03 23:06:28 1.39
+++ tester.xml2001/05/08 18:36:22 1.40
@@ -8,8 +8,10 @@
!-- property name=protocol value=HTTP/1.0/ --
property name=protocol value=/ !-- Use HttpURLConnection --
property name=context.path value=/tester/
+ property name=examples.path value=/examples/
property name=golden.pathvalue=${context.path}/golden/
property name=manager.path value=/manager/
+ property name=reload.pathvalue=/tester/
taskdef name=tester classname=org.apache.tester.TestClient/
@@ -27,12 +29,12 @@
!-- Should be able to use relative path to document root --
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/.. debug=${debug}
+ request=${examples.path}/.. debug=${debug}
status=302/
!-- Should not be able to use relative path above document root --
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/../.. debug=${debug}
+ request=${examples.path}/../.. debug=${debug}
status=404/
!-- Should be able to successfully retrieve a golden file --
@@ -92,57 +94,46 @@
!-- Should be able to execute the Date example --
touch file=${catalina.home}/webapps/examples/jsp/dates/date.jsp/
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/jsp/dates/date.jsp debug=${debug}
+ request=${examples.path}/jsp/dates/date.jsp debug=${debug}
status=200/
!-- Should not be able to view the source of the Date example --
touch file=${catalina.home}/webapps/examples/jsp/dates/date.jsp/
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/jsp/dates/date.Jsp debug=${debug}
+ request=${examples.path}/jsp/dates/date.Jsp debug=${debug}
status=404/
!-- Should not be able to view the source of the Date example --
touch file=${catalina.home}/webapps/examples/jsp/dates/date.jsp/
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/jsp/dates/Date.jsp debug=${debug}
+ request=${examples.path}/jsp/dates/Date.jsp debug=${debug}
status=404/
!-- Should not be able to view the source of the Date example --
touch file=${catalina.home}/webapps/examples/jsp/dates/date.jsp/
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/jsp/Dates/date.jsp debug=${debug}
+ request=${examples.path}/jsp/Dates/date.jsp debug=${debug}
status=404/
!-- Should not be able to view the source of the Date example --
touch file=${catalina.home}/webapps/examples/jsp/dates/date.jsp/
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/Jsp/dates/date.jsp debug=${debug}
+ request=${examples.path}/Jsp/dates/date.jsp debug=${debug}
status=404/
-!-- Should not be able to view the source of the Date example --
-touch file=${catalina.home}/webapps/examples/jsp/dates/date.jsp/
-tester host=${host} port=${port} protocol=${protocol}
- request=/Examples/jsp/dates/date.jsp debug=${debug}
- status=404/
-
!-- Should be able to execute the HelloWorld servlet example --
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/servlet/HelloWorldExample debug=${debug}
+ request=${examples.path}/servlet/HelloWorldExample debug=${debug}
status=200/
!-- Should not be able to execute HelloWorld with different cases --
-tester host=${host} port=${port} protocol=${protocol}
- request=/examples/servlet/helloWorldExample debug=${debug}
- status=404/
-
-!-- Should not be able to execute HelloWorld with different cases --
tester host=${host} port=${port} protocol=${protocol}
- request=/examples/Servlet/HelloWorldExample debug=${debug}
+ request=${examples.path}/servlet/helloWorldExample debug=${debug}
status=404/
!-- Should not be able to execute HelloWorld with different cases --
tester host=${host} port=${port} protocol=${protocol}
- request=/Examples/servlet/HelloWorldExample debug=${debug}
+ request=${examples.path}/Servlet/HelloWorldExample
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
amyroh 01/04/19 21:37:15
Modified:tester/src/bin tester.xml
Log:
Add additional SSI tests including fsize config.
Revision ChangesPath
1.33 +40 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tester.xml2001/04/18 20:40:31 1.32
+++ tester.xml2001/04/20 04:37:13 1.33
@@ -802,6 +802,46 @@
request="${context.path}/SSIInclude08.shtml" debug="${debug}"
golden="${golden.path}/SSIInclude02.txt"/
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIConfig01.shtml" debug="${debug}"
+ golden="${golden.path}/SSIConfig01.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIConfig03.shtml" debug="${debug}"
+ golden="${golden.path}/SSIConfig03.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize01.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude01.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize02.shtml" debug="${debug}"
+ golden="${golden.path}/SSIFsize02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize03.shtml" debug="${debug}"
+ golden="${golden.path}/SSIFsize02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize04.shtml" debug="${debug}"
+ golden="${golden.path}/SSIFsize02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize05.shtml" debug="${debug}"
+ golden="${golden.path}/SSIFsize02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize06.shtml" debug="${debug}"
+ golden="${golden.path}/SSIFsize02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize07.shtml" debug="${debug}"
+ golden="${golden.path}/SSIFsize02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIFsize08.shtml" debug="${debug}"
+ golden="${golden.path}/SSIFsize02.txt"/
+
/target
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/04/18 13:40:32
Modified:catalina/src/share/org/apache/catalina/connector
HttpResponseBase.java
tester/src/bin tester.xml
Log:
Enhance the return value for the "Content-Language" header to include the
country code, if specified. Now, if you call
response.setLocale(new Locale("en", "US"));
the header that is created will be:
Content-Language: en-US
in accordance with the requirements of Section 3.10 of the HTTP/1.1 spec.
Revision ChangesPath
1.30 +13 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- HttpResponseBase.java 2001/03/28 05:15:14 1.29
+++ HttpResponseBase.java 2001/04/18 20:40:30 1.30
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.29 2001/03/28 05:15:14 remm Exp $
- * $Revision: 1.29 $
- * $Date: 2001/03/28 05:15:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.30 2001/04/18 20:40:30 craigmcc Exp $
+ * $Revision: 1.30 $
+ * $Date: 2001/04/18 20:40:30 $
*
*
*
@@ -99,7 +99,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.29 $ $Date: 2001/03/28 05:15:14 $
+ * @version $Revision: 1.30 $ $Date: 2001/04/18 20:40:30 $
*/
public class HttpResponseBase
@@ -778,8 +778,15 @@
super.setLocale(locale);
String language = locale.getLanguage();
- if ((language != null) (language.length() 0))
- setHeader("Content-Language", language);
+ if ((language != null) (language.length() 0)) {
+String country = locale.getCountry();
+StringBuffer value = new StringBuffer(language);
+if ((country != null) (country.length() 0)) {
+value.append('-');
+value.append(country);
+}
+ setHeader("Content-Language", value.toString());
+}
}
1.32 +2 -2 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tester.xml2001/04/18 19:53:02 1.31
+++ tester.xml2001/04/18 20:40:31 1.32
@@ -650,12 +650,12 @@
tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/SetLocale01" debug="${debug}"
outContent="SetLocale01 PASSED"
- outHeaders="Content-Language:en"/
+ outHeaders="Content-Language:en-US"/
tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedSetLocale01" debug="${debug}"
outContent="SetLocale01 PASSED"
- outHeaders="Content-Language:en"/
+ outHeaders="Content-Language:en-US"/
/target
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
amyroh 01/04/17 19:59:34
Modified:tester/src/bin tester.xml
Log:
Add SSI "include" tests using golden files.
Revision ChangesPath
1.30 +37 -1 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tester.xml2001/04/17 04:22:24 1.29
+++ tester.xml2001/04/18 02:59:33 1.30
@@ -13,7 +13,7 @@
taskdef name="tester" classname="org.apache.tester.TestClient"/
- target name="all"
depends="ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,Jndi,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession,XercesTest"/
+ target name="all"
depends="ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,Jndi,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession,XercesTest,SSITest"/
target name="ROOT"
@@ -755,6 +755,42 @@
tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedXerces02" debug="${debug}"
outContent="Xerces02 PASSED"/
+
+ /target
+
+target name="SSITest"
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude01.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude01.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude02.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude03.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude04.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude05.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude06.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude07.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude02.txt"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SSIInclude08.shtml" debug="${debug}"
+ golden="${golden.path}/SSIInclude02.txt"/
/target
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/04/02 14:15:49
Modified:tester/src/bin tester.xml
Log:
Add a test case to watch for the "double URL decode" vulnerability.
Revision ChangesPath
1.26 +10 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tester.xml2001/03/30 21:20:02 1.25
+++ tester.xml2001/04/02 21:15:46 1.26
@@ -181,6 +181,16 @@
request="${context.path}/WrappedDecoding0%31/extr%61?servlet=/WrappedDecoding01amp;path=/extra"
outContent="Decoding01 PASSED"/
+!-- Verify we can access the JSP page normally --
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="/examples/jsp/snp/snoop.jsp"
+ status="200"/
+
+!-- DefaultServlet should not decode the path again --
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="/examples/jsp/snp/snoop%252ejsp"
+ status="404"/
+
/target
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/03/13 11:10:44
Modified:tester/src/bin tester.xml
Log:
Repeat the JNDI tests after an application restart, to ensure that the web
application's naming context has been reinitialized correctly.
Revision ChangesPath
1.20 +26 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tester.xml2001/03/13 19:06:14 1.19
+++ tester.xml2001/03/13 19:10:42 1.20
@@ -138,6 +138,32 @@
!-- == JNDI Naming Context === --
+!-- Perform the tests before restarting the application --
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Jndi01" debug="${debug}"
+ outContent="Jndi01 PASSED"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedJndi01" debug="${debug}"
+ outContent="Jndi01 PASSED"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Jndi02" debug="${debug}"
+ outContent="Jndi02 PASSED"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedJndi02" debug="${debug}"
+ outContent="Jndi02 PASSED"/
+
+!-- Restart this web application --
+!-- NOTE: Assign role "manager" to user "tomcat" for this to work --
+tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
+ request="${manager.path}/reload?path=${context.path}"
+ outContent="OK - Reloaded application at context path ${context.path}"/
+
+!-- Repeat the tests to ensure the naming context is reinitialized --
tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/Jndi01" debug="${debug}"
outContent="Jndi01 PASSED"/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/02/25 20:49:06
Modified:tester/src/bin tester.xml
Log:
Add tests for relative paths.
Revision ChangesPath
1.18 +10 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tester.xml2001/02/22 01:42:42 1.17
+++ tester.xml2001/02/26 04:49:06 1.18
@@ -24,6 +24,16 @@
request="/index.html"
status="200"/
+!-- Should be able to use relative path to document root --
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="/examples/.." debug="${debug}"
+ status="200"/
+
+!-- Should not be able to use relative path above document root --
+tester host="${host}" port="${port}" protocol="${protocol}"
+ request="/examples/../.." debug="${debug}"
+ status="404"/
+
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/02/03 21:27:58
Modified:tester/src/bin tester.xml
Log:
Add a command to reload the session, which will test automatic unload and
reload functionality.
NOTE: Successful execution of the reload requires that you have manually
added role "manager" to user "tomcat". Without this, the two reload
commands will fail but the remainder of the tests should still succeed.
Revision ChangesPath
1.12 +15 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tester.xml2001/02/04 04:49:38 1.11
+++ tester.xml2001/02/04 05:27:57 1.12
@@ -8,6 +8,7 @@
!-- property name="protocol" value="HTTP/1.0"/ --
property name="protocol" value=""/ !-- Use HttpURLConnection --
property name="context.path" value="/tester"/
+ property name="manager.path" value="/manager"/
taskdef name="tester" classname="org.apache.tester.TestClient"/
@@ -394,7 +395,14 @@
joinSession="true"
outContent="Session02 PASSED"/
+!-- NOTE: Assign role "manager" to user "tomcat" for this to work --
tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
+ request="${manager.path}/reload?path=${context.path}"
+ outContent="OK - Reloaded application at context path ${context.path}"/
+
+tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/Session03" debug="${debug}"
joinSession="true"
outContent="Session03 PASSED"/
@@ -407,6 +415,13 @@
request="${context.path}/WrappedSession02" debug="${debug}"
joinSession="true"
outContent="Session02 PASSED"/
+
+!-- NOTE: Assign role "manager" to user "tomcat" for this to work --
+tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
+ request="${manager.path}/reload?path=${context.path}"
+ outContent="OK - Reloaded application at context path ${context.path}"/
tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedSession03" debug="${debug}"
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.xml
craigmcc01/02/03 21:34:19 Modified:tester/src/bin tester.xml Log: Include the session tests in the default execution. Revision ChangesPath 1.13 +1 -1 jakarta-tomcat-4.0/tester/src/bin/tester.xml Index: tester.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tester.xml2001/02/04 05:27:57 1.12 +++ tester.xml2001/02/04 05:34:18 1.13 @@ -12,7 +12,7 @@ taskdef name="tester" classname="org.apache.tester.TestClient"/ - target name="all" depends="ROOT,CaseSensitive,RequestDispatcher,Resources,ServletRequest,ServletResponse"/ + target name="all" depends="ROOT,CaseSensitive,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession"/ target name="ROOT" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
