Add the ACL to the supported methods.

2026-07-29 13:19:26 +00:00 · 2010-11-06 19:02:55 +13:00 · 2010-11-06 19:02:55 +13:00 · 515a31bbc8
commit 515a31bbc8
parent 6533a89b7e
18 changed files with 50 additions and 36 deletions
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@ -588,7 +588,7 @@ EOQRY;
    if ( $this->IsPrincipal() ) {
      if ( !isset($this->principal) ) $this->FetchPrincipal();
      $this->privileges = $this->principal->Privileges();
-      dbg_error_log( 'DAVResource', 'Privileges of "%s" for user accessing "%s"', $this->privileges, $this->principal->username() );
+      dbg_error_log( 'DAVResource', 'Privileges of "%s" for user accessing principal "%s"', $this->privileges, $this->principal->username() );
      return;
    }

@ -728,17 +728,21 @@ EOQRY;
          $this->supported_methods['HEAD'] = '';
          $this->supported_methods['MKTICKET'] = '';
          $this->supported_methods['DELTICKET'] = '';
+          $this->supported_methods['ACL'] = '';
          break;
        case 'collection':
          $this->supported_methods['MKTICKET'] = '';
          $this->supported_methods['DELTICKET'] = '';
+          $this->supported_methods['BIND'] = '';
+          $this->supported_methods['ACL'] = '';
        case 'principal':
          $this->supported_methods['GET'] = '';
-          $this->supported_methods['PUT'] = '';
          $this->supported_methods['HEAD'] = '';
          $this->supported_methods['MKCOL'] = '';
          $this->supported_methods['MKCALENDAR'] = '';
          $this->supported_methods['PROPPATCH'] = '';
+          $this->supported_methods['BIND'] = '';
+          $this->supported_methods['ACL'] = '';
          break;
      }
    }
--- a/testing/tests/carddav/2011-PROPFIND.result
+++ b/testing/tests/carddav/2011-PROPFIND.result
@ -1,17 +1,11 @@
-HTTP/1.1 207 Multi-Status
-Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-DAV: extended-mkcol, calendar-proxy, bind, addressbook
-ETag: "d65a1dbcd03e14e0d6a3102ba0f1876a"
-Content-Length: 794
-Content-Type: text/xml; charset="utf-8"
-
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
 <response>
  <href>/caldav.php/user1/addressbook/</href>
  <propstat>
-   <prop/>
+   <prop>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
  <propstat>
@ -26,6 +20,7 @@ Content-Type: text/xml; charset="utf-8"
  <propstat>
   <prop>
    <getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
@ -35,6 +30,7 @@ Content-Type: text/xml; charset="utf-8"
  <propstat>
   <prop>
    <getetag>"fada70a725708bce8521efb87acfa629"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
--- a/testing/tests/carddav/2011-PROPFIND.test
+++ b/testing/tests/carddav/2011-PROPFIND.test
@ -7,7 +7,7 @@ URL=http://mycaldav/caldav.php/user1/addressbook/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1
-HEAD
+# HEAD


 BEGINDATA
@ -15,6 +15,7 @@ BEGINDATA
 <propfind xmlns="DAV:">
 <prop>
  <getetag/>
+  <getlastmodified/>
 </prop>
 </propfind>
 ENDDATA
--- a/testing/tests/carddav/2030-REPORT-addressbook-query.result
+++ b/testing/tests/carddav/2030-REPORT-addressbook-query.result
@ -1,11 +1,3 @@
-HTTP/1.1 207 Multi-Status
-Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-DAV: extended-mkcol, calendar-proxy, bind, addressbook
-ETag: "8c1e871ceac19694850a8898e844d4b4"
-Content-Length: 655
-Content-Type: text/xml; charset="utf-8"
-
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
 <response>
@ -23,6 +15,7 @@ FN:Andrew Watson McMillan
 NICKNAME:karora
 END:VCARD
 </VC:address-data>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
