X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdav_main.c;h=9d20819dc05af3cafb479b74b967b61684ff5f03;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=97fcc9dc11f7423fbedeae9ebae9db5de8949a72;hpb=fb9557de050f4a88b57796574a3e8e93d37496de;p=citadel.git diff --git a/webcit/dav_main.c b/webcit/dav_main.c index 97fcc9dc1..9d20819dc 100644 --- a/webcit/dav_main.c +++ b/webcit/dav_main.c @@ -1,21 +1,15 @@ /* * Entry point for GroupDAV functions * - * Copyright (c) 2005-2010 by the citadel.org team + * Copyright (c) 2005-2012 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -34,7 +28,7 @@ HashList *DavNamespaces = NULL; * do our own header stuff here. * */ -void groupdav_common_headers(void) { +void dav_common_headers(void) { hprintf( "Server: %s / %s\r\n" "Connection: close\r\n", @@ -100,13 +94,14 @@ void euid_unescapize(char *target, const char *source) { /* * Main entry point for GroupDAV requests */ -void groupdav_main(void) +void dav_main(void) { wcsession *WCC = WC; int i, len; - StrBufUnescape(WCC->Hdr->HR.ReqLine, 0); + syslog(LOG_DEBUG, "dav_main() called, logged_in=%d", WCC->logged_in ); + StrBufUnescape(WCC->Hdr->HR.ReqLine, 0); StrBufStripSlashes(WCC->Hdr->HR.ReqLine, 0); /* @@ -134,50 +129,55 @@ void groupdav_main(void) switch (WCC->Hdr->HR.eReqType) { /* - * The OPTIONS method is not required by GroupDAV. This is an - * experiment to determine what might be involved in supporting - * other variants of DAV in the future. + * The OPTIONS method is not required by GroupDAV but it will be + * needed for future implementations of other DAV-based protocols. */ case eOPTIONS: - groupdav_options(); + dav_options(); break; - /* * The PROPFIND method is basically used to list all objects in a * room, or to list all relevant rooms on the server. */ case ePROPFIND: - groupdav_propfind(); + dav_propfind(); break; /* * The GET method is used for fetching individual items. */ case eGET: - groupdav_get(); + dav_get(); break; /* * The PUT method is used to add or modify items. */ case ePUT: - groupdav_put(); + dav_put(); break; /* * The DELETE method kills, maims, and destroys. */ case eDELETE: - groupdav_delete(); + dav_delete(); break; - default: + /* + * The REPORT method tells us that Mike Shaver is a self-righteous asshole. + */ + case eREPORT: + dav_report(); + break; + + default: /* * Couldn't find what we were looking for. Die in a car fire. */ hprintf("HTTP/1.1 501 Method not implemented\r\n"); - groupdav_common_headers(); + dav_common_headers(); hprintf("Content-Type: text/plain\r\n"); wc_printf("GroupDAV method \"%s\" is not implemented.\r\n", ReqStrs[WCC->Hdr->HR.eReqType]); @@ -189,7 +189,7 @@ void groupdav_main(void) /* * Output our host prefix for globally absolute URL's. */ -void groupdav_identify_host(void) { +void dav_identify_host(void) { wc_printf("%s", ChrPtr(site_prefix)); } @@ -202,7 +202,7 @@ void tmplput_dav_HOSTNAME(StrBuf *Target, WCTemplputParams *TP) /* * Output our host prefix for globally absolute URL's. */ -void groupdav_identify_hosthdr(void) { +void dav_identify_hosthdr(void) { hprintf("%s", ChrPtr(site_prefix)); } @@ -212,6 +212,7 @@ void Header_HandleIfMatch(StrBuf *Line, ParsedHttpHdrs *hdr) hdr->HR.dav_ifmatch = Line; } + void Header_HandleDepth(StrBuf *Line, ParsedHttpHdrs *hdr) { if (!strcasecmp(ChrPtr(Line), "infinity")) { @@ -224,6 +225,8 @@ void Header_HandleDepth(StrBuf *Line, ParsedHttpHdrs *hdr) hdr->HR.dav_depth = 1; } } + + int Conditional_DAV_DEPTH(StrBuf *Target, WCTemplputParams *TP) { return WC->Hdr->HR.dav_depth == GetTemplateTokenNumber(Target, TP, 2, 0); @@ -249,6 +252,7 @@ void RegisterDAVNamespace(const char * UrlString, Put(DavNamespaces, UrlString, UrlSLen, vHandler, reference_free_handler); } + int Conditional_DAV_NS(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -271,6 +275,7 @@ int Conditional_DAV_NSCURRENT(StrBuf *Target, WCTemplputParams *TP) return WCC->Hdr->HR.Handler == vHandler; } + void tmplput_DAV_NAMESPACE(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -285,6 +290,7 @@ void tmplput_DAV_NAMESPACE(StrBuf *Target, WCTemplputParams *TP) } } + int GroupdavDispatchREST(RESTDispatchID WhichAction, int IgnoreFloor) { wcsession *WCC = WC; @@ -311,9 +317,9 @@ ServerStartModule_DAV { DavNamespaces = NewHash(1, NULL); - } + void ServerShutdownModule_DAV (void) @@ -322,26 +328,22 @@ ServerShutdownModule_DAV } - - void InitModule_GROUPDAV (void) { -/* - WebcitAddUrlHandler(HKEY("groupdav"), "", 0, groupdav_main, XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); - */ RegisterDAVNamespace(HKEY("groupdav"), HKEY("GroupDAV"), - groupdav_main, GroupdavDispatchREST, - XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); + dav_main, GroupdavDispatchREST, + XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE + ); - RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_davHOSTNAME, NULL, CTX_NONE); + RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_dav_HOSTNAME, NULL, CTX_NONE); RegisterConditional(HKEY("COND:DAV:NS"), 0, Conditional_DAV_NS, CTX_NONE); RegisterIterator("DAV:NS", 0, DavNamespaces, NULL, - NULL, NULL, CTX_DAVNS, CTX_NONE, IT_NOFLAG); - + NULL, NULL, CTX_DAVNS, CTX_NONE, IT_NOFLAG + ); RegisterConditional(HKEY("COND:DAV:NSCURRENT"), 0, Conditional_DAV_NSCURRENT, CTX_DAVNS); RegisterNamespace("DAV:NAMESPACE", 0, 1, tmplput_DAV_NAMESPACE, NULL, CTX_NONE); @@ -349,5 +351,4 @@ InitModule_GROUPDAV RegisterHeaderHandler(HKEY("IF-MATCH"), Header_HandleIfMatch); RegisterHeaderHandler(HKEY("DEPTH"), Header_HandleDepth); RegisterConditional(HKEY("COND:DAV:DEPTH"), 1, Conditional_DAV_DEPTH, CTX_NONE); - }