#include "webcit.h"
#include "groupdav.h"
#include "webserver.h"
-#include "mime_parser.h"
+
+#include <stdio.h>
+#include <stdarg.h>
/**
* String to unset the cookie.
*/
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
*/
{
int a, b;
char hex[3];
+ long buflen;
- while ((isspace(buf[strlen(buf) - 1])) && (strlen(buf) > 0))
- buf[strlen(buf) - 1] = 0;
+ buflen = strlen(buf);
- for (a = 0; a < strlen(buf); ++a) {
+ while ((buflen > 0) && (isspace(buf[buflen - 1]))){
+ buf[buflen - 1] = 0;
+ buflen --;
+ }
+
+ for (a = 0; a < buflen; ++a) {
if (buf[a] == '+')
buf[a] = ' ';
if (buf[a] == '%') {
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;
}
}
{
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);
/** 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;
* \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, "");
+ char *aptr, *bptr, *eptr;
- 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);
+ *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);
}
/**
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);
}
/**
* \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 output buffer
* \param strbuf the input buffer
*/
void urlesc(char *outbuf, char *strbuf)
{
- int a, b, c;
- char *ec = " #&;`'|*?-~<>^()[]{}$\"\\";
+ int a, b, c, len, eclen, olen;
+ char *ec = " +#&;`'|*?-~<>^()[]{}/$\"\\";
strcpy(outbuf, "");
-
- for (a = 0; a < strlen(strbuf); ++a) {
+ len = strlen(strbuf);
+ eclen = strlen(ec);
+ olen = 0;
+ for (a = 0; a < len; ++a) {
c = 0;
- for (b = 0; b < strlen(ec); ++b) {
+ for (b = 0; b < eclen; ++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]);
+ if (c == 1) {
+ sprintf(&outbuf[olen], "%%%02x", strbuf[a]);
+ olen += 3;
+ }
+ else
+ outbuf[olen ++] = strbuf[a];
}
+ outbuf[olen] = '\0';
}
/**
*/
void jsesc(char *target, char *strbuf)
{
- int a;
- strcpy(target, "");
+ int a, len;
- for (a = 0; a < strlen(strbuf); ++a) {
+ target[0]='\0';
+ len = strlen (strbuf);
+ for (a = 0; a < len; ++a) {
if (strbuf[a] == '<')
strcat(target, "[");
else if (strbuf[a] == '>')
*/
void msgesc(char *target, char *strbuf)
{
- int a;
- strcpy(target, "");
+ int a, len;
- for (a = 0; a < strlen(strbuf); ++a) {
+ *target='\0';
+ len = strlen(strbuf);
+ for (a = 0; a < len; ++a) {
if (strbuf[a] == '\n')
strcat(target, " ");
else if (strbuf[a] == '\r')
}
}
+/**
+ * \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, 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
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
);
}
else {
wprintf("Pragma: no-cache\r\n"
"Cache-Control: no-store\r\n"
+ "Expires: -1\r\n"
);
}
/** check for ImportantMessages (these display in a div overlaying the main screen) */
- if (strlen(WC->ImportantMessage) > 0) {
+ if (!IsEmptyStr(WC->ImportantMessage)) {
wprintf("<div id=\"important_message\">\n");
wprintf("<span class=\"imsg\">"
"%s</span><br />\n", WC->ImportantMessage);
"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. */
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("<ul class=\"%s\">", Class);
+
+ va_start(arg_list, nLines);
+ for (i = 0; i < nLines; ++i)
+ {
+ wprintf("<li><a href=\"%s\">", va_arg(arg_list, char *));
+ wprintf((char *) va_arg(arg_list, char *));
+ wprintf("</a></li>\n");
+ }
+ va_end (arg_list);
+
+ wprintf("</a></li>\n");
+
+ wprintf("</ul>");
+
+ do_template("endbox");
+}
/**
off_t bytes;
char *bigbuffer;
char content_type[128];
+ int len;
fp = fopen(what, "rb");
if (fp == NULL) {
wprintf("\r\n");
wprintf("Cannot open %s: %s\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);
void offer_start_page(void) {
wprintf("<a href=\"change_start_page?startpage=");
urlescputs(WC->this_page);
- wprintf("\"><font size=-2 color=\"#AAAAAA\">");
+ wprintf("\">");
wprintf(_("Make this my start page"));
- wprintf("</font></a>");
+ wprintf("</a>");
/*
wprintf("<br/><a href=\"rss?room=");
urlescputs(WC->wc_roomname);
{
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;
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;
"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();
}
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.
}
}
else if (!strncasecmp(buf, "Host: ", 6)) {
- if (strlen(WC->http_host) == 0) {
+ if (IsEmptyStr(WC->http_host)) {
safestrncpy(WC->http_host, &buf[6], sizeof WC->http_host);
}
}
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;
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;
}
}
else
{
lprintf(9, "Suspicious request. Ignoring.");
- wprintf("HTTP/1.1 404 Not found. Don't try to Trick me DUDE!\r\n");
+ wprintf("HTTP/1.1 404 Security check failed\r\n");
wprintf("Content-Type: text/plain\r\n");
wprintf("\r\n");
- wprintf("Not found. Don't play games on me!\r\n");
+ wprintf("Security check failed.\r\n");
}
goto SKIP_ALL_THIS_CRAP; /* Don't try to connect */
}
+ /* If the client sent a nonce that is incorrect, kill the request. */
+ if (strlen(bstr("nonce")) > 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.
* 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') {
* 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') {
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")) {
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();
} 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")) {
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();
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")) {
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(index[1]);
} else if (!strcasecmp(action, "diagnostics")) {
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. */
}
}
+/**
+ * \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);
+}
+
/*@}*/
projects / citadel.git / blobdiff