--- a/testing/tests/carddav/2030-REPORT-addressbook-query.test
+++ b/testing/tests/carddav/2030-REPORT-addressbook-query.test
@ -8,7 +8,7 @@ HEADER=Accept: text/xml,application/xml
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1

-HEAD
+# HEAD

 BEGINDATA
 <?xml version="1.0" encoding="utf-8" ?>
@ -24,6 +24,7 @@ BEGINDATA
      <C:prop name="EMAIL"/>
      <C:prop name="FN"/>
    </C:address-data>
+    <D:getlastmodified/>
  </D:prop>
  <C:filter>
    <C:prop-filter name="NICKNAME">
--- a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result
@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET, ACL
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result
@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET, ACL
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.result
+++ b/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.result
@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, MKCALENDAR, PROPPATCH, BIND, ACL
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.result
+++ b/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.result
@ -0,0 +1,8 @@
+HTTP/1.1 200 OK
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, MKCALENDAR, PROPPATCH, BIND, ACL
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
--- a/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.result
+++ b/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.result
@ -0,0 +1,8 @@
+HTTP/1.1 200 OK
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, MKCALENDAR, PROPPATCH, BIND, ACL
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
--- a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result
@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET, ACL
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result
@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET, ACL
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/0601-Soho-OPTIONS.result
+++ b/testing/tests/regression-suite/0601-Soho-OPTIONS.result
@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, MKCALENDAR, PROPPATCH, BIND, ACL
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/0910-Space-OPTIONS.result
+++ b/testing/tests/regression-suite/0910-Space-OPTIONS.result
@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET, ACL
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result
@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-ETag: "6b4e073faec32eb35d9de94349f13161"
-Content-Length: 1574
+ETag: "3447a04184df5d673f50e8c7a0952a68"
+Content-Length: 1611
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
@ -26,11 +26,12 @@ Content-Type: text/xml; charset="utf-8"
     <supported-method name="UNLOCK"/>
     <supported-method name="MOVE"/>
     <supported-method name="GET"/>
-     <supported-method name="PUT"/>
     <supported-method name="HEAD"/>
     <supported-method name="MKCOL"/>
     <supported-method name="MKCALENDAR"/>
     <supported-method name="PROPPATCH"/>
+     <supported-method name="BIND"/>
+     <supported-method name="ACL"/>
    </supported-method-set>
    <supported-report-set>
     <supported-report>
--- a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-ETag: "c0a1811cd91f4f840744ddfb3da067a3"
-Content-Length: 2120
+ETag: "9750b11e4998e1538b7bb3626ae19b39"
+Content-Length: 2156
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
@ -31,6 +31,7 @@ Content-Type: text/xml; charset="utf-8"
     <supported-method name="HEAD"/>
     <supported-method name="MKTICKET"/>
     <supported-method name="DELTICKET"/>
+     <supported-method name="ACL"/>
    </supported-method-set>
    <supported-report-set>
     <supported-report>
--- a/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result
@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-ETag: "88df59252290d58630f83da5be2a6405"
-Content-Length: 1663
+ETag: "98ceb8bb48fbdd547226d0b28aadd942"
+Content-Length: 1699
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
@ -30,6 +30,7 @@ Content-Type: text/xml; charset="utf-8"
     <supported-method name="HEAD"/>
     <supported-method name="MKTICKET"/>
     <supported-method name="DELTICKET"/>
+     <supported-method name="ACL"/>
    </supported-method-set>
    <supported-report-set>
     <supported-report>
--- a/testing/tests/regression-suite/Create-Database.result
+++ b/testing/tests/regression-suite/Create-Database.result
@ -7,7 +7,7 @@ RRULE functions updated.
 Database permissions updated.
 NOTE
 ====
-*  The password for the 'admin' user has been set to 'nimda'"
+*  The password for the 'admin' user has been set to 'nimda'

 Thanks for trying DAViCal!  Check in /usr/share/doc/davical/examples/ for
 some configuration examples.  For help, visit #davical on irc.oftc.net.