/*
* $Id$
- *
- * Entry point for GroupDAV functions
+ */
+/**
+ * \defgroup GroupdavMain Entry point for GroupDAV functions
+ * \ingroup WebcitHttpServerGDav
*
*/
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pthread.h>
+/*@{*/
#include "webcit.h"
#include "webserver.h"
#include "groupdav.h"
-/*
- * Output HTTP headers which are common to all requests.
+/**
+ * \brief 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
+ * do our own header stuff here.
+ *
*/
void groupdav_common_headers(void) {
wprintf(
- "Server: %s / %s\n"
- "Connection: close\n",
+ "Server: %s / %s\r\n"
+ "Connection: close\r\n",
SERVER, serv_info.serv_software
);
}
-/*
- * string conversion function
+/**
+ * \brief string conversion function
+ * \param target output string
+ * \param source string to process
*/
void euid_escapize(char *target, char *source) {
int 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;
}
}
}
-/*
- * string conversion function
+/**
+ * \brief string conversion function
+ * \param target output string
+ * \param source string to process
*/
void euid_unescapize(char *target, char *source) {
int a, b;
strcpy(target, "");
for (a = 0; a < strlen(source); ++a) {
- if (source[a] == '_') {
+ if (source[a] == '%') {
hex[0] = source[a + 1];
hex[1] = source[a + 2];
hex[2] = 0;
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;
-/*
- * Main entry point for GroupDAV requests
+/**
+ * \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
*/
void groupdav_main(struct httprequest *req,
char *dav_content_type,
char *dav_content
) {
struct httprequest *rptr;
- char dav_method[SIZ];
- char dav_pathname[SIZ];
- char dav_ifmatch[SIZ];
+ char dav_method[256];
+ char dav_pathname[256];
+ char dav_ifmatch[256];
+ char buf[256];
+ char *ds;
+ int i;
strcpy(dav_method, "");
strcpy(dav_pathname, "");
strcpy(dav_ifmatch, "");
for (rptr=req; rptr!=NULL; rptr=rptr->next) {
+ /* lprintf(9, "< %s\n", rptr->line); */
if (!strncasecmp(rptr->line, "Host: ", 6)) {
safestrncpy(WC->http_host, &rptr->line[6],
sizeof WC->http_host);
}
if (!WC->logged_in) {
- wprintf("HTTP/1.1 401 Unauthorized\n");
+ wprintf("HTTP/1.1 401 Unauthorized\r\n");
groupdav_common_headers();
- wprintf("WWW-Authenticate: Basic realm=\"%s\"\n",
+ wprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n",
serv_info.serv_humannode);
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
- wprintf("GroupDAV sessions require HTTP authentication.\n");
+ wprintf("Content-Length: 0\r\n\r\n");
return;
}
- extract_token(dav_method, req->line, 0, ' ');
- extract_token(dav_pathname, req->line, 1, ' ');
+ extract_token(dav_method, req->line, 0, ' ', sizeof dav_method);
+ 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
+ * we happen to introduce a double-slash, that's ok; we'll strip it
+ * in the next step.
+ */
+ if (strncasecmp(dav_pathname, "/groupdav", 9)) {
+ snprintf(buf, sizeof buf, "/groupdav/%s", dav_pathname);
+ safestrncpy(dav_pathname, buf, sizeof dav_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);
if (dav_ifmatch[0] == '\"') {
strcpy(dav_ifmatch, &dav_ifmatch[1]);
- if (strtok(dav_ifmatch, "\"") != NULL) {
- strcpy(strtok(dav_ifmatch, "\""), "");
+ for (i=0; i<strlen(dav_ifmatch); ++i) {
+ if (dav_ifmatch[i] == '\"') {
+ dav_ifmatch[i] = 0;
+ }
}
}
if (!strcmp(dav_ifmatch, "*")) {
}
}
- /*
+ /**
+ * 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.
+ */
+ if (!strcasecmp(dav_method, "OPTIONS")) {
+ groupdav_options(dav_pathname);
+ return;
+ }
+
+ /**
* The PROPFIND method is basically used to list all objects in a
* room, or to list all relevant rooms on the server.
*/
return;
}
- /*
+ /**
* The GET method is used for fetching individual items.
*/
if (!strcasecmp(dav_method, "GET")) {
return;
}
- /*
+ /**
* The PUT method is used to add or modify items.
*/
if (!strcasecmp(dav_method, "PUT")) {
return;
}
- /*
+ /**
* The DELETE method kills, maims, and destroys.
*/
if (!strcasecmp(dav_method, "DELETE")) {
return;
}
- /*
+ /**
* Couldn't find what we were looking for. Die in a car fire.
*/
- wprintf("HTTP/1.1 501 Method not implemented\n");
+ wprintf("HTTP/1.1 501 Method not implemented\r\n");
groupdav_common_headers();
- wprintf("Content-Type: text/plain\n"
- "\n"
- "GroupDAV method \"%s\" is not implemented.\n",
+ wprintf("Content-Type: text/plain\r\n"
+ "\r\n"
+ "GroupDAV method \"%s\" is not implemented.\r\n",
dav_method
);
}
+
+
+/*@}*/
projects / citadel.git / blobdiff