You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/08/02 17:57:58 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples ACLGrantReadACLDenyReadACL.xml
juergen 2002/08/02 08:57:58
Modified: testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read
ACLdenyReadACLInheritance2Head4Propfind2Get3Col.xml
ACLdenyReadAclInheritanceHead2PropfindGetCol.xml
ACLdenyReadACLPropfindCol.xml
ACLdenyReadHeadPropfindGetCol.xml
ACLdenyReadInheritance2Head4Propfind2Get3Col.xml
ACLdenyReadInheritanceHead2PropfindGetCol.xml
ACLdenyReadInheritanceHead2PropfindGetColFile.xml
ACLdenyReadInheritanceHead2PropfindGetFile.xml
ACLdenyReadPropfind.xml
testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite
ACLdenyReadPropFindColFile.xml
testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples
ACLGrantReadACLDenyReadACL.xml
Log:
an expected response 403 should not expect a body.
Revision Changes Path
1.2 +244 -279 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadACLInheritance2Head4Propfind2Get3Col.xml
Index: ACLdenyReadACLInheritance2Head4Propfind2Get3Col.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadACLInheritance2Head4Propfind2Get3Col.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadACLInheritance2Head4Propfind2Get3Col.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadACLInheritance2Head4Propfind2Get3Col.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read privilege with inheritance works. </abstract>
-
<description>
1) MKCOL command creates 3 collections (test1/test2/test3)
2) PUT command creates a file in the collection test3
@@ -19,94 +16,85 @@
12) PropFind DAV:acl attempted on test3
13) Get command attempted on test3
</description>
-
<expectedResult> PropFinds on DAV:acl should return 403 Forbidden, other commands should complete succesfully. </expectedResult>
</specification>
-
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
@@ -121,174 +109,155 @@
<D:href>true</D:href>
</D:inherited>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 200 OK</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3</href><propstat><prop><displayname>test3</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 200 OK</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi Status</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3</href><propstat><prop><displayname>test3</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3</href><propstat><prop><displayname>test3</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 200 OK</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207 OK</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml</href><propstat><prop><displayname>test.xml</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 200 OK</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 OK</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml</href><propstat><prop><displayname>test.xml</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <header>Content-Type: text/xml</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body fileReference="../../../../contentDirectory/ValidXMLget.xm1">
- </body>
- </response>
- </step>
-
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/xml</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body fileReference="../../../../contentDirectory/ValidXMLget.xm1"/>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -298,33 +267,29 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +128 -154 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadAclInheritanceHead2PropfindGetCol.xml
Index: ACLdenyReadAclInheritanceHead2PropfindGetCol.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadAclInheritanceHead2PropfindGetCol.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadAclInheritanceHead2PropfindGetCol.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadAclInheritanceHead2PropfindGetCol.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read-acl privilege with inheritance works. </abstract>
-
<description>
1) ACL command which denys read-acl access to the user %user% on a collection
2) MKCOL command creates a child directory to the collection
@@ -14,25 +11,19 @@
5) PropFind DAV:acl attempted on child
6) Get command attempted on child
</description>
-
<expectedResult> Child should inherit the deny-acl read privilege.
The Head,the propfind on Display name and the Get should complete succesfully
However the propfind on DAV:acl should return a 403 Forbidden
</expectedResult>
</specification>
-
-
-
-
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -42,116 +33,104 @@
<D:privilege><D:read-acl/></D:privilege>
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 200 OK</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <body />
- </response>
- </step>
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 200 OK</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi Status</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body/>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -161,34 +140,29 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +47 -67 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadACLPropfindCol.xml
Index: ACLdenyReadACLPropfindCol.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadACLPropfindCol.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadACLPropfindCol.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadACLPropfindCol.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,31 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read-acl privilege works. </abstract>
-
<description>
1) ACL command which denys read-acl access to the user %user%
2) PropFind command attempted on DAV:acl property
</description>
-
<expectedResult> PropFind should return 403 Forbidden </expectedResult>
</specification>
-
-
-
-
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -35,48 +26,41 @@
<D:privilege><D:read-acl/></D:privilege>
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -86,15 +70,11 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- </cleanup>
-
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +75 -93 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadHeadPropfindGetCol.xml
Index: ACLdenyReadHeadPropfindGetCol.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadHeadPropfindGetCol.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadHeadPropfindGetCol.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadHeadPropfindGetCol.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,29 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read privilege works. </abstract>
-
<description>
1) ACL command which denys read access to the user %user%
2) Head command attempted on collection
3) PropFind command attempted on collection
4) Get command attempted on collection
</description>
-
<expectedResult> Head, PropFind and Get should all return 403 Forbidden </expectedResult>
</specification>
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -33,75 +28,65 @@
<D:privilege><D:read/></D:privilege>
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 403 Forbidden</command>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- <header>content-length: 0</header>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <body />
- </response>
- </step>
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 403 Forbidden</command>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ <header>content-length: 0</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body/>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -111,14 +96,11 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +247 -281 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritance2Head4Propfind2Get3Col.xml
Index: ACLdenyReadInheritance2Head4Propfind2Get3Col.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritance2Head4Propfind2Get3Col.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadInheritance2Head4Propfind2Get3Col.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadInheritance2Head4Propfind2Get3Col.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read privilege with inheritance works. </abstract>
-
<description>
1) MKCOL command creates 3 collections (test1/test2/test3)
2) PUT command creates a file in the collection test3
@@ -19,94 +16,85 @@
10) PropFind DAV:acl attempted on test3
11) Get command attempted on test3
</description>
-
<expectedResult> Head, Propfind and Get commands should return 403 Forbidden </expectedResult>
</specification>
-
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
@@ -121,176 +109,158 @@
<D:href>true</D:href>
</D:inherited>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 403 Forbidden</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 403 Forbidden</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3</href><propstat><prop><displayname>test3</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- <header>content-length: 0</header>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <body />
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 403 Forbidden</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3</href><propstat><prop><displayname>test3</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3 HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ <header>content-length: 0</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 403 Forbidden</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Content-Type: text/html</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body fileReference="../../../../contentDirectory/ValidXMLget.xm1">
- </body>
- </response>
- </step>
-
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test1/test2/test3/test.xml HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <header>Content-Type: text/html</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body fileReference="../../../../contentDirectory/ValidXMLget.xm1"/>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -300,33 +270,29 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +127 -153 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritanceHead2PropfindGetCol.xml
Index: ACLdenyReadInheritanceHead2PropfindGetCol.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritanceHead2PropfindGetCol.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadInheritanceHead2PropfindGetCol.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadInheritanceHead2PropfindGetCol.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read privilege with inheritance works. </abstract>
-
<description>
1) ACL command which denys read access to the user %user% on a collection
2) MKCOL command creates a child directory to the collection
@@ -14,20 +11,16 @@
5) PropFind DAV:acl attempted on child
6) Get command attempted on child
</description>
-
<expectedResult> Child should inherit the deny read privilege so Head, the two PropFinds and the Get should all return 403 Forbidden </expectedResult>
</specification>
-
-
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
@@ -39,118 +32,103 @@
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 403 Forbidden</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 403 Forbidden</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- <header>content-length: 0</header>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <body />
- </response>
- </step>
-
-
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ <header>content-length: 0</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body/>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -160,33 +138,29 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +144 -172 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritanceHead2PropfindGetColFile.xml
Index: ACLdenyReadInheritanceHead2PropfindGetColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritanceHead2PropfindGetColFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadInheritanceHead2PropfindGetColFile.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadInheritanceHead2PropfindGetColFile.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,68 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read privilege works. </abstract>
-
<description>
1) ACL command which denys access for All to a collection
2) Head command attempted on collection
3) PropFind command attempted on collection
4) Get command attempted on collection
</description>
-
<expectedResult> Head, PropFind and Get should all return 403 Forbidden </expectedResult>
</specification>
-
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
@@ -74,102 +65,87 @@
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 403 Forbidden</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test/test.xml</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 403 Forbidden</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test/test.xml</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Content-Type: text/html</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body fileReference="../../../../contentDirectory/ValidXMLget.xm1">
- </body>
- </response>
- </step>
-
-
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <header>Content-Type: text/html</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body fileReference="../../../../contentDirectory/ValidXMLget.xm1"/>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -179,31 +155,27 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +127 -155 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritanceHead2PropfindGetFile.xml
Index: ACLdenyReadInheritanceHead2PropfindGetFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadInheritanceHead2PropfindGetFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadInheritanceHead2PropfindGetFile.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadInheritanceHead2PropfindGetFile.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read privilege with inheritance works. </abstract>
-
<description>
1) ACL command which denys read access to the user %user% on a file
2) PUT command creates a child file to the collection
@@ -14,20 +11,16 @@
5) PropFind DAV:acl attempted on child
6) Get command attempted on child
</description>
-
<expectedResult> Child should inherit the deny read privilege so Head, the two PropFinds and the Get should all return 403 Forbidden </expectedResult>
</specification>
-
-
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
@@ -39,122 +32,105 @@
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Connection: Keep-Alive</header>
- <header>Translate: f</header>
- <body />
- </request>
- <response>
- <command>HTTP/1.1 403 Forbidden</command>
- <header>Last-Modified: 2001-03-22T17:20:13Z</header>
- <body />
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">HEAD /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Connection: Keep-Alive</header>
+ <header>Translate: f</header>
+ <body/>
+ </request>
+ <response>
+ <command>HTTP/1.1 403 Forbidden</command>
+ <header>Last-Modified: 2001-03-22T17:20:13Z</header>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href><propstat><prop><displayname>test</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept: */*</header>
- <header>Accept-Language: en-us</header>
- <header>Accept-Encoding: gzip, deflate</header>
- <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Content-Type: text/html</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body fileReference="../../../../contentDirectory/ValidXMLget.xm1">
- </body>
- </response>
- </step>
-
-
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept: */*</header>
+ <header>Accept-Language: en-us</header>
+ <header>Accept-Encoding: gzip, deflate</header>
+ <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <header>Content-Type: text/html</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body fileReference="../../../../contentDirectory/ValidXMLget.xm1"/>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -164,31 +140,27 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +47 -64 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadPropfind.xml
Index: ACLdenyReadPropfind.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadPropfind.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadPropfind.xml 24 Jun 2002 11:24:01 -0000 1.1
+++ ACLdenyReadPropfind.xml 2 Aug 2002 15:57:57 -0000 1.2
@@ -1,27 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if deny read privilege also denys read-acl. </abstract>
-
<description>
1) ACL command which denys read access to the user %user%
2) PropFind command on DAV:acl attempted on collection
</description>
-
<expectedResult> Propfind should return 403 Forbidden </expectedResult>
</specification>
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -31,50 +26,41 @@
<D:privilege><D:read/></D:privilege>
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
-
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -84,14 +70,11 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +111 -137 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyReadPropFindColFile.xml
Index: ACLdenyReadPropFindColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyReadPropFindColFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyReadPropFindColFile.xml 24 Jun 2002 11:23:36 -0000 1.1
+++ ACLdenyReadPropFindColFile.xml 2 Aug 2002 15:57:58 -0000 1.2
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to Propfind file without read privilege </abstract>
-
<description>
1) ACL command which denies read access to the user %user%
2) MKCOL command which creates a child collection (/test)
@@ -13,19 +10,16 @@
4) Propfind command attempted on child file
5) Propfind command attempted on child collection
</description>
-
<expectedResult> Two Propfind commands should both return 403 Forbidden </expectedResult>
</specification>
-
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -35,103 +29,87 @@
<D:privilege><D:read /></D:privilege>
</D:deny>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
- <user varUsage="user">2%user%</user>
- <password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- </body>
- </response>
- </step>
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -141,33 +119,29 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.3 +82 -100 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACLGrantReadACLDenyReadACL.xml
Index: ACLGrantReadACLDenyReadACL.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACLGrantReadACLDenyReadACL.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ACLGrantReadACLDenyReadACL.xml 4 Jul 2002 12:43:50 -0000 1.2
+++ ACLGrantReadACLDenyReadACL.xml 2 Aug 2002 15:57:58 -0000 1.3
@@ -1,47 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check ACL command </abstract>
-
<description>
1) MKCOL command which creates a child collection (/test)
2) ACL command which grants read-acl access and then denies read-acl access to the user %user% on the collection /test
3) Propfind command carried out
</description>
-
<expectedResult> Propfind command should return 403 Forbidden </expectedResult>
</specification>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-<step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
@@ -62,48 +55,41 @@
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/test</href><propstat><prop><displayname>%globalVariableCollection%</displayname></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
- </response>
- </step>
-
- <cleanup>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -113,33 +99,29 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
-<user varUsage="user">2%user%</user>
-<password varUsage="user">2%user%</password>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>