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 wa...@apache.org on 2002/08/06 10:59:41 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL denyReadSearch.xml

wam         2002/08/06 01:59:41

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL
                        denyReadSearch.xml
  Log:
  bugfix: adjusted expected results
  
  Revision  Changes    Path
  1.3       +97 -124   jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadSearch.xml
  
  Index: denyReadSearch.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadSearch.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- denyReadSearch.xml	5 Aug 2002 11:21:09 -0000	1.2
  +++ denyReadSearch.xml	6 Aug 2002 08:59:41 -0000	1.3
  @@ -1,52 +1,41 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
  -	<specification>
  -		<abstract> A user is denied read access to a resource. The user then attempts to Search.</abstract>
  -		
  -		<description>
  +  <specification>
  +    <abstract> A user is denied read access to a resource. The user then attempts to Search.</abstract>
  +    <description>
   		1) Put a resource to the server.
   		2) ACL command to deny read privelages to user %user%.
   		3) PropFind command by user %user% to check that read privelages have been denied.
   		4) Search performed on created resource. This should not be possible.
   		5) Delete created resource.
   		</description>
  -		
  -		<expectedResult> The Search should return a 409 Forbidden error. </expectedResult>
  -	</specification>
  -	
  -	
  -	
  -	<step>
  -  	   <request>
  -   	      <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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: Mon, 12 Mar 2001 17:21:35 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%/acl_dasl.xml 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" ?>
  +    <expectedResult> The Search should return a 409 Forbidden error. </expectedResult>
  +  </specification>
  +  <step>
  +    <request>
  +      <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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: Mon, 12 Mar 2001 17:21:35 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%/acl_dasl.xml 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>
  @@ -56,43 +45,36 @@
                  							<D:privilege><D:read/></D:privilege>
               						</D:deny>
            					</D:ace>
  -      					</D:acl>]]>
  -   				</body>
  -  			</request>
  -  			<response>
  -   				<command>HTTP/1.0 (200,409) OK</command>
  -  			</response>
  - 	</step>
  -	
  -	
  -	<step>
  - 	      	<request>
  -   	        	<command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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,409) OK</command>
  +    </response>
  +  </step>
  +  <step>
  +    <request>
  +      <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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>
  -  	      	</response>
  -	</step>
  -	
  -	
  - 	
  -	<step> 
  -  		<request>
  -   			<command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command> 
  -   			<body varUsage="globalVariableCollection"><![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="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  +      <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
      				<searchrequest xmlns:D="DAV:">
      					<D:basicsearch>
      						<D:select>
  @@ -109,33 +91,30 @@
      						</D:from>
      					</D:basicsearch>
      				</searchrequest>	
  -   					]]> 			
  -    				</body>
  -		</request>
  - 	
  - 		<response>
  -   			<command>HTTP/1.0 403 Forbidden</command>
  -          <body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>	
  +   					]]></body>
  +    </request>
  +    <response>
  +      <command>HTTP/1.0 403 Forbidden</command>
  +      <body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>	
                   <D:multistatus xmlns:D="DAV:">
                     <D:response>
                       <D:href>/taminowebdavserver</D:href>
                       <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                    <D:responsedescription>Access denied on /%globalVariableCollection%/acl_dasl.xml by user %globalVariableUserPath% for action /administration/security/actions/read</D:responsedescription>
  +                    <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                     </D:response>
                   </D: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%/acl_dasl.xml 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" ?>
  +    </response>
  +  </step>
  +  <cleanup>
  +    <step>
  +      <user varUsage="user">2%user%</user>
  +      <password varUsage="user">2%user%</password>
  +      <request>
  +        <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml 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>
  @@ -145,33 +124,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="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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: Wed, 14 Mar 2001 14:47:37 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>
  \ No newline at end of file
  +      					</D:acl>]]></body>
  +      </request>
  +      <response>
  +        <command>HTTP/1.0 200 OK</command>
  +      </response>
  +    </step>
  +    <step>
  +      <request>
  +        <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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: Wed, 14 Mar 2001 14:47:37 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>