X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgroupdav_put.c;h=b63b61935f77bfc63b72e711331d1136b81f6f9a;hb=f5c1330914acc193f96892efc191a32ee537dfb5;hp=21eaefbb858271711a7373f08fd70877c3cbbe4b;hpb=26a4a07bdacdaa7013bf45cc235df207708acfde;p=citadel.git

diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c
index 21eaefbb8..b63b61935 100644
--- a/webcit/groupdav_put.c
+++ b/webcit/groupdav_put.c
@@ -1,8 +1,21 @@
 /*
- * $Id$
- *
  * Handles GroupDAV PUT requests.
  *
+ * Copyright (c) 2005-2010 by the citadel.org team
+ *
+ * This program is free 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.
+ *
+ * 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"
@@ -15,80 +28,91 @@
  * component.  This would be for webcal:// 'publish' operations, not
  * for GroupDAV.
  */
-void groupdav_put_bigics(char *dav_content, int dav_content_length)
+void groupdav_put_bigics(void)
 {
+	wcsession *WCC = WC;
 	char buf[1024];
 
+	/*
+	 * Tell the server that when we save a calendar event, we
+	 * do *not* want the server to generate invitations. 
+	 */
+	serv_puts("ICAL sgi|0");
+	serv_getln(buf, sizeof buf);
+
 	serv_puts("ICAL putics");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '4') {
-		wprintf("HTTP/1.1 502 Bad Gateway\r\n");
+		hprintf("HTTP/1.1 502 Bad Gateway\r\n");
 		groupdav_common_headers();
-		wprintf("Content-type: text/plain\r\n"
-			"\r\n"
-			"%s\r\n", &buf[4]
-		);
+		hprintf("Content-type: text/plain\r\n");
+		begin_burst();
+		wc_printf("%s\r\n", &buf[4]);
+		end_burst();
 		return;
 	}
 
-	serv_write(dav_content, dav_content_length);
+	serv_putbuf(WCC->upload);
 	serv_printf("\n000");
 
 	/* Report success and not much else. */
-	wprintf("HTTP/1.1 204 No Content\r\n");
+	hprintf("HTTP/1.1 204 No Content\r\n");
 	lprintf(9, "HTTP/1.1 204 No Content\r\n");
 	groupdav_common_headers();
-	wprintf("Content-Length: 0\r\n\r\n");
+	begin_burst();
+	end_burst();
 }
 
 
 
 /*
  * The pathname is always going to take one of two formats:
- * /groupdav/room_name/euid	(GroupDAV)
- * /groupdav/room_name		(webcal)
+ * [/groupdav/]room_name/euid	(GroupDAV)
+ * [/groupdav/]room_name		(webcal)
  */
