diff --git a/testing/tests/regression-suite/948-MKTICKET.result b/testing/tests/regression-suite/948-MKTICKET.result index 216a6fe4..109fe460 100644 --- a/testing/tests/regression-suite/948-MKTICKET.result +++ b/testing/tests/regression-suite/948-MKTICKET.result @@ -1,5 +1,5 @@ - + Good Ticket ID @@ -7,10 +7,10 @@ /caldav.php/user1/ - - - - + + + + Second-3600 infinity diff --git a/testing/tests/regression-suite/949-MKTICKET.result b/testing/tests/regression-suite/949-MKTICKET.result index becccec5..6d9f601a 100644 --- a/testing/tests/regression-suite/949-MKTICKET.result +++ b/testing/tests/regression-suite/949-MKTICKET.result @@ -1,13 +1,13 @@ HTTP/1.1 400 Bad Request Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "960996e0df498010929014e5d8385771" +ETag: "7bc3d8a76fb705dfff8a6654bb8d7fb8" Content-Length: 155 Connection: close Content-Type: text/xml; charset="utf-8" - + @@ -15,5 +15,5 @@ Content-Type: text/xml; charset="utf-8" privileges: >000000000001001000100001< target_collection: >10< target_resource_i: >NULL< - timeout: >00:59:01< + timeout: >01:00:00< diff --git a/testing/tests/regression-suite/949-MKTICKET.test b/testing/tests/regression-suite/949-MKTICKET.test index 70982c10..e207de38 100644 --- a/testing/tests/regression-suite/949-MKTICKET.test +++ b/testing/tests/regression-suite/949-MKTICKET.test @@ -14,7 +14,7 @@ ENDDATA QUERY SELECT dav_owner_id, - (expires - current_timestamp)::interval(0) AS timeout, + date_trunc( 'minute', (expires - current_timestamp + '30 seconds')::interval(0)) AS timeout, privileges, target_collection_id, target_resource_id diff --git a/testing/tests/regression-suite/950-MKTICKET.result b/testing/tests/regression-suite/950-MKTICKET.result index cb6fe63c..f9e77fcd 100644 --- a/testing/tests/regression-suite/950-MKTICKET.result +++ b/testing/tests/regression-suite/950-MKTICKET.result @@ -1,5 +1,5 @@ - + Good Ticket ID @@ -7,15 +7,15 @@ /caldav.php/user1/ - - - - - - - - - + + + + + + + + + Second-86400 infinity @@ -27,11 +27,11 @@ privileges: >000000000001001000100001< target_collection: >10< target_resource_i: >NULL< - timeout: >00:58:51< + timeout: >01:00:00< dav_owner_id: >3< privileges: >000000000001001011100111< target_collection: >10< target_resource_i: >1365< - timeout: >24:00:00< + timeout: >1 day< diff --git a/testing/tests/regression-suite/950-MKTICKET.test b/testing/tests/regression-suite/950-MKTICKET.test index 4569a98c..80b013bb 100644 --- a/testing/tests/regression-suite/950-MKTICKET.test +++ b/testing/tests/regression-suite/950-MKTICKET.test @@ -17,7 +17,7 @@ ENDDATA QUERY SELECT dav_owner_id, - (expires - current_timestamp)::interval(0) AS timeout, + date_trunc( 'minute', ('55 seconds' + expires - current_timestamp)::interval(0)) AS timeout, privileges, target_collection_id, target_resource_id diff --git a/testing/tests/regression-suite/951-MKTICKET.result b/testing/tests/regression-suite/951-MKTICKET.result index 4eb3b29f..1ef165a5 100644 --- a/testing/tests/regression-suite/951-MKTICKET.result +++ b/testing/tests/regression-suite/951-MKTICKET.result @@ -14,11 +14,11 @@ privileges: >000000000001001000100001< target_collection: >10< target_resource_i: >NULL< - timeout: >00:58:35< + timeout: >01:00:00< dav_owner_id: >3< privileges: >000000000001001011100111< target_collection: >10< target_resource_i: >1365< - timeout: >23:59:43< + timeout: >24:00:00< diff --git a/testing/tests/regression-suite/951-MKTICKET.test b/testing/tests/regression-suite/951-MKTICKET.test index c84ab2f4..02516bc3 100644 --- a/testing/tests/regression-suite/951-MKTICKET.test +++ b/testing/tests/regression-suite/951-MKTICKET.test @@ -18,7 +18,7 @@ ENDDATA QUERY SELECT dav_owner_id, - (expires - current_timestamp)::interval(0) AS timeout, + date_trunc( 'minute', (expires - current_timestamp + '55 seconds')::interval(0)) AS timeout, privileges, target_collection_id, target_resource_id diff --git a/testing/tests/regression-suite/952-PROPFIND.result b/testing/tests/regression-suite/952-PROPFIND.result new file mode 100644 index 00000000..97a25b37 --- /dev/null +++ b/testing/tests/regression-suite/952-PROPFIND.result @@ -0,0 +1,121 @@ +HTTP/1.1 207 Multi-Status +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +ETag: "7c8b51dfb3d0b3caa8da3ab3f98c3707" +Content-Length: 2895 +Content-Type: text/xml; charset="utf-8" + + + + + /caldav.php/user1/home/ + + + User One's Calendar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BEGIN:VCALENDAR +PRODID:-//davical.org//NONSGML AWL Calendar//EN +VERSION:2.0 +CALSCALE:GREGORIAN +BEGIN:VTIMEZONE +TZID:Europe/Prague +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19810329T020000 +TZNAME:GMT+02:00 +TZOFFSETTO:+0200 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19961027T030000 +TZNAME:GMT+01:00 +TZOFFSETTO:+0100 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR + + + HTTP/1.1 200 OK + + + + + + + + HTTP/1.1 404 Not Found + + + diff --git a/testing/tests/regression-suite/952-PROPFIND.test b/testing/tests/regression-suite/952-PROPFIND.test new file mode 100644 index 00000000..24bb6bb7 --- /dev/null +++ b/testing/tests/regression-suite/952-PROPFIND.test @@ -0,0 +1,38 @@ +# +# PROPFIND on a collection which we can only access via a ticket +# +TYPE=PROPFIND +URL=http://regression.host/caldav.php/user1/home/ +AUTH=user5:user5 + +# Get the ticket we created earlier in 948... +GETSQL=ticket +SELECT ticket_id FROM access_ticket + WHERE target_collection_id = 10 AND target_resource_id is null; +ENDSQL + +HEADER=User-Agent: Ticket Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Ticket: ##ticket## +HEADER=Depth: 0 + +HEAD + +BEGINDATA + + + + + + + + + + + + + + +ENDDATA + +REPLACE=!\S{8}!Good Ticket ID! diff --git a/testing/tests/regression-suite/953-PROPFIND.result b/testing/tests/regression-suite/953-PROPFIND.result new file mode 100644 index 00000000..75ba9a83 --- /dev/null +++ b/testing/tests/regression-suite/953-PROPFIND.result @@ -0,0 +1,11 @@ + + + + + /caldav.php/user1/home/ + + + + + + diff --git a/testing/tests/regression-suite/953-PROPFIND.test b/testing/tests/regression-suite/953-PROPFIND.test new file mode 100644 index 00000000..464cde05 --- /dev/null +++ b/testing/tests/regression-suite/953-PROPFIND.test @@ -0,0 +1,37 @@ +# +# PROPFIND on a collection which we can only access via a ticket +# +TYPE=PROPFIND +URL=http://regression.host/caldav.php/user1/home/ +AUTH=user5:user5 + +# Get the ticket we created earlier in 948... +GETSQL=ticket +SELECT ticket_id FROM access_ticket + WHERE target_collection_id = 10 AND target_resource_id is null; +ENDSQL + +HEADER=User-Agent: Ticket Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +# HEADER=Ticket: ##ticket## +HEADER=Depth: 0 + + +BEGINDATA + + + + + + + + + + + + + + +ENDDATA + +REPLACE=!\S{8}!Good Ticket ID!