*
*/
-#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"
*
*/
void groupdav_common_headers(void) {
- wprintf(
+ hprintf(
"Server: %s / %s\r\n"
"Connection: close\r\n",
- SERVER, serv_info.serv_software
+ PACKAGE_STRING, serv_info.serv_software
);
}
* 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", (0xFF & source[i]));
target_length += 3;
}
}
* 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;
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;
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) {
- /* lprintf(9, "< %s\n", rptr->line); */
if (!strncasecmp(rptr->line, "Host: ", 6)) {
- safestrncpy(WC->http_host, &rptr->line[6],
- sizeof WC->http_host);
+ 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) {
- wprintf("HTTP/1.1 401 Unauthorized\r\n");
+ hprintf("HTTP/1.1 401 Unauthorized\r\n");
groupdav_common_headers();
- wprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n",
+ hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n",
serv_info.serv_humannode);
- wprintf("Content-Length: 0\r\n\r\n");
+ hprintf("Content-Length: 0\r\n");
+ end_burst();
return;
}
/* 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 */
while (ds=strstr(dav_pathname, "//"), ds != NULL) {
* 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;
}
}
}
* 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;
}
*/
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;
}
/*
* Couldn't find what we were looking for. Die in a car fire.
*/
- wprintf("HTTP/1.1 501 Method not implemented\r\n");
+ hprintf("HTTP/1.1 501 Method not implemented\r\n");
groupdav_common_headers();
- wprintf("Content-Type: text/plain\r\n"
- "\r\n"
- "GroupDAV method \"%s\" is not implemented.\r\n",
- dav_method
- );
+ hprintf("Content-Type: text/plain\r\n");
+ wprintf("GroupDAV method \"%s\" is not implemented.\r\n",
+ dav_method);
+ end_burst();
+}
+
+
+/*
+ * 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);
+ }
}
projects / citadel.git / blobdiff