juergen 2003/12/02 08:22:49
Modified:
testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Principle/EitherReadorWrite
01_ACLdenyReadForGroup_GetColFile.xml
02_ACLgrantReadForGroup_GetColFile.xml
03_ACLdenyReadForOneUserOfGroup_GetColFile.xml
Log:
adapted to URM (Josef)
Revision Changes Path
1.6 +14 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Principle/EitherReadorWrite/01_ACLdenyReadForGroup_GetColFile.xml
Index: 01_ACLdenyReadForGroup_GetColFile.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Principle/EitherReadorWrite/01_ACLdenyReadForGroup_GetColFile.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 01_ACLdenyReadForGroup_GetColFile.xml 2 Dec 2003 15:39:19 -0000 1.5
+++ 01_ACLdenyReadForGroup_GetColFile.xml 2 Dec 2003 16:22:49 -0000 1.6
@@ -4,7 +4,7 @@
<specification>
<abstract> Test to check if possible to get file and collection
without read privilege for a group</abstract>
<description>
- 1) Prepare test: MKCOL /test, PUT /test/test.xml, MKCOL
userdb/group/tmpGroup, MKCOL userdb/users/tmpUser,
+ 1) Prepare test: MKCOL /test, PUT /test/test.xml, MKCOL
userdb/group/tmpGroup, MKCOL userdb/users/tmpUser, Put tmpUser to tmpGroup
2) ACL command which denys read access to tmpGroup on the /test
collection
3) tmpUser gets file /test/test.xml
4) tmpUser gets collection /test
@@ -131,6 +131,19 @@
</step>
<cleanup>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">ACL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+<D:acl xmlns:D="DAV:" />
+
+]]></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>
1.6 +14 -0
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Principle/EitherReadorWrite/02_ACLgrantReadForGroup_GetColFile.xml
Index: 02_ACLgrantReadForGroup_GetColFile.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Principle/EitherReadorWrite/02_ACLgrantReadForGroup_GetColFile.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 02_ACLgrantReadForGroup_GetColFile.xml 2 Dec 2003 15:44:22 -0000 1.5
+++ 02_ACLgrantReadForGroup_GetColFile.xml 2 Dec 2003 16:22:49 -0000 1.6
@@ -130,6 +130,20 @@
</response>
</step>
<cleanup>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">ACL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+<D:acl xmlns:D="DAV:" />
+
+]]></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>
1.5 +194 -72
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Principle/EitherReadorWrite/03_ACLdenyReadForOneUserOfGroup_GetColFile.xml
Index: 03_ACLdenyReadForOneUserOfGroup_GetColFile.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Principle/EitherReadorWrite/03_ACLdenyReadForOneUserOfGroup_GetColFile.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 03_ACLdenyReadForOneUserOfGroup_GetColFile.xml 26 Nov 2003 14:08:46 -0000
1.4
+++ 03_ACLdenyReadForOneUserOfGroup_GetColFile.xml 2 Dec 2003 16:22:49 -0000
1.5
@@ -1,42 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE test SYSTEM "../../../../../../Tprocessor.dtd">
<test>
- <specification>
- <abstract> Test to check if possible to get file and collection without read
privilege for a member of a group</abstract>
- <description>
- 1) Prepare test: MKCOL /test, PUT /test/test.xml
- 2) ACL command which grants read access to
%globalVariableGroupsColl,globalVariableGroup,%1 and denys read access to the user
%globalVariableGroupsColl,globalVariableGroup,%1/%user% on the /test collection
- 3) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets file
/test/test.xml
- 4) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets
collection /test
+ <specification>
+ <abstract> Test to check if possible to get file and collection
without read privilege for a group</abstract>
+ <description>
+ 1) Prepare test: MKCOL /test, PUT /test/test.xml, MKCOL tmpGroup,
MKCOL tmpUser, MKCOL tmpUser1, Put users to group
+ 2) ACL command which denys read access to tmpUser on the /test
collection
+ 3) tmpUser gets file /test/test.xml
+ 4) tmpUser gets collection /test
+ 3) tmpUser1 gets file /test/test.xml
+ 4) tmpUser1 gets collection /test
+ 5) cleanup
</description>
- <expectedResult> Two Get commands should both return 403 Forbidden
</expectedResult>
- </specification>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- <body fileReference="../../../../../contentDirectory/validXML.xm1" />
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <body
varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+ <expectedResult> Two commands should return 403 Forbidden and two 200
OK </expectedResult>
+ </specification>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">MKCOL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ <body
fileReference="../../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableRootUserPath,globalVariableUsersColl">MKCOL
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableRootUserPath,globalVariableUsersColl">MKCOL
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1 HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableRootUserPath,globalVariableGroupsColl">MKCOL
%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 201 Created</command>
+ </response>
+ </step>
+ <!-- new Adding of a user to a group-->
+ <step>
+ <request>
+ <command
varUsage="globalVariableRootUserPath,globalVariableGroupsColl">PROPPATCH
%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup HTTP/1.1</command>
+ <body
varUsage="globalVariableUserPath,globalVariableUsersColl,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+<D:propertyupdate xmlns:D="DAV:"
xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav";>
+ <D:set>
+ <D:prop>
+ <D:group-member-set>
+
<D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser</D:href>
+
<D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1</D:href>
+ </D:group-member-set>
+ </D:prop>
+ </D:set>
+</D:propertyupdate>
+
+]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body
varUsage="globalVariableRootUserPath,globalVariableServerName,user,group,host,globalVariableCollection,globalVariableUsersColl,globalVariableGroupsColl,globalVariableRolesColl,globalVariableGroup"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+<D:multistatus xmlns:D="DAV:">
+ <D:response>
+
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup</D:href>
+ <D:propstat>
+ <D:prop>
+ <D:group-member-set />
+ </D:prop>
+ <D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat>
+ </D:response>
+</D:multistatus>
+
+]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">ACL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <body
varUsage="globalVariableUsersColl,globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
-
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1/%globalVariableGroup%1%user%</D:href>
+
<D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser</D:href>
</D:principal>
<D:deny>
<D:privilege>
@@ -46,7 +109,7 @@
</D:ace>
<D:ace>
<D:principal>
-
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
+
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup</D:href>
</D:principal>
<D:grant>
<D:privilege>
@@ -55,45 +118,104 @@
</D:grant>
</D:ace>
</D:acl>
+
]]></body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
- <step>
- <user
varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</user>
- <password
varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</password>
- <request>
- <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <body />
- </response>
- </step>
- <step>
- <user
varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</user>
- <password
varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</password>
- <request>
- <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <body />
- </response>
- </step>
- <cleanup>
-
- <step>
- <request>
- <command
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
- </cleanup>
-</test>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user
varUsage="globalVariableGroupsColl,globalVariableGroup,user">tmpUser</user>
+ <password
varUsage="globalVariableGroupsColl,globalVariableGroup,user">Administrator</password>
+ <request>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <user
varUsage="globalVariableGroupsColl,globalVariableGroup,user">tmpUser</user>
+ <password
varUsage="globalVariableGroupsColl,globalVariableGroup,user">Administrator</password>
+ <request>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <user
varUsage="globalVariableGroupsColl,globalVariableGroup,user">tmpUser1</user>
+ <password
varUsage="globalVariableGroupsColl,globalVariableGroup,user">Administrator</password>
+ <request>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/xml</header>
+ <!--body
fileReference="../../../contentDirectory/html.html"/-->
+ </response> </step>
+ <step>
+ <user
varUsage="globalVariableGroupsColl,globalVariableGroup,user">tmpUser1</user>
+ <password
varUsage="globalVariableGroupsColl,globalVariableGroup,user">Administrator</password>
+ <request>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/html; charset="UTF-8"</header>
+ <!--body
fileReference="../../../contentDirectory/html.html"/-->
+ </response> </step>
+ <cleanup>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">ACL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+<D:acl xmlns:D="DAV:" />
+]]></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>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableRootUserPath,globalVariableGroupsColl">DELETE
%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableRootUserPath,globalVariableUsersColl">DELETE
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableRootUserPath,globalVariableUsersColl">DELETE
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1 HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
+</test>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
