X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.c;h=eeed42acca84a9f7ad9a4cd3475abb7df4283d7b;hb=a66cce670c39f513565011e93e7865c44806b501;hp=37289dea89ba649811642f70d8c9f0e82f4afa2b;hpb=78d99d2101a80d3be43211352b03fddfdd82bcd9;p=citadel.git

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 37289dea8..eeed42acc 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -13,14 +13,6 @@
 #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 */
-};
-
 /**
  * String to unset the cookie.
  * Any date "in the past" will work, so I chose my birthday, right down to
@@ -110,6 +102,8 @@ void addurls(char *url)
 		unescape_input(u->url_data);
 		up = ptr;
 		++up;
+
+		/* lprintf(9, "%s = %s\n", u->url_key, u->url_data); */
 	}
 }
 
@@ -262,7 +256,6 @@ void escputs(char *strbuf)
 
 /** 
  * \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
  */
@@ -435,6 +428,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,
+			   "<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"
+			);
+		}
 		do_template("head");
 	}
 
@@ -445,8 +443,8 @@ 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("<div id=\"important_message\">\n");
-			wprintf("<SPAN CLASS=\"imsg\">"
-				"%s</SPAN><br />\n", WC->ImportantMessage);
+			wprintf("<span class=\"imsg\">"
+				"%s</span><br />\n", WC->ImportantMessage);
 			wprintf("</div>\n");
 			wprintf("<script type=\"text/javascript\">\n"
 				"	 setTimeout('hide_imsg_popup()', 3000);	\n"
@@ -646,15 +644,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 MIME part to be output
+ *        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 +663,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");
@@ -692,17 +698,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 +728,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("<div id=\"banner\">\n");
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#%s\"><TR><TD>", titlebarcolor);
-	wprintf("<SPAN CLASS=\"titlebar\">%s</SPAN>\n", titlebarmsg);
-	wprintf("</TD></TR></TABLE>\n");
+	wprintf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
+	wprintf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
+	wprintf("</td></tr></table>\n");
 	wprintf("</div>\n<div id=\"content\">\n");
 	escputs(messagetext);
 
@@ -759,9 +763,9 @@ void url_do_template(void) {
 void offer_start_page(void) {
 	wprintf("<a href=\"change_start_page?startpage=");
 	urlescputs(WC->this_page);
-	wprintf("\"><FONT SIZE=-2 COLOR=\"#AAAAAA\">");
+	wprintf("\"><font size=-2 color=\"#AAAAAA\">");
 	wprintf(_("Make this my start page"));
-	wprintf("</FONT></A>");
+	wprintf("</font></a>");
 /*
 	wprintf("<br/><a href=\"rss?room=");
 	urlescputs(WC->wc_roomname);
@@ -991,17 +995,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];
@@ -1012,7 +1012,7 @@ void session_loop(struct httprequest *req)
 	char user_agent[256];
 	int body_start = 0;
 	int is_static = 0;
-
+	int n_static = 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.
@@ -1047,49 +1047,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);
+		/* lprintf(9, "HTTP HEADER: %s\n", buf); */
 		hptr = hptr->next;
 
 		if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
@@ -1176,28 +1158,49 @@ void session_loop(struct httprequest *req)
 		}
 	}
 
+	/** 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<ndirs; ++a) {
+		if (!strcasecmp(action, (char*)static_content_dirs[a])) { /* map web to disk location */
 			is_static = 1;
+			n_static = a;
 		}
 	}
 	if (is_static) {
-		snprintf(buf, sizeof buf, "%s/%s/%s/%s/%s/%s/%s/%s",
-			action, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-		for (a=0; a<8; ++a) {
-			if (buf[strlen(buf)-1] == '/') {
-				buf[strlen(buf)-1] = 0;
+		if (nBackDots < 2)
+		{
+			snprintf(buf, sizeof buf, "%s/%s/%s/%s/%s/%s/%s/%s",
+				 static_dirs[n_static], 
+				 index[1], index[2], index[3], index[4], index[5], index[6], index[7]);
+			for (a=0; a<8; ++a) {
+				if (buf[strlen(buf)-1] == '/') {
+					buf[strlen(buf)-1] = 0;
+				}
 			}
-		}
-		for (a = 0; a < strlen(buf); ++a) {
-			if (isspace(buf[a])) {
-				buf[a] = 0;
+			for (a = 0; a < strlen(buf); ++a) {
+				if (isspace(buf[a])) {
+					buf[a] = 0;
+				}
 			}
+			output_static(buf);
+		}
+		else 
+		{
+			lprintf(9, "Suspicious request. Ignoring.");
+			wprintf("HTTP/1.1 404 Not found. Don't try to Trick me DUDE!\r\n");
+			wprintf("Content-Type: text/plain\r\n");
+			wprintf("\r\n");
+			wprintf("Not found. Don't play games on me!\r\n");
 		}
-		output_static(buf);
 		goto SKIP_ALL_THIS_CRAP;	/* Don't try to connect */
 	}
 
@@ -1422,12 +1425,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")) {
@@ -1473,7 +1478,7 @@ 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")) {
@@ -1557,7 +1562,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")) {
@@ -1608,6 +1615,20 @@ 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_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")) {
@@ -1621,7 +1642,7 @@ void session_loop(struct httprequest *req)
 	} else if (!strcasecmp(action, "bcc_autocomplete")) {
 		recp_autocomplete(bstr("bcc"));
 	} 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<hr />\n", WC->wc_session);
@@ -1634,6 +1655,12 @@ void session_loop(struct httprequest *req)
 		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. */