* Created IsEmptyStr define to be used rather then using some weird strlen constructs
[citadel.git] / webcit / groupdav_main.c
index 6fe89b1b927e0fd54d715255e81b6fa186843a6a..fe3bbe64343a45aaad15990cbd7d742f55cba5bc 100644 (file)
@@ -1,19 +1,17 @@
 /*
  * $Id$
- */
-/**
- * \defgroup GroupdavMain Entry point for GroupDAV functions
- * \ingroup WebcitHttpServerGDav
+ *
+ * Entry point for GroupDAV functions
  *
  */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
 
 
-/**
- * \brief Output HTTP headers which are common to all requests.
+/*
+ * Output HTTP headers which are common to all requests.
  *
  * Please observe that we don't use the usual output_headers()
  * and wDumpContent() functions in the GroupDAV subsystem, so we
@@ -30,50 +28,40 @@ void groupdav_common_headers(void) {
 
 
 
-/**
- * \brief string conversion function
- * \param target output string
- * \param source string to process
+/*
+ * string conversion function
  */
 void euid_escapize(char *target, char *source) {
-       int i;
+       int i, len;
        int target_length = 0;
 
        strcpy(target, "");
-       for (i=0; i<strlen(source); ++i) {
-               if (isalnum(source[i])) {
+       len = strlen(source);
+       for (i=0; i<len; ++i) {
+               if ( (isalnum(source[i])) || (source[i]=='-') || (source[i]=='_') ) {
                        target[target_length] = source[i];
                        target[++target_length] = 0;
                }
-               else if (source[i] == ' ') {
-                       target[target_length] = '_';
-                       target[++target_length] = 0;
-               }
-               else if (source[i] == '-') {
-                       target[target_length] = '-';
-                       target[++target_length] = 0;
-               }
                else {
-                       sprintf(&target[target_length], "%%%02X", source[i]);
+                       sprintf(&target[target_length], "=%02X", source[i]);
                        target_length += 3;
                }
        }
 }
 
-/**
- * \brief string conversion function
- * \param target output string
- * \param source string to process
+/*
+ * string conversion function
  */
 void euid_unescapize(char *target, char *source) {
-       int a, b;
+       int a, b, len;
        char hex[3];
        int target_length = 0;
 
        strcpy(target, "");
 
-       for (a = 0; a < strlen(source); ++a) {
-               if (source[a] == '%') {
+       len = strlen(source);
+       for (a = 0; a < len; ++a) {
+               if (source[a] == '=') {
                        hex[0] = source[a + 1];
                        hex[1] = source[a + 2];
                        hex[2] = 0;
@@ -83,14 +71,6 @@ void euid_unescapize(char *target, char *source) {
                        target[++target_length] = 0;
                        a += 2;
                }
-               else if (source[a] == '_') {
-                       target[target_length] = ' ';
-                       target[++target_length] = 0;
-               }
-               else if (source[a] == '-') {
-                       target[target_length] = '-';
-                       target[++target_length] = 0;
-               }
                else {
                        target[target_length] = source[a];
                        target[++target_length] = 0;
@@ -101,12 +81,8 @@ void euid_unescapize(char *target, char *source) {
 
 
 
-/**
- * \brief Main entry point for GroupDAV requests
- * \param req Request header
- * \param dav_content_type the kind of dav elemet to represent??
- * \param dav_content_length the length of our response
- * \param dav_content the actual content to give back
+/*
+ * Main entry point for GroupDAV requests
  */
 void groupdav_main(struct httprequest *req,
                        char *dav_content_type,
@@ -117,19 +93,37 @@ void groupdav_main(struct httprequest *req,
        char dav_method[256];
        char dav_pathname[256];
        char dav_ifmatch[256];
-       char buf[256];
+       int dav_depth;
        char *ds;
-       int i;
+       int i, len;
 
        strcpy(dav_method, "");
        strcpy(dav_pathname, "");
        strcpy(dav_ifmatch, "");
+       dav_depth = 0;
 
        for (rptr=req; rptr!=NULL; rptr=rptr->next) {
+               if (!strncasecmp(rptr->line, "Host: ", 6)) {
+                       if (IsEmptyStr(WC->http_host)) {
+                               safestrncpy(WC->http_host, &rptr->line[6],
+                                       sizeof WC->http_host);
+                       }
+                }
                if (!strncasecmp(rptr->line, "If-Match: ", 10)) {
                         safestrncpy(dav_ifmatch, &rptr->line[10],
                                sizeof dav_ifmatch);
                 }
+               if (!strncasecmp(rptr->line, "Depth: ", 7)) {
+                       if (!strcasecmp(&rptr->line[7], "infinity")) {
+                               dav_depth = 32767;
+                       }
+                       else if (!strcmp(&rptr->line[7], "0")) {
+                               dav_depth = 0;
+                       }
+                       else if (!strcmp(&rptr->line[7], "1")) {
+                               dav_depth = 1;
+                       }
+                }
        }
 
        if (!WC->logged_in) {
@@ -145,32 +139,39 @@ void groupdav_main(struct httprequest *req,
        extract_token(dav_pathname, req->line, 1, ' ', sizeof dav_pathname);
        unescape_input(dav_pathname);
 
-       /**
-        * If the request does not begin with "/groupdav", prepend it.  If
+       /* If the request does not begin with "/groupdav", prepend it.  If
         * we happen to introduce a double-slash, that's ok; we'll strip it
         * in the next step.
-        */
+        * 
+        * (THIS IS DISABLED BECAUSE WE ARE NOW TRYING TO DO REAL DAV.)
+        *
        if (strncasecmp(dav_pathname, "/groupdav", 9)) {
+               char buf[512];
                snprintf(buf, sizeof buf, "/groupdav/%s", dav_pathname);
                safestrncpy(dav_pathname, buf, sizeof dav_pathname);
        }
+        *
+        */
        
-       /** Remove any stray double-slashes in pathname */
+       /* Remove any stray double-slashes in pathname */
        while (ds=strstr(dav_pathname, "//"), ds != NULL) {
                strcpy(ds, ds+1);
        }
 
-       /**
+       /*
         * If there's an If-Match: header, strip out the quotes if present, and
         * then if all that's left is an asterisk, make it go away entirely.
         */
-       if (strlen(dav_ifmatch) > 0) {
-               striplt(dav_ifmatch);
+       len = strlen(dav_ifmatch);
+       if (len > 0) {
+               stripltlen(dav_ifmatch, &len);
                if (dav_ifmatch[0] == '\"') {
-                       strcpy(dav_ifmatch, &dav_ifmatch[1]);
-                       for (i=0; i<strlen(dav_ifmatch); ++i) {
+                       memmove (dav_ifmatch, &dav_ifmatch[1], len);
+                       len --;
+                       for (i=0; i<len; ++i) {
                                if (dav_ifmatch[i] == '\"') {
                                        dav_ifmatch[i] = 0;
+                                       len = i - 1;
                                }
                        }
                }
@@ -179,7 +180,7 @@ void groupdav_main(struct httprequest *req,
                }
        }
 
-       /**
+       /*
         * 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.
@@ -189,16 +190,17 @@ void groupdav_main(struct httprequest *req,
                return;
        }
 
-       /**
+       /*
         * The PROPFIND method is basically used to list all objects in a
         * room, or to list all relevant rooms on the server.
         */
        if (!strcasecmp(dav_method, "PROPFIND")) {
-               groupdav_propfind(dav_pathname);
+               groupdav_propfind(dav_pathname, dav_depth,
+                               dav_content_type, dav_content);
                return;
        }
 
-       /**
+       /*
         * The GET method is used for fetching individual items.
         */
        if (!strcasecmp(dav_method, "GET")) {
@@ -206,16 +208,17 @@ void groupdav_main(struct httprequest *req,
                return;
        }
 
-       /**
+       /*
         * The PUT method is used to add or modify items.
         */
        if (!strcasecmp(dav_method, "PUT")) {
                groupdav_put(dav_pathname, dav_ifmatch,
-                               dav_content_type, dav_content);
+                               dav_content_type, dav_content,
+                               dav_content_length);
                return;
        }
 
-       /**
+       /*
         * The DELETE method kills, maims, and destroys.
         */
        if (!strcasecmp(dav_method, "DELETE")) {
@@ -223,7 +226,7 @@ void groupdav_main(struct httprequest *req,
                return;
        }
 
-       /**
+       /*
         * Couldn't find what we were looking for.  Die in a car fire.
         */
        wprintf("HTTP/1.1 501 Method not implemented\r\n");
@@ -236,16 +239,13 @@ void groupdav_main(struct httprequest *req,
 }
 
 
-/**
- * \brief Output http[s]://fqdn.example.com[:port] to the client.
- */
-void output_host_prefix(void) {
-       if (strlen(WC->http_host) > 0) {
+/*
+ * Output our host prefix for globally absolute URL's.
+ */  
+void groupdav_identify_host(void) {
+       if (!IsEmptyStr(WC->http_host)) {
                wprintf("%s://%s",
                        (is_https ? "https" : "http"),
                        WC->http_host);
        }
 }
-
-
-/*@}*/