X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.c;h=71b780a76a4c3d6b7d78f9bb5c43c597846c1967;hb=4173c5f13716fb5658deaa4046c5b3d99682e413;hp=641b356157f0acc2e4d1e45d185f9fbdce317724;hpb=44c30618e25ce2eb103b87e84e10dcd51dad0879;p=citadel.git diff --git a/webcit/webcit.c b/webcit/webcit.c index 641b35615..71b780a76 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -5,21 +5,15 @@ * \defgroup MainServer This is the main transaction loop of the web service. It maintains a * persistent session to the Citadel server, handling HTTP WebCit requests as * they arrive and presenting a user interface. - * \ingroup BackendWebServer + * \ingroup WebcitHttpServer */ /*@{*/ #include "webcit.h" #include "groupdav.h" #include "webserver.h" -#include "mime_parser.h" -/** - * Subdirectories from which the client may request static content - */ -char *static_content_dirs[] = { - "static", /** static templates */ - "tiny_mce" /** the JS editor */ -}; +#include +#include /** * String to unset the cookie. @@ -28,7 +22,7 @@ char *static_content_dirs[] = { */ static char *unset = "; expires=28-May-1971 18:10:00 GMT"; -/** +/** * \brief remove escaped strings from i.e. the url string (like %20 for blanks) * \param buf the buffer to examine */ @@ -36,11 +30,17 @@ void unescape_input(char *buf) { int a, b; char hex[3]; + long buflen; + + buflen = strlen(buf); - while ((isspace(buf[strlen(buf) - 1])) && (strlen(buf) > 0)) - buf[strlen(buf) - 1] = 0; + while ((buflen > 0) && (isspace(buf[buflen - 1]))){ + buf[buflen - 1] = 0; + buflen --; + } - for (a = 0; a < strlen(buf); ++a) { + a = 0; + while (a < buflen) { if (buf[a] == '+') buf[a] = ' '; if (buf[a] == '%') { @@ -50,25 +50,28 @@ void unescape_input(char *buf) b = 0; sscanf(hex, "%02x", &b); buf[a] = (char) b; - strcpy(&buf[a + 1], &buf[a + 3]); + memmove(&buf[a + 1], &buf[a + 3], buflen - a - 2); + + buflen -=2; } + a++; } } /** - * \brief add urls??? - * \param url what??? + * \brief Extract variables from the URL. + * \param url URL supplied by the HTTP parser */ void addurls(char *url) { char *up, *ptr; char buf[SIZ]; - int a, b; + int a, b, len; struct urlcontent *u; up = url; - while (strlen(up) > 0) { + while (!IsEmptyStr(up)) { /** locate the = sign */ safestrncpy(buf, up, sizeof buf); @@ -91,25 +94,26 @@ void addurls(char *url) /** locate "&" and "?" delimiters */ ptr = up; - b = strlen(up); - for (a = 0; a < strlen(up); ++a) { + len = b = strlen(up); + for (a = 0; a < len; ++a) { if ( (ptr[0] == '&') || (ptr[0] == '?') ) { b = a; break; } ++ptr; } - ptr = up; - for (a = 0; a < b; ++a) - ++ptr; - strcpy(ptr, ""); + ptr = up + b; + *ptr = '\0'; - u->url_data = malloc(strlen(up) + 2); - safestrncpy(u->url_data, up, strlen(up) + 1); + len = b; + u->url_data = malloc(len + 2); + safestrncpy(u->url_data, up, b + 1); u->url_data[b] = 0; unescape_input(u->url_data); up = ptr; ++up; + + /* lprintf(9, "%s = %s\n", u->url_key, u->url_data); */ } } @@ -141,8 +145,8 @@ void dump_vars(void) } /** - * \brief what??? - * \param key what??? + * \brief Return the value of a variable supplied to the current web page (from the url or a form) + * \param key The name of the variable we want */ char *bstr(char *key) { @@ -196,42 +200,73 @@ void wDumpContent(int print_standard_html_footer) /** * \brief Copy a string, escaping characters which have meaning in HTML. - * \param target target buffer to copy to - * \param strbuf source buffer ??? + * \param target target buffer + * \param strbuf source buffer * \param nbsp If nonzero, spaces are converted to non-breaking spaces. * \param nolinebreaks if set, linebreaks are removed from the string. */ -void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks) +long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks) { - int a; - strcpy(target, ""); - - for (a = 0; a < strlen(strbuf); ++a) { - if (strbuf[a] == '<') - strcat(target, "<"); - else if (strbuf[a] == '>') - strcat(target, ">"); - else if (strbuf[a] == '&') - strcat(target, "&"); - else if (strbuf[a] == '\"') - strcat(target, """); - else if (strbuf[a] == '\'') - strcat(target, "'"); - else if (strbuf[a] == LB) - strcat(target, "<"); - else if (strbuf[a] == RB) - strcat(target, ">"); - else if (strbuf[a] == QU) - strcat(target, "\""); - else if ((strbuf[a] == 32) && (nbsp == 1)) - strcat(target, " "); - else if ((strbuf[a] == '\n') && (nolinebreaks)) - strcat(target, ""); /* nothing */ - else if ((strbuf[a] == '\r') && (nolinebreaks)) - strcat(target, ""); /* nothing */ - else - strncat(target, &strbuf[a], 1); + char *aptr, *bptr, *eptr; + + *target = '\0'; + aptr = strbuf; + bptr = target; + eptr = target + tSize - 6; // our biggest unit to put in... + + while ((bptr < eptr) && !IsEmptyStr(aptr) ){ + if (*aptr == '<') { + memcpy(bptr, "<", 4); + bptr += 4; + } + else if (*aptr == '>') { + memcpy(bptr, ">", 4); + bptr += 4; + } + else if (*aptr == '&') { + memcpy(bptr, "&", 5); + bptr += 5; + } + else if (*aptr == '\"') { + memcpy(bptr, """, 6); + bptr += 6; + } + else if (*aptr == '\'') { + memcpy(bptr, "'", 5); + bptr += 5; + } + else if (*aptr == LB) { + *bptr = '<'; + bptr ++; + } + else if (*aptr == RB) { + *bptr = '>'; + bptr ++; + } + else if (*aptr == QU) { + *bptr ='"'; + bptr ++; + } + else if ((*aptr == 32) && (nbsp == 1)) { + memcpy(bptr, " ", 6); + bptr += 6; + } + else if ((*aptr == '\n') && (nolinebreaks)) { + *bptr='\0'; /* nothing */ + } + else if ((*aptr == '\r') && (nolinebreaks)) { + *bptr='\0'; /* nothing */ + } + else{ + *bptr = *aptr; + bptr++; + } + aptr ++; } + *bptr = '\0'; + if ((bptr = eptr - 1 ) && !IsEmptyStr(aptr) ) + return -1; + return (bptr - target); } /** @@ -243,10 +278,12 @@ void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks) void escputs1(char *strbuf, int nbsp, int nolinebreaks) { char *buf; + long Siz; if (strbuf == NULL) return; - buf = malloc( (3 * strlen(strbuf)) + SIZ ); - stresc(buf, strbuf, nbsp, nolinebreaks); + Siz = (3 * strlen(strbuf)) + SIZ ; + buf = malloc(Siz); + stresc(buf, Siz, strbuf, nbsp, nolinebreaks); wprintf("%s", buf); free(buf); } @@ -260,32 +297,6 @@ void escputs(char *strbuf) escputs1(strbuf, 0, 0); } -/** - * \brief Escape a string for feeding out as a URL. - * Returns a pointer to a buffer that must be freed by the caller! - * \param outbuf the outputbuffer - * \param strbuf the input buffer??? - */ -void urlesc(char *outbuf, char *strbuf) -{ - int a, b, c; - char *ec = " #&;`'|*?-~<>^()[]{}$\"\\"; - - strcpy(outbuf, ""); - - for (a = 0; a < strlen(strbuf); ++a) { - c = 0; - for (b = 0; b < strlen(ec); ++b) { - if (strbuf[a] == ec[b]) - c = 1; - } - b = strlen(outbuf); - if (c == 1) - sprintf(&outbuf[b], "%%%02x", strbuf[a]); - else - sprintf(&outbuf[b], "%c", strbuf[a]); - } -} /** * \brief urlescape buffer and print it to the client @@ -295,7 +306,7 @@ void urlescputs(char *strbuf) { char outbuf[SIZ]; - urlesc(outbuf, strbuf); + urlesc(outbuf, SIZ, strbuf); wprintf("%s", outbuf); } @@ -305,26 +316,59 @@ void urlescputs(char *strbuf) * \param target output string * \param strbuf input string */ -void jsesc(char *target, char *strbuf) +void jsesc(char *target, size_t tlen, char *strbuf) { - int a; - strcpy(target, ""); - - for (a = 0; a < strlen(strbuf); ++a) { - if (strbuf[a] == '<') - strcat(target, "["); - else if (strbuf[a] == '>') - strcat(target, "]"); - else if (strbuf[a] == '\"') - strcat(target, """); - else if (strbuf[a] == '&') - strcat(target, "&;"); - else if (strbuf[a] == '\'') - strcat(target, "\\'"); - else { - strncat(target, &strbuf[a], 1); + int len; + char *tend; + char *send; + char *tptr; + char *sptr; + + target[0]='\0'; + len = strlen (strbuf); + send = strbuf + len; + tend = target + tlen; + sptr = strbuf; + tptr = target; + + while (!IsEmptyStr(sptr) && + (sptr < send) && + (tptr < tend)) { + + if (*sptr == '<') + *tptr = '['; + else if (*sptr == '>') + *tptr = ']'; + else if (*sptr == '\'') { + if (tend - tptr < 3) + return; + *(tptr++) = '\\'; + *tptr = '\''; + } + else if (*sptr == '"') { + if (tend - tptr < 8) + return; + *(tptr++) = '&'; + *(tptr++) = 'q'; + *(tptr++) = 'u'; + *(tptr++) = 'o'; + *(tptr++) = 't'; + *tptr = ';'; + } + else if (*sptr == '&') { + if (tend - tptr < 7) + return; + *(tptr++) = '&'; + *(tptr++) = 'a'; + *(tptr++) = 'm'; + *(tptr++) = 'p'; + *tptr = ';'; + } else { + *tptr = *sptr; } + tptr++; sptr++; } + *tptr = '\0'; } /** @@ -335,7 +379,7 @@ void jsescputs(char *strbuf) { char outbuf[SIZ]; - jsesc(outbuf, strbuf); + jsesc(outbuf, SIZ, strbuf); wprintf("%s", outbuf); } @@ -344,34 +388,78 @@ void jsescputs(char *strbuf) * \param target target buffer * \param strbuf source buffer */ -void msgesc(char *target, char *strbuf) +void msgesc(char *target, size_t tlen, char *strbuf) { - int a; - strcpy(target, ""); - - for (a = 0; a < strlen(strbuf); ++a) { - if (strbuf[a] == '\n') - strcat(target, " "); - else if (strbuf[a] == '\r') - strcat(target, " "); - else if (strbuf[a] == '\'') - strcat(target, "'"); - else { - strncat(target, &strbuf[a], 1); + int len; + char *tend; + char *send; + char *tptr; + char *sptr; + + target[0]='\0'; + len = strlen (strbuf); + send = strbuf + len; + tend = target + tlen; + sptr = strbuf; + tptr = target; + + while (!IsEmptyStr(sptr) && + (sptr < send) && + (tptr < tend)) { + + if (*sptr == '\n') + *tptr = ' '; + else if (*sptr == '\r') + *tptr = ' '; + else if (*sptr == '\'') { + if (tend - tptr < 8) + return; + *(tptr++) = '&'; + *(tptr++) = '#'; + *(tptr++) = '3'; + *(tptr++) = '9'; + *tptr = ';'; + } else { + *tptr = *sptr; } + tptr++; sptr++; } + *tptr = '\0'; } /** - * \brief print message to the client ??? - * \param strbuf message to print??? + * \brief print a string to the client after cleaning it with msgesc() and stresc() + * \param strbuf string to be printed + */ +void msgescputs1( char *strbuf) +{ + char *outbuf; + char *outbuf2; + int buflen; + + if (strbuf == NULL) return; + buflen = 3 * strlen(strbuf) + SIZ; + outbuf = malloc( buflen); + outbuf2 = malloc( buflen); + msgesc(outbuf, buflen, strbuf); + stresc(outbuf2, buflen, outbuf, 0, 0); + wprintf("%s", outbuf2); + free(outbuf); + free(outbuf2); +} + +/** + * \brief print a string to the client after cleaning it with msgesc() + * \param strbuf string to be printed */ void msgescputs(char *strbuf) { char *outbuf; + size_t len; if (strbuf == NULL) return; - outbuf = malloc( (3 * strlen(strbuf)) + SIZ); - msgesc(outbuf, strbuf); + len = (3 * strlen(strbuf)) + SIZ; + outbuf = malloc(len); + msgesc(outbuf, len, strbuf); wprintf("%s", outbuf); free(outbuf); } @@ -394,17 +482,17 @@ void output_headers( int do_httpheaders, /**< 1 = output HTTP headers int suppress_check, /**< 1 = suppress check for instant messages */ int cache /**< 1 = allow browser to cache this page */ ) { - char cookie[SIZ]; - char httpnow[SIZ]; + char cookie[1024]; + char httpnow[128]; wprintf("HTTP/1.1 200 OK\n"); - httpdate(httpnow, time(NULL)); + http_datestring(httpnow, sizeof httpnow, time(NULL)); if (do_httpheaders) { wprintf("Content-type: text/html; charset=utf-8\r\n" "Server: %s / %s\n" "Connection: close\r\n", - SERVER, serv_info.serv_software + PACKAGE_STRING, serv_info.serv_software ); } @@ -418,10 +506,11 @@ void output_headers( int do_httpheaders, /**< 1 = output HTTP headers else { wprintf("Pragma: no-cache\r\n" "Cache-Control: no-store\r\n" + "Expires: -1\r\n" ); } - stuff_to_cookie(cookie, WC->wc_session, WC->wc_username, + stuff_to_cookie(cookie, 1024, WC->wc_session, WC->wc_username, WC->wc_password, WC->wc_roomname); if (unset_cookies) { @@ -435,6 +524,11 @@ void output_headers( int do_httpheaders, /**< 1 = output HTTP headers if (do_htmlhead) { begin_burst(); + if (!access("static.local/webcit.css", R_OK)) { + svprintf("CSSLOCAL", WCS_STRING, + "" + ); + } do_template("head"); } @@ -443,22 +537,23 @@ void output_headers( int do_httpheaders, /**< 1 = output HTTP headers /** check for ImportantMessages (these display in a div overlaying the main screen) */ - if (strlen(WC->ImportantMessage) > 0) { - wprintf("
\n"); - wprintf("" - "%s
\n", WC->ImportantMessage); - wprintf("
\n"); - wprintf("\n"); - safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage); + WC->ImportantMessage[0] = 0; } if ( (WC->logged_in) && (!unset_cookies) ) { wprintf("
"); do_selected_iconbar(); - /** check for instant messages (these display in a new window) - page_popup(); */ + /** check for instant messages (these display in a new window) */ + page_popup(); wprintf("
"); } @@ -503,15 +598,15 @@ void http_transmit_thing(char *thing, size_t length, char *content_type, "Server: %s\r\n" "Connection: close\r\n", content_type, - SERVER); + PACKAGE_STRING); #ifdef HAVE_ZLIB /** If we can send the data out compressed, please do so. */ if (WC->gzip_ok) { char *compressed_data = NULL; - uLongf compressed_len; + size_t compressed_len; - compressed_len = (uLongf) ((length * 101) / 100) + 100; + compressed_len = ((length * 101) / 100) + 100; compressed_data = malloc(compressed_len); if (compress_gzip((Bytef *) compressed_data, @@ -538,6 +633,39 @@ void http_transmit_thing(char *thing, size_t length, char *content_type, client_write(thing, (size_t)length); } +/** + * \brief print menu box like used in the floor view or admin interface. + * This function takes pair of strings as va_args, + * \param Title Title string of the box + * \param Class CSS Class for the box + * \param nLines How many string pairs should we print? (URL, UrlText) + * \param ... Pairs of URL Strings and their Names + */ +void print_menu_box(char* Title, char *Class, int nLines, ...) +{ + va_list arg_list; + long i; + + svprintf("BOXTITLE", WCS_STRING, Title); + do_template("beginbox"); + + wprintf(""); + + do_template("endbox"); +} /** @@ -549,52 +677,81 @@ void output_static(char *what) FILE *fp; struct stat statbuf; off_t bytes; + off_t count = 0; + size_t res; char *bigbuffer; char content_type[128]; + int len; fp = fopen(what, "rb"); if (fp == NULL) { lprintf(9, "output_static('%s') -- NOT FOUND --\n", what); - wprintf("HTTP/1.1 404 %s\n", strerror(errno)); + wprintf("HTTP/1.1 404 %s\r\n", strerror(errno)); wprintf("Content-Type: text/plain\r\n"); wprintf("\r\n"); - wprintf("Cannot open %s: %s\n", what, strerror(errno)); + wprintf("Cannot open %s: %s\r\n", what, strerror(errno)); } else { - if (!strncasecmp(&what[strlen(what) - 4], ".gif", 4)) + len = strlen (what); + if (!strncasecmp(&what[len - 4], ".gif", 4)) safestrncpy(content_type, "image/gif", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 4], ".txt", 4)) + else if (!strncasecmp(&what[len - 4], ".txt", 4)) safestrncpy(content_type, "text/plain", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 4], ".css", 4)) + else if (!strncasecmp(&what[len - 4], ".css", 4)) safestrncpy(content_type, "text/css", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 4], ".jpg", 4)) + else if (!strncasecmp(&what[len - 4], ".jpg", 4)) safestrncpy(content_type, "image/jpeg", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 4], ".png", 4)) + else if (!strncasecmp(&what[len - 4], ".png", 4)) safestrncpy(content_type, "image/png", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 4], ".ico", 4)) + else if (!strncasecmp(&what[len - 4], ".ico", 4)) safestrncpy(content_type, "image/x-icon", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 5], ".html", 5)) + else if (!strncasecmp(&what[len - 5], ".html", 5)) safestrncpy(content_type, "text/html", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 4], ".htm", 4)) + else if (!strncasecmp(&what[len - 4], ".htm", 4)) safestrncpy(content_type, "text/html", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 4], ".wml", 4)) + else if (!strncasecmp(&what[len - 4], ".wml", 4)) safestrncpy(content_type, "text/vnd.wap.wml", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 5], ".wmls", 5)) + else if (!strncasecmp(&what[len - 5], ".wmls", 5)) safestrncpy(content_type, "text/vnd.wap.wmlscript", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 5], ".wmlc", 5)) + else if (!strncasecmp(&what[len - 5], ".wmlc", 5)) safestrncpy(content_type, "application/vnd.wap.wmlc", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 6], ".wmlsc", 6)) + else if (!strncasecmp(&what[len - 6], ".wmlsc", 6)) safestrncpy(content_type, "application/vnd.wap.wmlscriptc", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 5], ".wbmp", 5)) + else if (!strncasecmp(&what[len - 5], ".wbmp", 5)) safestrncpy(content_type, "image/vnd.wap.wbmp", sizeof content_type); - else if (!strncasecmp(&what[strlen(what) - 3], ".js", 3)) + else if (!strncasecmp(&what[len - 3], ".js", 3)) safestrncpy(content_type, "text/javascript", sizeof content_type); else safestrncpy(content_type, "application/octet-stream", sizeof content_type); - fstat(fileno(fp), &statbuf); + if (fstat(fileno(fp), &statbuf) == -1) { + lprintf(9, "output_static('%s') -- FSTAT FAILED --\n", what); + wprintf("HTTP/1.1 404 %s\r\n", strerror(errno)); + wprintf("Content-Type: text/plain\r\n"); + wprintf("\r\n"); + wprintf("Cannot fstat %s: %s\n", what, strerror(errno)); + return; + } + + count = 0; bytes = statbuf.st_size; - bigbuffer = malloc(bytes + 2); - fread(bigbuffer, bytes, 1, fp); + if ((bigbuffer = malloc(bytes + 2)) == NULL) { + lprintf(9, "output_static('%s') -- MALLOC FAILED (%s) --\n", what, strerror(errno)); + wprintf("HTTP/1.1 500 internal server error\r\n"); + wprintf("Content-Type: text/plain\r\n"); + wprintf("\r\n"); + return; + } + while (count < bytes) { + if ((res = fread(bigbuffer + count, 1, bytes - count, fp)) == 0) { + lprintf(9, "output_static('%s') -- FREAD FAILED (%s) %zu bytes of %zu --\n", what, strerror(errno), bytes - count, bytes); + wprintf("HTTP/1.1 500 internal server error \r\n"); + wprintf("Content-Type: text/plain\r\n"); + wprintf("\r\n"); + return; + } + count += res; + } + fclose(fp); lprintf(9, "output_static('%s') %s\n", what, content_type); @@ -637,7 +794,9 @@ void output_image() * Instead of an ugly 404, send a 1x1 transparent GIF * when there's no such image on the server. */ - output_static("static/blank.gif"); + char blank_gif[SIZ]; + snprintf (blank_gif, SIZ, "%s%s", static_dirs[0], "/blank.gif"); + output_static(blank_gif); } @@ -646,15 +805,18 @@ void output_image() /** * \brief Generic function to output an arbitrary MIME part from an arbitrary - * message number on the server. - * \param msgnum number of the item on the citadel server - * \param partnum the partnumber??? + * message number on the server. + * + * \param msgnum Number of the item on the citadel server + * \param partnum The MIME part to be output + * \param force_download Nonzero to force set the Content-Type: header + * to "application/octet-stream" */ -void mimepart(char *msgnum, char *partnum) +void mimepart(char *msgnum, char *partnum, int force_download) { - char buf[SIZ]; + char buf[256]; off_t bytes; - char content_type[SIZ]; + char content_type[256]; char *content = NULL; serv_printf("OPNA %s|%s", msgnum, partnum); @@ -662,7 +824,12 @@ void mimepart(char *msgnum, char *partnum) if (buf[0] == '2') { bytes = extract_long(&buf[4], 0); content = malloc(bytes + 2); - extract_token(content_type, &buf[4], 3, '|', sizeof content_type); + if (force_download) { + strcpy(content_type, "application/octet-stream"); + } + else { + extract_token(content_type, &buf[4], 3, '|', sizeof content_type); + } output_headers(0, 0, 0, 0, 0, 0); read_server_binary(content, bytes); serv_puts("CLOS"); @@ -683,7 +850,7 @@ void mimepart(char *msgnum, char *partnum) /** * \brief Read any MIME part of a message, from the server, into memory. * \param msgnum number of the message on the citadel server - * \param partnum the part number??? + * \param partnum the MIME part to be loaded */ char *load_mimepart(long msgnum, char *partnum) { @@ -692,17 +859,15 @@ char *load_mimepart(long msgnum, char *partnum) char content_type[SIZ]; char *content; - serv_printf("OPNA %ld|%s", msgnum, partnum); + serv_printf("DLAT %ld|%s", msgnum, partnum); serv_getln(buf, sizeof buf); - if (buf[0] == '2') { + if (buf[0] == '6') { bytes = extract_long(&buf[4], 0); extract_token(content_type, &buf[4], 3, '|', sizeof content_type); content = malloc(bytes + 2); - read_server_binary(content, bytes); + serv_read(content, bytes); - serv_puts("CLOS"); - serv_getln(buf, sizeof buf); content[bytes] = 0; /* null terminate for good measure */ return(content); } @@ -724,9 +889,9 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext) wprintf("HTTP/1.1 200 OK\n"); output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
", titlebarcolor); - wprintf("%s\n", titlebarmsg); - wprintf("
\n"); + wprintf("
", titlebarcolor); + wprintf("%s\n", titlebarmsg); + wprintf("
\n"); wprintf("
\n
\n"); escputs(messagetext); @@ -759,16 +924,16 @@ void url_do_template(void) { void offer_start_page(void) { wprintf("this_page); - wprintf("\">"); + wprintf("\">"); wprintf(_("Make this my start page")); - wprintf(""); -/* + wprintf(""); +#ifdef TECH_PREVIEW wprintf("
wc_roomname); wprintf("\" title=\"RSS 2.0 feed for "); escputs(WC->wc_roomname); wprintf("\">\"RSS\"\n"); -*/ +#endif } @@ -795,7 +960,7 @@ void change_start_page(void) { /** - * \brief display the successfull edit or s.th. lisket hat ??? + * \brief convenience function to indicate success * \param successmessage the mesage itself */ void display_success(char *successmessage) @@ -823,17 +988,20 @@ void authorization_required(const char *message) } /** - * \brief handle file uploads - * \param name the url the upload is done to - * \param filename the name of the file being uploaded - * \param partnum item number on the citadel server ??? - * \param disp what??? - * \param content the file contents??? - * \param cbtype what??? - * \param cbcharset the character set of cb?? - * \param length the size of the file ??? - * \param encoding charset encoding of the file?? - * \param userdata what??? + * \brief This function is called by the MIME parser to handle data uploaded by + * the browser. Form data, uploaded files, and the data from HTTP PUT + * operations (such as those found in GroupDAV) all arrive this way. + * + * \param name Name of the item being uploaded + * \param filename Filename of the item being uploaded + * \param partnum MIME part identifier (not needed) + * \param disp MIME content disposition (not needed) + * \param content The actual data + * \param cbtype MIME content-type + * \param cbcharset Character set + * \param length Content length + * \param encoding MIME encoding type (not needed) + * \param userdata Not used here */ void upload_handler(char *name, char *filename, char *partnum, char *disp, void *content, char *cbtype, char *cbcharset, @@ -841,11 +1009,10 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp, { struct urlcontent *u; - /* lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", - name, cbtype, length); */ + lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length); /* Form fields */ - if ( (length > 0) && (strlen(cbtype) == 0) ) { + if ( (length > 0) && (IsEmptyStr(cbtype)) ) { u = (struct urlcontent *) malloc(sizeof(struct urlcontent)); u->next = WC->urlstrings; WC->urlstrings = u; @@ -853,10 +1020,11 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp, u->url_data = malloc(length + 1); memcpy(u->url_data, content, length); u->url_data[length] = 0; + /* lprintf(9, "Key: <%s> Data: <%s>\n", u->url_key, u->url_data); */ } /** Uploaded files */ - if ( (length > 0) && (strlen(cbtype) > 0) ) { + if ( (length > 0) && (!IsEmptyStr(cbtype)) ) { WC->upload = malloc(length); if (WC->upload != NULL) { WC->upload_length = length; @@ -883,8 +1051,10 @@ void begin_ajax_response(void) { "Server: %s\r\n" "Connection: close\r\n" "Pragma: no-cache\r\n" - "Cache-Control: no-cache\r\n", - SERVER); + "Cache-Control: no-cache\r\n" + "Expires: -1\r\n" + , + PACKAGE_STRING); begin_burst(); } @@ -897,7 +1067,7 @@ void end_ajax_response(void) { } /** - * \brief parse server command to execute on the citadel + * \brief Wraps a Citadel server command in an AJAX transaction. */ void ajax_servcmd(void) { @@ -922,7 +1092,7 @@ void ajax_servcmd(void) wprintf("000"); } if (buf[0] == '4') { - text_to_server(bstr("g_input"), 0); + text_to_server(bstr("g_input")); serv_puts("000"); } if (buf[0] == '6') { @@ -988,17 +1158,13 @@ void session_loop(struct httprequest *req) { char cmd[1024]; char action[1024]; - char arg1[128]; - char arg2[128]; - char arg3[128]; - char arg4[128]; - char arg5[128]; - char arg6[128]; - char arg7[128]; + char arg[8][128]; + size_t sizes[10]; + char *index[10]; char buf[SIZ]; char request_method[128]; char pathname[1024]; - int a, b; + int a, b, nBackDots, nEmpty; int ContentLength = 0; int BytesRead = 0; char ContentType[512]; @@ -1009,7 +1175,8 @@ void session_loop(struct httprequest *req) char user_agent[256]; int body_start = 0; int is_static = 0; - + int n_static = 0; + int len = 0; /** * We stuff these with the values coming from the client cookies, * so we can use them to reconnect a timed out session if we have to. @@ -1044,48 +1211,31 @@ void session_loop(struct httprequest *req) extract_token(pathname, cmd, 1, ' ', sizeof pathname); /** Figure out the action */ - extract_token(action, pathname, 1, '/', sizeof action); - if (strstr(action, "?")) *strstr(action, "?") = 0; - if (strstr(action, "&")) *strstr(action, "&") = 0; - if (strstr(action, " ")) *strstr(action, " ") = 0; - - extract_token(arg1, pathname, 2, '/', sizeof arg1); - if (strstr(arg1, "?")) *strstr(arg1, "?") = 0; - if (strstr(arg1, "&")) *strstr(arg1, "&") = 0; - if (strstr(arg1, " ")) *strstr(arg1, " ") = 0; - - extract_token(arg2, pathname, 3, '/', sizeof arg2); - if (strstr(arg2, "?")) *strstr(arg2, "?") = 0; - if (strstr(arg2, "&")) *strstr(arg2, "&") = 0; - if (strstr(arg2, " ")) *strstr(arg2, " ") = 0; - - extract_token(arg3, pathname, 4, '/', sizeof arg3); - if (strstr(arg3, "?")) *strstr(arg3, "?") = 0; - if (strstr(arg3, "&")) *strstr(arg3, "&") = 0; - if (strstr(arg3, " ")) *strstr(arg3, " ") = 0; - - extract_token(arg4, pathname, 5, '/', sizeof arg4); - if (strstr(arg4, "?")) *strstr(arg4, "?") = 0; - if (strstr(arg4, "&")) *strstr(arg4, "&") = 0; - if (strstr(arg4, " ")) *strstr(arg4, " ") = 0; - - extract_token(arg5, pathname, 6, '/', sizeof arg5); - if (strstr(arg5, "?")) *strstr(arg5, "?") = 0; - if (strstr(arg5, "&")) *strstr(arg5, "&") = 0; - if (strstr(arg5, " ")) *strstr(arg5, " ") = 0; - - extract_token(arg6, pathname, 7, '/', sizeof arg6); - if (strstr(arg6, "?")) *strstr(arg6, "?") = 0; - if (strstr(arg6, "&")) *strstr(arg6, "&") = 0; - if (strstr(arg6, " ")) *strstr(arg6, " ") = 0; - - extract_token(arg7, pathname, 8, '/', sizeof arg7); - if (strstr(arg7, "?")) *strstr(arg7, "?") = 0; - if (strstr(arg7, "&")) *strstr(arg7, "&") = 0; - if (strstr(arg7, " ")) *strstr(arg7, " ") = 0; + index[0] = action; + sizes[0] = sizeof action; + for (a=1; a<9; a++) + { + index[a] = arg[a-1]; + sizes[a] = sizeof arg[a-1]; + } +//// index[9] = &foo; todo + nBackDots = 0; + nEmpty = 0; + for ( a = 0; a < 9; ++a) + { + extract_token(index[a], pathname, a + 1, '/', sizes[a]); + if (strstr(index[a], "?")) *strstr(index[a], "?") = 0; + if (strstr(index[a], "&")) *strstr(index[a], "&") = 0; + if (strstr(index[a], " ")) *strstr(index[a], " ") = 0; + if ((index[a][0] == '.') && (index[a][1] == '.')) + nBackDots++; + if (index[a][0] == '\0') + nEmpty++; + } while (hptr != NULL) { safestrncpy(buf, hptr->line, sizeof buf); + /* lprintf(9, "HTTP HEADER: %s\n", buf); */ hptr = hptr->next; if (!strncasecmp(buf, "Cookie: webcit=", 15)) { @@ -1109,8 +1259,15 @@ void session_loop(struct httprequest *req) else if (!strncasecmp(buf, "User-agent: ", 12)) { safestrncpy(user_agent, &buf[12], sizeof user_agent); } + else if (!strncasecmp(buf, "X-Forwarded-Host: ", 18)) { + if (follow_xff) { + safestrncpy(WC->http_host, &buf[18], sizeof WC->http_host); + } + } else if (!strncasecmp(buf, "Host: ", 6)) { - safestrncpy(WC->http_host, &buf[6], sizeof WC->http_host); + if (IsEmptyStr(WC->http_host)) { + safestrncpy(WC->http_host, &buf[6], sizeof WC->http_host); + } } else if (!strncasecmp(buf, "X-Forwarded-For: ", 17)) { safestrncpy(browser_host, &buf[17], sizeof browser_host); @@ -1128,22 +1285,19 @@ void session_loop(struct httprequest *req) if (ContentLength > 0) { content = malloc(ContentLength + SIZ); memset(content, 0, ContentLength + SIZ); - sprintf(content, "Content-type: %s\n" + snprintf(content, ContentLength + SIZ, "Content-type: %s\n" "Content-length: %d\n\n", ContentType, ContentLength); body_start = strlen(content); /** Read the entire input data at once. */ - client_read(WC->http_sock, &content[BytesRead+body_start], - ContentLength); + client_read(WC->http_sock, &content[BytesRead+body_start], ContentLength); - if (!strncasecmp(ContentType, - "application/x-www-form-urlencoded", 33)) { + if (!strncasecmp(ContentType, "application/x-www-form-urlencoded", 33)) { addurls(&content[body_start]); } else if (!strncasecmp(ContentType, "multipart", 9)) { content_end = content + ContentLength + body_start; - mime_parser(content, content_end, *upload_handler, - NULL, NULL, NULL, 0); + mime_parser(content, content_end, *upload_handler, NULL, NULL, NULL, 0); } } else { content = NULL; @@ -1155,41 +1309,81 @@ void session_loop(struct httprequest *req) remove_token(WC->this_page, 0, ' '); /** If there are variables in the URL, we must grab them now */ - for (a = 0; a < strlen(cmd); ++a) { + len = strlen(cmd); + for (a = 0; a < len; ++a) { if ((cmd[a] == '?') || (cmd[a] == '&')) { - for (b = a; b < strlen(cmd); ++b) - if (isspace(cmd[b])) + for (b = a; b < len; ++b) { + if (isspace(cmd[b])){ cmd[b] = 0; + len = b - 1; + } + } addurls(&cmd[a + 1]); cmd[a] = 0; + len = a - 1; } } + /** If it's a "force 404" situation then display the error and bail. */ + if (!strcmp(action, "404")) { + wprintf("HTTP/1.1 404 Not found\r\n"); + wprintf("Content-Type: text/plain\r\n"); + wprintf("\r\n"); + wprintf("Not found\r\n"); + goto SKIP_ALL_THIS_CRAP; + } /** Static content can be sent without connecting to Citadel. */ is_static = 0; - for (a=0; a<(sizeof(static_content_dirs) / sizeof(char *)); ++a) { - if (!strcasecmp(action, static_content_dirs[a])) { + for (a=0; a 0) { + lprintf(9, "Comparing supplied nonce %s to session nonce %ld\n", + bstr("nonce"), WC->nonce); + if (atoi(bstr("nonce")) != WC->nonce) { + lprintf(9, "Ignoring request with mismatched nonce.\n"); + wprintf("HTTP/1.1 404 Security check failed\r\n"); + wprintf("Content-Type: text/plain\r\n"); + wprintf("\r\n"); + wprintf("Security check failed.\r\n"); + goto SKIP_ALL_THIS_CRAP; + } + } + /** * If we're not connected to a Citadel server, try to hook up the * connection now. @@ -1197,7 +1391,7 @@ void session_loop(struct httprequest *req) if (!WC->connected) { if (!strcasecmp(ctdlhost, "uds")) { /* unix domain socket */ - sprintf(buf, "%s/citadel.socket", ctdlport); + snprintf(buf, SIZ, "%s/citadel.socket", ctdlport); WC->serv_sock = uds_connectsock(buf); } else { @@ -1281,10 +1475,12 @@ void session_loop(struct httprequest *req) } /** This needs to run early */ +#ifdef TECH_PREVIEW if (!strcasecmp(action, "rss")) { display_rss(bstr("room"), request_method); goto SKIP_ALL_THIS_CRAP; } +#endif /** * The GroupDAV stuff relies on HTTP authentication instead of @@ -1318,8 +1514,8 @@ void session_loop(struct httprequest *req) * supplied by the browser, try using them to log in. */ if ((!WC->logged_in) - && (strlen(c_username) > 0) - && (strlen(c_password) > 0)) { + && (!IsEmptyStr(c_username)) + && (!IsEmptyStr(c_password))) { serv_printf("USER %s", c_username); serv_getln(buf, sizeof buf); if (buf[0] == '3') { @@ -1334,7 +1530,7 @@ void session_loop(struct httprequest *req) * If we don't have a current room, but a cookie specifying the * current room is supplied, make an effort to go there. */ - if ((strlen(WC->wc_roomname) == 0) && (strlen(c_roomname) > 0)) { + if ((IsEmptyStr(WC->wc_roomname)) && (!IsEmptyStr(c_roomname))) { serv_printf("GOTO %s", c_roomname); serv_getln(buf, sizeof buf); if (buf[0] == '2') { @@ -1367,6 +1563,8 @@ void session_loop(struct httprequest *req) url_do_template(); } else if (!strcasecmp(action, "display_aide_menu")) { display_aide_menu(); + } else if (!strcasecmp(action, "server_shutdown")) { + display_shutdown(); } else if (!strcasecmp(action, "display_main_menu")) { display_main_menu(); } else if (!strcasecmp(action, "who")) { @@ -1377,6 +1575,26 @@ void session_loop(struct httprequest *req) begin_ajax_response(); who_inner_div(); end_ajax_response(); + } else if (!strcasecmp(action, "wholist_section")) { + begin_ajax_response(); + wholist_section(); + end_ajax_response(); + } else if (!strcasecmp(action, "new_messages_html")) { + begin_ajax_response(); + new_messages_section(); + end_ajax_response(); + } else if (!strcasecmp(action, "tasks_inner_html")) { + begin_ajax_response(); + tasks_section(); + end_ajax_response(); + } else if (!strcasecmp(action, "calendar_inner_html")) { + begin_ajax_response(); + calendar_section(); + end_ajax_response(); + } else if (!strcasecmp(action, "mini_calendar")) { + begin_ajax_response(); + ajax_mini_calendar(); + end_ajax_response(); } else if (!strcasecmp(action, "iconbar_ajax_menu")) { begin_ajax_response(); do_iconbar(); @@ -1411,12 +1629,14 @@ void session_loop(struct httprequest *req) readloop("readfwd"); } else if (!strcasecmp(action, "headers")) { readloop("headers"); + } else if (!strcasecmp(action, "do_search")) { + readloop("do_search"); } else if (!strcasecmp(action, "msg")) { - embed_message(arg1); + embed_message(index[1]); } else if (!strcasecmp(action, "printmsg")) { - print_message(arg1); + print_message(index[1]); } else if (!strcasecmp(action, "msgheaders")) { - display_headers(arg1); + display_headers(index[1]); } else if (!strcasecmp(action, "wiki")) { display_wiki_page(); } else if (!strcasecmp(action, "display_enter")) { @@ -1462,11 +1682,11 @@ void session_loop(struct httprequest *req) } else if (!strcasecmp(action, "editroom")) { editroom(); } else if (!strcasecmp(action, "display_editinfo")) { - display_edit(_("Room info"), "EINF 0", "RINF", "/editinfo", 1); + display_edit(_("Room info"), "EINF 0", "RINF", "editinfo", 1); } else if (!strcasecmp(action, "editinfo")) { save_edit(_("Room info"), "EINF 1", 1); } else if (!strcasecmp(action, "display_editbio")) { - sprintf(buf, "RBIO %s", WC->wc_fullname); + snprintf(buf, SIZ, "RBIO %s", WC->wc_fullname); display_edit(_("Your bio"), "NOOP", buf, "editbio", 3); } else if (!strcasecmp(action, "editbio")) { save_edit(_("Your bio"), "EBIO", 0); @@ -1476,18 +1696,35 @@ void session_loop(struct httprequest *req) delete_room(); } else if (!strcasecmp(action, "validate")) { validate(); + /* The users photo display / upload facility */ } else if (!strcasecmp(action, "display_editpic")) { display_graphics_upload(_("your photo"), "UIMG 0|_userpic_", "editpic"); } else if (!strcasecmp(action, "editpic")) { do_graphics_upload("UIMG 1|_userpic_"); + /* room picture dispay / upload facility */ } else if (!strcasecmp(action, "display_editroompic")) { display_graphics_upload(_("the icon for this room"), "UIMG 0|_roompic_", "editroompic"); } else if (!strcasecmp(action, "editroompic")) { do_graphics_upload("UIMG 1|_roompic_"); + /* the greetingpage hello pic */ + } else if (!strcasecmp(action, "display_edithello")) { + display_graphics_upload(_("the Greetingpicture for the login prompt"), + "UIMG 0|hello.gif", + "edithellopic"); + } else if (!strcasecmp(action, "edithellopic")) { + do_graphics_upload("UIMG 1|hello.gif"); + /* the logoff banner */ + } else if (!strcasecmp(action, "display_editgoodbyepic")) { + display_graphics_upload(_("the Logoff banner picture"), + "UIMG 0|goodbuye.gif", + "editgoodbuyepic"); + } else if (!strcasecmp(action, "editgoodbuyepic")) { + do_graphics_upload("UIMG 1|goodbuye.gif"); + } else if (!strcasecmp(action, "delete_floor")) { delete_floor(); } else if (!strcasecmp(action, "rename_floor")) { @@ -1495,13 +1732,13 @@ void session_loop(struct httprequest *req) } else if (!strcasecmp(action, "create_floor")) { create_floor(); } else if (!strcasecmp(action, "display_editfloorpic")) { - sprintf(buf, "UIMG 0|_floorpic_|%s", + snprintf(buf, SIZ, "UIMG 0|_floorpic_|%s", bstr("which_floor")); display_graphics_upload(_("the icon for this floor"), buf, "editfloorpic"); } else if (!strcasecmp(action, "editfloorpic")) { - sprintf(buf, "UIMG 1|_floorpic_|%s", + snprintf(buf, SIZ, "UIMG 1|_floorpic_|%s", bstr("which_floor")); do_graphics_upload(buf); } else if (!strcasecmp(action, "display_reg")) { @@ -1522,8 +1759,6 @@ void session_loop(struct httprequest *req) delete_node(); } else if (!strcasecmp(action, "display_add_node")) { display_add_node(); - } else if (!strcasecmp(action, "add_node")) { - add_node(); } else if (!strcasecmp(action, "terminate_session")) { slrp_highest(); terminate_session(); @@ -1546,7 +1781,9 @@ void session_loop(struct httprequest *req) } else if (!strcasecmp(action, "display_menubar")) { display_menubar(1); } else if (!strcasecmp(action, "mimepart")) { - mimepart(arg1, arg2); + mimepart(index[1], index[2], 0); + } else if (!strcasecmp(action, "mimepart_download")) { + mimepart(index[1], index[2], 1); } else if (!strcasecmp(action, "edit_vcard")) { edit_vcard(); } else if (!strcasecmp(action, "submit_vcard")) { @@ -1597,6 +1834,24 @@ void session_loop(struct httprequest *req) display_inetconf(); } else if (!strcasecmp(action, "save_inetconf")) { save_inetconf(); + } else if (!strcasecmp(action, "display_smtpqueue")) { + display_smtpqueue(); + } else if (!strcasecmp(action, "display_smtpqueue_inner_div")) { + display_smtpqueue_inner_div(); + } else if (!strcasecmp(action, "display_sieve")) { + display_sieve(); + } else if (!strcasecmp(action, "save_sieve")) { + save_sieve(); + } else if (!strcasecmp(action, "display_pushemail")) { + display_pushemail(); + } else if (!strcasecmp(action, "save_pushemail")) { + save_pushemail(); + } else if (!strcasecmp(action, "display_add_remove_scripts")) { + display_add_remove_scripts(NULL); + } else if (!strcasecmp(action, "create_script")) { + create_script(); + } else if (!strcasecmp(action, "delete_script")) { + delete_script(); } else if (!strcasecmp(action, "setup_wizard")) { do_setup_wizard(); } else if (!strcasecmp(action, "display_preferences")) { @@ -1609,8 +1864,12 @@ void session_loop(struct httprequest *req) recp_autocomplete(bstr("cc")); } else if (!strcasecmp(action, "bcc_autocomplete")) { recp_autocomplete(bstr("bcc")); + } else if (!strcasecmp(action, "display_address_book_middle_div")) { + display_address_book_middle_div(); + } else if (!strcasecmp(action, "display_address_book_inner_div")) { + display_address_book_inner_div(); } else if (!strcasecmp(action, "set_floordiv_expanded")) { - set_floordiv_expanded(arg1); + set_floordiv_expanded(index[1]); } else if (!strcasecmp(action, "diagnostics")) { output_headers(1, 1, 1, 0, 0, 0); wprintf("Session: %d
\n", WC->wc_session); @@ -1621,6 +1880,14 @@ void session_loop(struct httprequest *req) dump_vars(); wprintf("
\n"); wDumpContent(1); + } else if (!strcasecmp(action, "updatenote")) { + updatenote(); + } else if (!strcasecmp(action, "display_room_directory")) { + display_room_directory(); + } else if (!strcasecmp(action, "download_file")) { + download_file(index[1]); + } else if (!strcasecmp(action, "upload_file")) { + upload_file(); } /** When all else fais, display the main menu. */ @@ -1641,5 +1908,18 @@ SKIP_ALL_THIS_CRAP: } } +/** + * \brief Replacement for sleep() that uses select() in order to avoid SIGALRM + * \param seconds how many seconds should we sleep? + */ +void sleeeeeeeeeep(int seconds) +{ + struct timeval tv; + + tv.tv_sec = seconds; + tv.tv_usec = 0; + select(0, NULL, NULL, NULL, &tv); +} + /*@}*/