* 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(StrBuf *dav_content, int offset)
{
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");
+ wprintf("%s\r\n", &buf[4]);
+ end_burst();
return;
}
- client_write(dav_content, dav_content_length);
+ serv_write(ChrPtr(dav_content) + offset, StrLength(dav_content) - offset);
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");
+ hprintf("Content-Length: 0\r\n");
}
/*
- * The pathname is always going to be /groupdav/room_name/euid
+ * The pathname is always going to take one of two formats:
+ * /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(StrBuf *dav_pathname, char *dav_ifmatch,
+ const char *dav_content_type, StrBuf *dav_content,
+ int offset)
+{
+ StrBuf *dav_roomname;
+ StrBuf *dav_uid;
long new_msgnum = (-2L);
long old_msgnum = (-1L);
char buf[SIZ];
int n = 0;
- int is_bigics = 0; /* nonzero == doing a webcal publish */
-
- /* First, break off the "/groupdav/" prefix */
- remove_token(dav_pathname, 0, '/');
- remove_token(dav_pathname, 0, '/');
-
- /* Now extract the message euid */
- n = num_tokens(dav_pathname, '/');
- extract_token(dav_uid, dav_pathname, n-1, '/', sizeof dav_uid);
- remove_token(dav_pathname, n-1, '/');
-
- /* What's left is the room name. Check for webcal publish syntax... */
- if (!strcasecmp(&dav_pathname[strlen(dav_pathname)-4], "/ics")) {
- dav_pathname[strlen(dav_pathname)-4] = 0;
- is_bigics = 1;
- }
- for (n=0; n<strlen(dav_pathname); ++n) {
- if (!strncasecmp(&dav_pathname[n], "/ics/", 5)) {
- dav_pathname[n] = 0;
- is_bigics = 1;
- }
+ if (StrBufNum_tokens(dav_pathname, '/') < 3) {
+ hprintf("HTTP/1.1 404 not found\r\n");
+ groupdav_common_headers();
+ hprintf("Content-Type: text/plain\r\n");
+ wprintf("The object you requested was not found.\r\n");
+ end_burst();
+ return;
}
- /* ...now remove trailing slashes. */
- if (dav_pathname[strlen(dav_pathname)-1] == '/') {
- dav_pathname[strlen(dav_pathname)-1] = 0;
+ dav_roomname = NewStrBuf();;
+ dav_uid = NewStrBuf();;
+ StrBufExtract_token(dav_roomname, dav_pathname, 2, '/');
+ StrBufExtract_token(dav_uid, dav_pathname, 3, '/');
+ if ((!strcasecmp(ChrPtr(dav_uid), "ics")) ||
+ (!strcasecmp(ChrPtr(dav_uid), "calendar.ics"))) {
+ FlushStrBuf(dav_uid);
}
- strcpy(dav_roomname, dav_pathname);
/* Go to the correct room. */
- if (strcasecmp(WC->wc_roomname, dav_roomname)) {
+ if (strcasecmp(ChrPtr(WC->wc_roomname), 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->wc_roomname), 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");
+ wprintf("There is no folder called \"%s\" on this server.\r\n",
+ ChrPtr(dav_roomname));
+ end_burst();
+ FreeStrBuf(&dav_roomname);
+ FreeStrBuf(&dav_uid);
return;
}
* client is expecting. If not, the server probably contains a newer
* version, so we fail...
*/
- if (strlen(dav_ifmatch) > 0) {
+ if (!IsEmptyStr(dav_ifmatch)) {
lprintf(9, "dav_ifmatch: %s\n", dav_ifmatch);
- old_msgnum = locate_message_by_uid(dav_uid);
+ 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");
+ 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);
groupdav_common_headers();
- wprintf("Content-Length: 0\r\n\r\n");
+ hprintf("Content-Length: 0\r\n");
+ end_burst();
+ FreeStrBuf(&dav_roomname);
+ FreeStrBuf(&dav_uid);
return;
}
}
- if (is_bigics) {
- groupdav_put_bigics(dav_content, dav_content_length);
+ /** PUT on the collection itself uploads an ICS of the entire collection.
+ */
+ if (StrLength(dav_uid) > 0) {
+ groupdav_put_bigics(dav_content, offset);
+ FreeStrBuf(&dav_roomname);
+ FreeStrBuf(&dav_uid);
return;
}
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");
+
+ wprintf("%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_puts(ChrPtr(dav_content) + offset);
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;
}
}
/* 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");
+ wprintf("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: ");
+ hprintf("etag: \"%ld\"\r\n", new_msgnum);
+ hprintf("Location: ");
groupdav_identify_host();
- wprintf("/groupdav/");
- urlescputs(dav_roomname);
- wprintf("/%s\r\n", dav_uid);
- wprintf("\r\n");
+ 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);
+ hprintf("Content-Length: 0\r\n");
/* 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);
-
+ end_burst();
+ FreeStrBuf(&dav_roomname);
+ FreeStrBuf(&dav_uid);
return;
}
projects / citadel.git / blobdiff