/*
* 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
);
}
+
/*
- * Main entry point for GroupDAV requests
+ * string conversion function
*/
-void groupdav_main(struct httprequest *req) {
+void euid_escapize(char *target, char *source) {
+ int i;
+ int target_length = 0;
+
+ strcpy(target, "");
+ for (i=0; i<strlen(source); ++i) {
+ if (isalnum(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]);
+ target_length += 3;
+ }
+ }
+}
+/*
+ * string conversion function
+ */
+void euid_unescapize(char *target, char *source) {
+ int a, b;
+ char hex[3];
+ int target_length = 0;
+
+ strcpy(target, "");
+
+ for (a = 0; a < strlen(source); ++a) {
+ if (source[a] == '$') {
+ hex[0] = source[a + 1];
+ hex[1] = source[a + 2];
+ hex[2] = 0;
+ b = 0;
+ sscanf(hex, "%02x", &b);
+ target[target_length] = b;
+ 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
+ */
+void groupdav_main(struct httprequest *req,
+ char *dav_content_type,
+ int dav_content_length,
+ char *dav_content
+) {
struct httprequest *rptr;
char dav_method[SIZ];
char dav_pathname[SIZ];
char dav_ifmatch[SIZ];
+ 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); /* FIXME we can eventually remove this trace */
+ /* lprintf(9, "< %s\n", rptr->line); */
if (!strncasecmp(rptr->line, "Host: ", 6)) {
- safestrncpy(WC->http_host, &rptr->line[6], sizeof 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);
+ safestrncpy(dav_ifmatch, &rptr->line[10],
+ sizeof dav_ifmatch);
}
-
}
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", serv_info.serv_humannode);
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
- wprintf("GroupDAV sessions require HTTP authentication.\n");
+ wprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n",
+ serv_info.serv_humannode);
+ 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);
/*
* 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 PROPFIND method is basically used to list all objects in a room.
+ * 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);
}
/*
- * We like the GET method ... it's nice and simple.
+ * The GET method is used for fetching individual items.
*/
if (!strcasecmp(dav_method, "GET")) {
groupdav_get(dav_pathname);
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);
+ return;
+ }
+
/*
* The DELETE method kills, maims, and destroys.
*/
/*
* 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