nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-26 02:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Starting to write support for RFC5689 (extended MKCOL).

Browse Source
This commit is contained in:
Andrew McMillan 2009-10-15 13:11:18 +13:00
parent 388dd8c1e3
commit 2e67fd5d41
2 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/caldav.php
View File

@ -49,8 +49,8 @@ switch ( $request->method ) {
case 'REPORT': include_once("caldav-REPORT.php"); break; case 'REPORT': include_once("caldav-REPORT.php"); break;
case 'PROPFIND': include_once("caldav-PROPFIND.php"); break; case 'PROPFIND': include_once("caldav-PROPFIND.php"); break;
case 'PROPPATCH': include_once("caldav-PROPPATCH.php"); break; case 'PROPPATCH': include_once("caldav-PROPPATCH.php"); break;
case 'MKCALENDAR': include_once("caldav-MKCALENDAR.php"); break; case 'MKCALENDAR': include_once("caldav-MKCOL.php"); break;
case 'MKCOL': include_once("caldav-MKCALENDAR.php"); break; case 'MKCOL': include_once("caldav-MKCOL.php"); break;
case 'PUT': include_once("caldav-PUT.php"); break; case 'PUT': include_once("caldav-PUT.php"); break;
case 'POST': include_once("caldav-POST.php"); break; case 'POST': include_once("caldav-POST.php"); break;
case 'GET': include_once("caldav-GET.php"); break; case 'GET': include_once("caldav-GET.php"); break;

75
inc/caldav-MKCALENDAR.php → inc/caldav-MKCOL.php
View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* CalDAV Server - handle MKCALENDAR method * CalDAV Server - handle MKCOL and MKCALENDAR method
* *
* @package davical * @package davical
* @subpackage caldav * @subpackage caldav
@ -8,17 +8,17 @@
* @copyright Catalyst IT Ltd, Morphoss Ltd - http://www.morphoss.com/ * @copyright Catalyst IT Ltd, Morphoss Ltd - http://www.morphoss.com/
* @license http://gnu.org/copyleft/gpl.html GNU GPL v2 * @license http://gnu.org/copyleft/gpl.html GNU GPL v2
*/ */
dbg_error_log("MKCALENDAR", "method handler"); dbg_error_log('MKCOL', 'method handler');
if ( ! $request->AllowedTo('mkcalendar') ) { if ( ! $request->AllowedTo('mkcalendar') ) {
$request->DoResponse( 403, translate("You may not create a calendar there.") ); $request->DoResponse( 403, translate('You may not create a calendar there.') );
} }
$displayname = $request->path; $displayname = $request->path;
// Enforce trailling '/' on collection name // Enforce trailling '/' on collection name
if ( ! preg_match( '#/$#', $request->path ) ) { if ( ! preg_match( '#/$#', $request->path ) ) {
dbg_error_log( "MKCALENDAR", "Add trailling '/' to '%s'", $request->path); dbg_error_log( 'MKCOL', 'Add trailling "/" to "%s"', $request->path);
$request->path .= '/'; $request->path .= '/';
} }
@ -28,30 +28,44 @@ if ( preg_match( '#^(.*/)([^/]+)(/)?$#', $request->path, $matches ) ) {
$displayname = $matches[2]; $displayname = $matches[2];
} }
require_once("XMLDocument.php"); $is_calendar = ($request->method == 'MKCALENDAR');
$reply = new XMLDocument(array( "DAV:" => "", 'urn:ietf:params:xml:ns:caldav' => 'C' ));
require_once('XMLDocument.php');
$reply = new XMLDocument(array( 'DAV:' => '', 'urn:ietf:params:xml:ns:caldav' => 'C' ));
$failure = array(); $failure = array();
$propertysql = ""; $propertysql = '';
if ( isset($request->xml_tags) ) { if ( isset($request->xml_tags) ) {
/** /**
* The MKCALENDAR request may contain XML to set some DAV properties * The MKCOL request may contain XML to set some DAV properties
*/ */
$position = 0; $position = 0;
$xmltree = BuildXMLTree( $request->xml_tags, $position); $xmltree = BuildXMLTree( $request->xml_tags, $position);
// echo $xmltree->Render();
if ( $xmltree->GetTag() != "urn:ietf:params:xml:ns:caldav:mkcalendar" ) {
$request->DoResponse( 403, "The supplied XML is not a 'urn:ietf:params:xml:ns:caldav:mkcalendar' document" );
}
$setprops = $xmltree->GetPath("/urn:ietf:params:xml:ns:caldav:mkcalendar/DAV::set/DAV::prop/*");
$propertysql = ""; if ( $xmltree->GetTag() != 'urn:ietf:params:xml:ns:caldav:mkcalendar' && $xmltree->GetTag() != 'DAV::mkcol') {
$request->DoResponse( 403, 'The supplied XML is not a "DAV::mkcol" or "urn:ietf:params:xml:ns:caldav:mkcalendar" document' );
}
$setprops = $xmltree->GetPath('/*/DAV::set/DAV::prop/*');
$propertysql = '';
foreach( $setprops AS $k => $setting ) { foreach( $setprops AS $k => $setting ) {
$tag = $setting->GetTag(); $tag = $setting->GetTag();
$content = $setting->RenderContent(); $content = $setting->RenderContent();
switch( $tag ) { switch( $tag ) {
case 'DAV::resourcetype':
/** Any value for resourcetype other than 'calendar' is ignored */
dbg_error_log( 'MKCOL', 'Extended MKCOL with resourcetype specified. "%s"', $content);
if ( preg_match( '/urn:ietf:params:xml:ns:caldav:calendar/', $content ) ) {
$is_calendar = true;
}
else if ( preg_match( '/urn:ietf:params:xml:ns:carddav:addressbook/', $content ) ) {
$is_addressbook = true;
}
$success[$tag] = 1;
break;
case 'DAV::displayname': case 'DAV::displayname':
$displayname = $content; $displayname = $content;
/** /**
@ -59,7 +73,7 @@ if ( isset($request->xml_tags) ) {
* with an error, rather than silently doing what they *seem* to want us to do. * with an error, rather than silently doing what they *seem* to want us to do.
*/ */
if ( preg_match( '/^SOHO.Organizer.6\./', $_SERVER['HTTP_USER_AGENT'] ) ) { if ( preg_match( '/^SOHO.Organizer.6\./', $_SERVER['HTTP_USER_AGENT'] ) ) {
dbg_error_log( "MKCALENDAR", "Displayname is '/' to '%s'", $request->path); dbg_error_log( 'MKCOL', 'Displayname is "/" to "%s"', $request->path);
$parent_container = $request->path; $parent_container = $request->path;
$request->path .= $content . '/'; $request->path .= $content . '/';
} }
@ -73,7 +87,6 @@ if ( isset($request->xml_tags) ) {
case 'urn:ietf:params:xml:ns:caldav:min-date-time': /** Ignored, since we will support arbitrary time */ case 'urn:ietf:params:xml:ns:caldav:min-date-time': /** Ignored, since we will support arbitrary time */
case 'urn:ietf:params:xml:ns:caldav:max-date-time': /** Ignored, since we will support arbitrary time */ case 'urn:ietf:params:xml:ns:caldav:max-date-time': /** Ignored, since we will support arbitrary time */
case 'urn:ietf:params:xml:ns:caldav:max-instances': /** Ignored, since we will support arbitrary instances */ case 'urn:ietf:params:xml:ns:caldav:max-instances': /** Ignored, since we will support arbitrary instances */
case 'DAV::resourcetype': /** Any value for resourcetype is ignored */
$success[$tag] = 1; $success[$tag] = 1;
break; break;
@ -90,7 +103,7 @@ if ( isset($request->xml_tags) ) {
$failure['set-'.$tag] = new XMLElement( 'propstat', array( $failure['set-'.$tag] = new XMLElement( 'propstat', array(
new XMLElement( 'prop', new XMLElement($tag)), new XMLElement( 'prop', new XMLElement($tag)),
new XMLElement( 'status', 'HTTP/1.1 409 Conflict' ), new XMLElement( 'status', 'HTTP/1.1 409 Conflict' ),
new XMLElement('responsedescription', translate("Property is read-only") ) new XMLElement('responsedescription', translate('Property is read-only') )
)); ));
break; break;
@ -98,7 +111,7 @@ if ( isset($request->xml_tags) ) {
* If we don't have any special processing for the property, we just store it verbatim (which will be an XML fragment). * If we don't have any special processing for the property, we just store it verbatim (which will be an XML fragment).
*/ */
default: default:
$propertysql .= awl_replace_sql_args( "SELECT set_dav_property( ?, ?, ?, ? );", $request->path, $request->user_no, $tag, $content ); $propertysql .= awl_replace_sql_args( 'SELECT set_dav_property( ?, ?, ?, ? );', $request->path, $request->user_no, $tag, $content );
$success[$tag] = 1; $success[$tag] = 1;
break; break;
} }
@ -117,32 +130,32 @@ if ( isset($request->xml_tags) ) {
} }
array_unshift( $failure, $reply->href( ConstructURL($request->path) ) ); array_unshift( $failure, $reply->href( ConstructURL($request->path) ) );
$failure[] = new XMLElement('responsedescription', translate("Some properties were not able to be set.") ); $failure[] = new XMLElement('responsedescription', translate('Some properties were not able to be set.') );
$request->DoResponse( 207, $reply->Render("multistatus", new XMLElement( 'response', $failure )), 'text/xml; charset="utf-8"' ); $request->DoResponse( 207, $reply->Render('multistatus', new XMLElement( 'response', $failure )), 'text/xml; charset="utf-8"' );
} }
} }
$sql = "SELECT * FROM collection WHERE dav_name = ?;"; $sql = 'SELECT * FROM collection WHERE dav_name = ?;';
$qry = new PgQuery( $sql, $request->path ); $qry = new PgQuery( $sql, $request->path );
if ( ! $qry->Exec("MKCALENDAR") ) { if ( ! $qry->Exec('MKCOL') ) {
$request->DoResponse( 500, translate("Error querying database.") ); $request->DoResponse( 500, translate('Error querying database.') );
} }
if ( $qry->rows != 0 ) { if ( $qry->rows != 0 ) {
$request->DoResponse( 405, translate("A collection already exists at that location.") ); $request->DoResponse( 405, translate('A collection already exists at that location.') );
} }
$sql = "BEGIN; INSERT INTO collection ( user_no, parent_container, dav_name, dav_etag, dav_displayname, is_calendar, created, modified ) VALUES( ?, ?, ?, ?, ?, ?, current_timestamp, current_timestamp ); $propertysql; COMMIT;"; $sql = 'BEGIN; INSERT INTO collection ( user_no, parent_container, dav_name, dav_etag, dav_displayname, is_calendar, created, modified ) VALUES( ?, ?, ?, ?, ?, ?, current_timestamp, current_timestamp ); $propertysql; COMMIT;';
$qry = new PgQuery( $sql, $request->user_no, $parent_container, $request->path, md5($request->user_no. $request->path), $displayname, ($request->method == 'MKCALENDAR') ); $qry = new PgQuery( $sql, $request->user_no, $parent_container, $request->path, md5($request->user_no. $request->path), $displayname, $is_calendar );
if ( $qry->Exec("MKCALENDAR",__LINE__,__FILE__) ) { if ( $qry->Exec('MKCOL',__LINE__,__FILE__) ) {
dbg_error_log( "MKCALENDAR", "New calendar '%s' created named '%s' for user '%d' in parent '%s'", $request->path, $displayname, $session->user_no, $parent_container); dbg_error_log( 'MKCOL', 'New calendar "%s" created named "%s" for user "%d" in parent "%s"', $request->path, $displayname, $session->user_no, $parent_container);
header("Cache-Control: no-cache"); /** draft-caldav-15 declares this is necessary at 5.3.1 */ header('Cache-Control: no-cache'); /** draft-caldav-15 declares this is necessary at 5.3.1 */
$request->DoResponse( 201, "" ); $request->DoResponse( 201, '' );
} }
else { else {
$request->DoResponse( 500, translate("Error writing calendar details to database.") ); $request->DoResponse( 500, translate('Error writing calendar details to database.') );
} }
/** /**