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

OPTIONS now working with new structure.

Browse Source
This commit is contained in:
Andrew McMillan 2006-11-27 00:29:23 +13:00
parent b591115b72
commit 02be51d765
4 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/caldav.php
View File

@ -33,6 +33,6 @@ switch ( $request->method ) {
dbg_error_log( "caldav", "RAW: %s", str_replace("\n", "",str_replace("\r", "", $request->raw_post)) );
}
$this->RequestExitStatus( 500, translate("The application program does not understand that request.") );
$request->DoResponse( 500, translate("The application program does not understand that request.") );
?>

8
inc/CalDAVRequest.php
View File

@ -58,7 +58,7 @@ class CalDAVRequest
$this->path = $_SERVER['PATH_INFO'];
$bad_chars_regex = '/[\\^\\[\\(\\\\]/';
if ( preg_match( $bad_chars_regex, $this->path ) ) {
$this->RequestExitStatus( 400, translate("The calendar path contains illegal characters.") );
$this->DoResponse( 400, translate("The calendar path contains illegal characters.") );
}
$path_split = preg_split('#/+#', $this->path );
@ -169,7 +169,7 @@ class CalDAVRequest
* @param int $status The HTTP status code to send.
* @param string $message The friendly text message to send with the response.
*/
function RequestExitStatus( $status, $message, $content_type="text/plain" ) {
function DoResponse( $status, $message, $content_type="text/plain" ) {
global $session, $c;
switch( $status ) {
case 100: $status_text = "Continue"; break;
@ -209,6 +209,10 @@ class CalDAVRequest
case 417: $status_text = "Expectation Failed"; break;
case 500: $status_text = "Internal Server Error"; break;
case 501: $status_text = "Not Implemented"; break;
case 502: $status_text = "Bad Gateway"; break;
case 503: $status_text = "Service Unavailable"; break;
case 504: $status_text = "Gateway Timeout"; break;
case 505: $status_text = "HTTP Version Not Supported"; break;
}
header( sprintf("HTTP/1.1 %d %s", $status, $status_text) );
header( "Content-type: ".$content_type );

71
inc/caldav-OPTIONS.php
View File

@ -8,29 +8,25 @@
* @copyright Catalyst .Net Ltd
* @license http://gnu.org/copyleft/gpl.html GNU GPL v2
*/
dbg_error_log("OPTIONS", "method handler");
dbg_error_log("OPTIONS", "method handler");
if ( ! isset($permissions['read']) ) {
header("HTTP/1.1 403 Forbidden");
header("Content-type: text/plain");
echo "You may not access that calendar.";
dbg_error_log("OPTIONS", "Access denied for User: %d, Path: %s", $session->user_no, $request_path);
return;
if ( ! $request->AllowedTo('read') ) {
$request->DoResponse( 403, translate("You may not access that calendar") );
}
$exists = false;
$is_calendar = false;
if ( $request_path == '/' ) {
if ( $request->path == '/' ) {
$exists = true;
}
else {
if ( preg_match( '#^/[^/]+/$#', $request_path) ) {
if ( preg_match( '#^/[^/]+/$#', $request->path) ) {
$sql = "SELECT user_no, '/' || username || '/' AS dav_name, md5( '/' || username || '/') AS dav_etag, ";
$sql .= "updated AS created, fullname AS dav_displayname, FALSE AS is_calendar FROM usr WHERE user_no = $path_user_no ; ";
}
else {
$sql = "SELECT user_no, dav_name, dav_etag, created, dav_displayname, is_calendar FROM collection WHERE user_no = $path_user_no AND dav_name = ".qpg($request_path);
$sql = "SELECT user_no, dav_name, dav_etag, created, dav_displayname, is_calendar FROM collection WHERE user_no = $path_user_no AND dav_name = ".qpg($request->path);
}
$qry = new PgQuery($sql );
if( $qry->Exec("OPTIONS",__LINE__,__FILE__) && $qry->rows > 0 && $collection = $qry->Fetch() ) {
@ -46,39 +42,34 @@ else {
}
if ( !exists ) {
header("HTTP/1.1 404 Not Found");
header("Content-type: text/plain");
echo "No collection found at that location.";
dbg_error_log("OPTIONS", "No collection found for User: %d, Path: %s", $session->user_no, $request_path);
return;
$request->DoResponse( 404, translate("No collection found at that location.") );
}
header( "Content-type: text/plain" );
header( "Content-length: 0" );
/**
* As yet we only support quite a limited range of options. When we see clients looking
* for more than this we will work to support them further. We should probably support
* PROPPATCH, because I suspect that will be used. Also HEAD and POST being fairly standard
* should be handled. COPY and MOVE would seem to be easy also.
*/
$allowed = "OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR";
if ( $is_calendar ) $allowed .= ", REPORT";
header( "Allow: $allowed");
// header( "Allow: ACL, COPY, DELETE, GET, HEAD, LOCK, MKCALENDAR, MKCOL, MOVE, OPTIONS, POST, PROPFIND, PROPPATCH, PUT, REPORT, SCHEDULE, TRACE, UNLOCK");
/**
* As yet we only support quite a limited range of options. When we see clients looking
* for more than this we will work to support them further. We should probably support
* PROPPATCH, because I suspect that will be used. Also HEAD and POST being fairly standard
* should be handled. COPY and MOVE would seem to be easy also.
*/
$allowed = "OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR";
if ( $is_calendar ) $allowed .= ", REPORT";
header( "Allow: $allowed");
// header( "Allow: ACL, COPY, DELETE, GET, HEAD, LOCK, MKCALENDAR, MKCOL, MOVE, OPTIONS, POST, PROPFIND, PROPPATCH, PUT, REPORT, SCHEDULE, TRACE, UNLOCK");
/**
* From reading the "Scheduling Extensions to CalDAV" draft I don't think that we will
* be doing this any time soon. The current spec is at:
* http://www.ietf.org/internet-drafts/draft-desruisseaux-caldav-sched-02.txt
*
* access-control is rfc3744, so we will say we do it, but I doubt if we do it
* in all it's glory really.
*/
$dav = "1, 2, access-control";
if ( $is_calendar ) $dav .= ", calendar-access";
header( "Allow: $allowed");
header( "DAV: $dav");
// header( "DAV: 1, 2, access-control, calendar-access, calendar-schedule");
/**
* From reading the "Scheduling Extensions to CalDAV" draft I don't think that we will
* be doing this any time soon. The current spec is at:
* http://www.ietf.org/internet-drafts/draft-desruisseaux-caldav-sched-02.txt
*
* access-control is rfc3744, so we will say we do it, but I doubt if we do it
* in all it's glory really.
*/
$dav = "1, 2, access-control";
if ( $is_calendar ) $dav .= ", calendar-access";
header( "Allow: $allowed");
header( "DAV: $dav");
// header( "DAV: 1, 2, access-control, calendar-access, calendar-schedule");
$request->DoResponse( 200, "" );
?>

2
testing/tests/regression-suite/001-Mulberry-1.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
Server: Apache/2.2.3 (Debian) DAV/2
Content-length: 0
Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR
DAV: 1, 2, access-control
Content-Length: 0
Content-Type: text/plain; charset=UTF-8