-void groupdav_put(char *dav_pathname, char *dav_ifmatch,
-		char *dav_content_type, char *dav_content,
-		int dav_content_length
-) {
-	char dav_roomname[1024];
-	char dav_uid[1024];
+void groupdav_put(void) 
+{
+	wcsession *WCC = WC;
+	StrBuf *dav_roomname;
+	StrBuf *dav_uid;
 	long new_msgnum = (-2L);
 	long old_msgnum = (-1L);
 	char buf[SIZ];
 	int n = 0;
 
-	if (num_tokens(dav_pathname, '/') < 3) {
-		wprintf("HTTP/1.1 404 not found\r\n");
+	if (StrBufNum_tokens(WCC->Hdr->HR.ReqLine, '/') < 2) {
+		hprintf("HTTP/1.1 404 not found\r\n");
 		groupdav_common_headers();
-		wprintf(
-			"Content-Type: text/plain\r\n"
-			"\r\n"
-			"The object you requested was not found.\r\n"
-		);
+		hprintf("Content-Type: text/plain\r\n");
+		begin_burst();
+		wc_printf("The object you requested was not found.\r\n");
+		end_burst();
 		return;
 	}
 
-	extract_token(dav_roomname, dav_pathname, 2, '/', sizeof dav_roomname);
-	extract_token(dav_uid, dav_pathname, 3, '/', sizeof dav_uid);
-	if ((!strcasecmp(dav_uid, "ics")) || (!strcasecmp(dav_uid, "calendar.ics"))) {
-		strcpy(dav_uid, "");
+	dav_roomname = NewStrBuf();;
+	dav_uid = NewStrBuf();;
+	StrBufExtract_token(dav_roomname, WCC->Hdr->HR.ReqLine, 0, '/');
+	StrBufExtract_token(dav_uid, WCC->Hdr->HR.ReqLine, 1, '/');
+	if ((!strcasecmp(ChrPtr(dav_uid), "ics")) || 
+	    (!strcasecmp(ChrPtr(dav_uid), "calendar.ics"))) {
+		FlushStrBuf(dav_uid);
 	}
 
 	/* Go to the correct room. */
-	if (strcasecmp(WC->wc_roomname, dav_roomname)) {
+	if (strcasecmp(ChrPtr(WC->CurRoom.name), ChrPtr(dav_roomname))) {
 		gotoroom(dav_roomname);
 	}
-	if (strcasecmp(WC->wc_roomname, dav_roomname)) {
-		wprintf("HTTP/1.1 404 not found\r\n");
+	if (strcasecmp(ChrPtr(WC->CurRoom.name), ChrPtr(dav_roomname))) {
+		hprintf("HTTP/1.1 404 not found\r\n");
 		groupdav_common_headers();
-		wprintf(
-			"Content-Type: text/plain\r\n"
-			"\r\n"
-			"There is no folder called \"%s\" on this server.\r\n",
-			dav_roomname
-		);
+		hprintf("Content-Type: text/plain\r\n");
+		begin_burst();
+		wc_printf("There is no folder called \"%s\" on this server.\r\n",
+			ChrPtr(dav_roomname));
+		end_burst();
+		FreeStrBuf(&dav_roomname);
+		FreeStrBuf(&dav_uid);		
 		return;
 	}
 
@@ -99,24 +123,29 @@ void groupdav_put(char *dav_pathname, char *dav_ifmatch,
 	 * client is expecting.  If not, the server probably contains a newer
 	 * version, so we fail...
 	 */
-	if (strlen(dav_ifmatch) > 0) {
-		lprintf(9, "dav_ifmatch: %s\n", dav_ifmatch);
-		old_msgnum = locate_message_by_uid(dav_uid);
+	if (StrLength(WCC->Hdr->HR.dav_ifmatch) > 0) {
+		lprintf(9, "dav_ifmatch: %s\n", WCC->Hdr->HR.dav_ifmatch);
+		old_msgnum = locate_message_by_uid(ChrPtr(dav_uid));
 		lprintf(9, "old_msgnum:  %ld\n", old_msgnum);
-		if (atol(dav_ifmatch) != old_msgnum) {
-			wprintf("HTTP/1.1 412 Precondition Failed\r\n");
+		if (StrTol(WCC->Hdr->HR.dav_ifmatch) != old_msgnum) {
+			hprintf("HTTP/1.1 412 Precondition Failed\r\n");
 			lprintf(9, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n",
-				atol(dav_ifmatch), old_msgnum);
+				StrTol(WCC->Hdr->HR.dav_ifmatch), old_msgnum);
 			groupdav_common_headers();
-			wprintf("Content-Length: 0\r\n\r\n");
+			
+			end_burst();
+			FreeStrBuf(&dav_roomname);
+			FreeStrBuf(&dav_uid);
 			return;
 		}
 	}
 
 	/** PUT on the collection itself uploads an ICS of the entire collection.
 	 */
-	if (!strcasecmp(dav_uid, "")) {
-		groupdav_put_bigics(dav_content, dav_content_length);
+	if (StrLength(dav_uid) == 0) {
+		groupdav_put_bigics();
+		FreeStrBuf(&dav_roomname);
+		FreeStrBuf(&dav_uid);
 		return;
 	}
 
@@ -128,33 +157,36 @@ void groupdav_put(char *dav_pathname, char *dav_ifmatch,
 	serv_puts("ENT0 1|||4|||1|");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '8') {
-		wprintf("HTTP/1.1 502 Bad Gateway\r\n");
+		hprintf("HTTP/1.1 502 Bad Gateway\r\n");
 		groupdav_common_headers();
-		wprintf("Content-type: text/plain\r\n"
-			"\r\n"
-			"%s\r\n", &buf[4]
-		);
+		hprintf("Content-type: text/plain\r\n");
+		begin_burst();
+		wc_printf("%s\r\n", &buf[4]);
+		end_burst();
 		return;
 	}
 
 	/* Send the content to the Citadel server */
-	serv_printf("Content-type: %s\n\n", dav_content_type);
-	serv_puts(dav_content);
+	//serv_printf("Content-type: %s\n\n", WCC->upload_content_type);
+	serv_putbuf(WCC->upload);
 	serv_puts("\n000");
 
 	/* Fetch the reply from the Citadel server */
 	n = 0;
-	strcpy(dav_uid, "");
+	FlushStrBuf(dav_uid);
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 		switch(n++) {
-			case 0: new_msgnum = atol(buf);
-				break;
-			case 1:	lprintf(9, "new_msgnum=%ld (%s)\n", new_msgnum, buf);
-				break;
-			case 2: strcpy(dav_uid, buf);
-				break;
-			default:
-				break;
+		case 0: 
+			new_msgnum = atol(buf);
+			break;
+		case 1:	
+			lprintf(9, "new_msgnum=%ld (%s)\n", new_msgnum, buf);
+			break;
+		case 2: 
+			StrBufAppendBufPlain(dav_uid, buf, -1, 0);
+			break;
+		default:
+			break;
 		}
 	}
 
@@ -162,44 +194,50 @@ void groupdav_put(char *dav_pathname, char *dav_ifmatch,
 
 	/* Citadel failed in some way? */
 	if (new_msgnum < 0L) {
-		wprintf("HTTP/1.1 502 Bad Gateway\r\n");
+		hprintf("HTTP/1.1 502 Bad Gateway\r\n");
 		groupdav_common_headers();
-		wprintf("Content-type: text/plain\r\n"
-			"\r\n"
-			"new_msgnum is %ld\r\n"
-			"\r\n", new_msgnum
-		);
+		hprintf("Content-type: text/plain\r\n");
+		begin_burst();
+		wc_printf("new_msgnum is %ld\r\n"
+			"\r\n", new_msgnum);
+		end_burst();
+		FreeStrBuf(&dav_roomname);
+		FreeStrBuf(&dav_uid);
 		return;
 	}
 
 	/* We created this item for the first time. */
 	if (old_msgnum < 0L) {
-		wprintf("HTTP/1.1 201 Created\r\n");
+	        char escaped_uid[1024];
+		hprintf("HTTP/1.1 201 Created\r\n");
 		lprintf(9, "HTTP/1.1 201 Created\r\n");
 		groupdav_common_headers();
-		wprintf("etag: \"%ld\"\r\n", new_msgnum);
-		wprintf("Content-Length: 0\r\n");
-		wprintf("Location: ");
-		groupdav_identify_host();
-		wprintf("/groupdav/");
-		urlescputs(dav_roomname);
-		wprintf("/%s\r\n", dav_uid);
-		wprintf("\r\n");
+		hprintf("etag: \"%ld\"\r\n", new_msgnum);
+		hprintf("Location: ");
+		groupdav_identify_hosthdr();
+		hprintf("/groupdav/");/* TODO */
+		hurlescputs(ChrPtr(dav_roomname));
+	        euid_escapize(escaped_uid, ChrPtr(dav_uid));
+	        hprintf("/%s\r\n", escaped_uid);
+		end_burst();
+		FreeStrBuf(&dav_roomname);
+		FreeStrBuf(&dav_uid);
 		return;
 	}
 
 	/* We modified an existing item. */
-	wprintf("HTTP/1.1 204 No Content\r\n");
+	hprintf("HTTP/1.1 204 No Content\r\n");
 	lprintf(9, "HTTP/1.1 204 No Content\r\n");
 	groupdav_common_headers();
-	wprintf("etag: \"%ld\"\r\n", new_msgnum);
-	wprintf("Content-Length: 0\r\n\r\n");
-
+	hprintf("Etag: \"%ld\"\r\n", new_msgnum);
 	/* The item we replaced has probably already been deleted by
 	 * the Citadel server, but we'll do this anyway, just in case.
 	 */
 	serv_printf("DELE %ld", old_msgnum);
 	serv_getln(buf, sizeof buf);
-
+	begin_burst();
+	end_burst();
+	FreeStrBuf(&dav_roomname);
+	FreeStrBuf(&dav_uid);
 	return;
 }