*
*/
-#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 <sys/time.h>
-#include <sys/stat.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
#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",
+ "tiny_mce"
+};
+
/*
* String to unset the cookie.
* Any date "in the past" will work, so I chose my birthday, right down to
void urlesc(char *outbuf, char *strbuf)
{
int a, b, c;
- char *ec = " #&;`'|*?-~<>^()[]{}$\\";
+ char *ec = " #&;`'|*?-~<>^()[]{}$\"\\";
strcpy(outbuf, "");
strcpy(target, "");
for (a = 0; a < strlen(strbuf); ++a) {
- if (strbuf[a] == '\'')
- strcat(target, "\\'");
- else if (strbuf[a] == '\n')
+ 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);
}
/* <div id="content"> either. */
int unset_cookies, /* 1 = session is terminating, so unset the cookies */
- int refresh30, /* 1 = automatically refresh page every 30 seconds */
int suppress_check, /* 1 = suppress check for instant messages */
int cache /* 1 = allow browser to cache this page */
) {
char cookie[SIZ];
char httpnow[SIZ];
- wprintf("HTTP/1.0 200 OK\n");
+ wprintf("HTTP/1.1 200 OK\n");
httpdate(httpnow, time(NULL));
if (do_httpheaders) {
if (do_htmlhead) {
/* wprintf("\n"); */
begin_burst();
-
- if (refresh30) {
- svprintf("REFRESHTAG", WCS_STRING, "%s",
- "<meta http-equiv=\"refresh\" content=\"30\" />\n");
- }
- else {
- svprintf("REFRESHTAG", WCS_STRING, "%s",
- "<meta http-equiv=\"refresh\" content=\"500363689;\" />\n");
- }
-
do_template("head");
}
"%s</SPAN><br />\n", WC->ImportantMessage);
wprintf("</div>\n");
wprintf("<script type=\"text/javascript\">\n"
- " setTimeout('hide_imsg_popup()', 2000); \n"
+ " setTimeout('hide_imsg_popup()', 3000); \n"
"</script>\n");
safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
}
* Generic function to do an HTTP redirect. Easy and fun.
*/
void http_redirect(char *whichpage) {
- wprintf("HTTP/1.0 302 Moved Temporarily\n");
+ wprintf("HTTP/1.1 302 Moved Temporarily\n");
wprintf("Location: %s\r\n", whichpage);
wprintf("URI: %s\r\n", whichpage);
wprintf("Content-type: text/html; charset=utf-8\r\n\r\n");
- wprintf("<html><body>\n");
- wprintf("you really want to be <A HREF=\"%s\">here</A> now\n",
- whichpage);
+ wprintf("<html><body>");
+ wprintf("Go <a href=\"%s\">here</A>.", whichpage);
wprintf("</body></html>\n");
}
void http_transmit_thing(char *thing, size_t length, char *content_type,
int is_static) {
- output_headers(0, 0, 0, 0, 0, 0, is_static);
+ output_headers(0, 0, 0, 0, 0, is_static);
wprintf("Content-type: %s\r\n"
"Server: %s\r\n"
void output_static(char *what)
{
- char buf[256];
FILE *fp;
struct stat statbuf;
off_t bytes;
char *bigbuffer;
char content_type[128];
- sprintf(buf, "static/%s", what);
- fp = fopen(buf, "rb");
+ fp = fopen(what, "rb");
if (fp == NULL) {
- wprintf("HTTP/1.0 404 %s\n", strerror(errno));
+ lprintf(9, "output_static('%s') -- NOT FOUND --\n", what);
+ wprintf("HTTP/1.1 404 %s\n", strerror(errno));
wprintf("Content-Type: text/plain\r\n");
wprintf("\r\n");
wprintf("Cannot open %s: %s\n", what, strerror(errno));
fread(bigbuffer, bytes, 1, fp);
fclose(fp);
+ lprintf(9, "output_static('%s') %s\n", what, content_type);
http_transmit_thing(bigbuffer, (size_t)bytes, content_type, 1);
free(bigbuffer);
}
free(xferbuf);
} else {
-
/* Instead of an ugly 404, send a 1x1 transparent GIF
* when there's no such image on the server.
*/
- output_static("blank.gif");
-
- /*
- wprintf("HTTP/1.0 404 %s\n", &buf[4]);
- output_headers(0, 0, 0, 0, 0, 0, 0);
- wprintf("Content-Type: text/plain\r\n"
- "\r\n"
- "Error retrieving image: %s\n",
- &buf[4]
- );
- */
-
+ output_static("static/blank.gif");
}
}
/*
+ * Generic function to output an arbitrary MIME part from an arbitrary
+ * message number on the server.
*/
-void output_mimepart()
+void mimepart(char *msgnum, char *partnum)
{
char buf[SIZ];
off_t bytes;
char content_type[SIZ];
char *content = NULL;
- serv_printf("OPNA %s|%s", bstr("msgnum"), bstr("partnum"));
+ serv_printf("OPNA %s|%s", msgnum, partnum);
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
bytes = extract_long(&buf[4], 0);
content = malloc(bytes + 2);
extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
- output_headers(0, 0, 0, 0, 0, 0, 0);
+ output_headers(0, 0, 0, 0, 0, 0);
read_server_binary(content, bytes);
serv_puts("CLOS");
serv_getln(buf, sizeof buf);
http_transmit_thing(content, bytes, content_type, 0);
free(content);
} else {
- wprintf("HTTP/1.0 404 %s\n", &buf[4]);
- output_headers(0, 0, 0, 0, 0, 0, 0);
+ wprintf("HTTP/1.1 404 %s\n", &buf[4]);
+ output_headers(0, 0, 0, 0, 0, 0);
wprintf("Content-Type: text/plain\r\n");
wprintf("\r\n");
- wprintf("Error retrieving part: %s\n", &buf[4]);
+ wprintf(_("An error occurred while retrieving this part: %s\n"), &buf[4]);
}
}
/*
+ * Read any MIME part of a message, from the server, into memory.
*/
char *load_mimepart(long msgnum, char *partnum)
{
*/
void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
{
- wprintf("HTTP/1.0 200 OK\n");
- output_headers(1, 1, 2, 0, 0, 0, 0);
+ 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);
* Display a blank page.
*/
void blank_page(void) {
- output_headers(1, 1, 0, 0, 1, 0, 0);
+ output_headers(1, 1, 0, 0, 0, 0);
wDumpContent(2);
}
* Offer to make any page the user's "start page."
*/
void offer_start_page(void) {
- wprintf("<A HREF=\"/change_start_page?startpage=");
+ wprintf("<a href=\"/change_start_page?startpage=");
urlescputs(WC->this_page);
- wprintf("\">"
- "<FONT SIZE=-2 COLOR=\"#AAAAAA\">Make this my start page</FONT>"
- "</A>"
- );
+ wprintf("\"><FONT SIZE=-2 COLOR=\"#AAAAAA\">");
+ wprintf(_("Make this my start page"));
+ wprintf("</FONT></A>");
+/*
+ wprintf("<br/><a href=\"/rss?room=");
+ urlescputs(WC->wc_roomname);
+ wprintf("\" title=\"RSS 2.0 feed for ");
+ escputs(WC->wc_roomname);
+ wprintf("\"><img alt=\"RSS\" border=\"0\" src=\"/static/xml_button.gif\"/></a>\n");
+*/
}
if (bstr("startpage") == NULL) {
safestrncpy(WC->ImportantMessage,
- "startpage set to null",
+ _("You no longer have a start page selected."),
sizeof WC->ImportantMessage);
display_main_menu();
return;
set_preference("startpage", bstr("startpage"), 1);
- output_headers(1, 1, 0, 0, 0, 0, 0);
+ output_headers(1, 1, 0, 0, 0, 0);
do_template("newstartpage");
wDumpContent(1);
}
}
+/* Authorization required page */
+/* This is probably temporary and should be revisited */
+void authorization_required(const char *message)
+{
+ wprintf("HTTP/1.1 401 Authorization Required\r\n");
+ wprintf("WWW-Authenticate: Basic realm=\"\"\r\n", serv_info.serv_humannode);
+ wprintf("Content-Type: text/html\r\n\r\n");
+ wprintf("<h1>");
+ wprintf(_("Authorization Required"));
+ wprintf("</h1>\r\n");
+ wprintf(_("The resource you requested requires a valid username and password. "
+ "You could not be logged in: %s\n"), message);
+ wDumpContent(0);
+}
+
void upload_handler(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset,
{
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) ) {
}
+/*
+ * Convenience functions to wrap around asynchronous ajax responses
+ */
+void begin_ajax_response(void) {
+ output_headers(0, 0, 0, 0, 0, 0);
+
+ wprintf("Content-type: text/html; charset=UTF-8\r\n"
+ "Server: %s\r\n"
+ "Connection: close\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n",
+ SERVER);
+ begin_burst();
+}
+
+void end_ajax_response(void) {
+ wprintf("\r\n");
+ wDumpContent(0);
+}
+
+void ajax_servcmd(void)
+{
+ char buf[1024];
+ char gcontent[1024];
+ char *junk;
+ size_t len;
+
+ begin_ajax_response();
+
+ serv_printf("%s", bstr("g_cmd"));
+ serv_getln(buf, sizeof buf);
+
+ if (buf[0] == '8') {
+ serv_printf("\n\n000");
+ }
+ if ((buf[0] == '1') || (buf[0] == '8')) {
+ while (serv_getln(gcontent, sizeof gcontent), strcmp(gcontent, "000")) {
+ /* maybe do something with it? */
+ }
+ wprintf("000");
+ }
+ if (buf[0] == '4') {
+ text_to_server(bstr("g_input"), 0);
+ serv_puts("000");
+ }
+ if (buf[0] == '6') {
+ len = atol(&buf[4]);
+ junk = malloc(len);
+ serv_read(junk, len);
+ free(junk);
+ }
+ if (buf[0] == '7') {
+ len = atol(&buf[4]);
+ junk = malloc(len);
+ memset(junk, 0, len);
+ serv_write(junk, len);
+ free(junk);
+ }
+
+ end_ajax_response();
+}
+
+
+
void session_loop(struct httprequest *req)
{
char cmd[1024];
- char method[128];
- char action[128];
+ 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 buf[SIZ];
+ char request_method[128];
+ char pathname[1024];
int a, b;
int ContentLength = 0;
int BytesRead = 0;
char browser_host[SIZ];
char user_agent[SIZ];
int body_start = 0;
+ int is_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.
safestrncpy(cmd, hptr->line, sizeof cmd);
hptr = hptr->next;
- extract_token(method, cmd, 0, ' ', sizeof method);
+ extract_token(request_method, cmd, 0, ' ', sizeof request_method);
+ extract_token(pathname, cmd, 1, ' ', sizeof pathname);
/* Figure out the action */
- extract_token(action, cmd, 1, '/', sizeof 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, cmd, 2, '/', sizeof arg1);
+ 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, cmd, 3, '/', sizeof arg2);
+ 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, cmd, 4, '/', sizeof arg3);
+ 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;
+
while (hptr != NULL) {
safestrncpy(buf, hptr->line, sizeof buf);
hptr = hptr->next;
/* Static content can be sent without connecting to Citadel. */
- if (!strcasecmp(action, "static")) {
- safestrncpy(buf, arg1, sizeof buf);
- for (a = 0; a < strlen(buf); ++a)
- if (isspace(buf[a]))
+ is_static = 0;
+ for (a=0; a<(sizeof(static_content_dirs) / sizeof(char *)); ++a) {
+ if (!strcasecmp(action, static_content_dirs[a])) {
+ is_static = 1;
+ }
+ }
+ 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;
+ }
+ }
+ for (a = 0; a < strlen(buf); ++a) {
+ if (isspace(buf[a])) {
buf[a] = 0;
+ }
+ }
output_static(buf);
goto SKIP_ALL_THIS_CRAP; /* Don't try to connect */
}
locate_host(browser_host, WC->http_sock);
get_serv_info(browser_host, user_agent);
if (serv_info.serv_rev_level < MINIMUM_CIT_VERSION) {
- wprintf("You are connected to a Citadel "
- "server running Citadel %d.%02d;\nin "
- "order to run this version of WebCit "
+ wprintf(_("You are connected to a Citadel "
+ "server running Citadel %d.%02d. \n"
+ "In order to run this version of WebCit "
"you must also have Citadel %d.%02d or"
- " newer.\n\n\n",
+ " newer.\n\n\n"),
serv_info.serv_rev_level / 100,
serv_info.serv_rev_level % 100,
MINIMUM_CIT_VERSION / 100,
c_httpauth_pass, buf);
safestrncpy(WC->httpauth_user, c_httpauth_user, sizeof WC->httpauth_user);
safestrncpy(WC->httpauth_pass, c_httpauth_pass, sizeof WC->httpauth_pass);
+ } else {
+ /* Should only display when password is wrong */
+ authorization_required(&buf[4]);
+ goto SKIP_ALL_THIS_CRAP;
}
}
}
+ /* This needs to run early */
+ if (!strcasecmp(action, "rss")) {
+ display_rss(bstr("room"), request_method);
+ goto SKIP_ALL_THIS_CRAP;
+ }
+
/*
* The GroupDAV stuff relies on HTTP authentication instead of
* our session's authentication.
* Automatically send requests with any method other than GET or
* POST to the GroupDAV code as well.
*/
- if ((strcasecmp(method, "GET")) && (strcasecmp(method, "POST"))) {
+ if ((strcasecmp(request_method, "GET")) && (strcasecmp(request_method, "POST"))) {
groupdav_main(req, ContentType, /* do GroupDAV methods */
ContentLength, content+body_start);
if (!WC->logged_in) {
} else if (!strcasecmp(action, "who")) {
who();
} else if (!strcasecmp(action, "who_inner_html")) {
- who_inner_html();
+ begin_ajax_response();
+ who_inner_div();
+ end_ajax_response();
} else if (!strcasecmp(action, "knrooms")) {
knrooms();
} else if (!strcasecmp(action, "gotonext")) {
} else if (!strcasecmp(action, "headers")) {
readloop("headers");
} else if (!strcasecmp(action, "msg")) {
- embed_message();
+ embed_message(arg1);
+ } else if (!strcasecmp(action, "printmsg")) {
+ print_message(arg1);
} else if (!strcasecmp(action, "display_enter")) {
display_enter();
} else if (!strcasecmp(action, "post")) {
} 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);
+ save_edit(_("Room info"), "EINF 1", 1);
} else if (!strcasecmp(action, "display_editbio")) {
sprintf(buf, "RBIO %s", WC->wc_username);
- display_edit("Your bio", "NOOP", buf, "editbio", 3);
+ display_edit(_("Your bio"), "NOOP", buf, "editbio", 3);
} else if (!strcasecmp(action, "editbio")) {
- save_edit("Your bio", "EBIO", 0);
+ save_edit(_("Your bio"), "EBIO", 0);
} else if (!strcasecmp(action, "confirm_move_msg")) {
confirm_move_msg();
} else if (!strcasecmp(action, "delete_room")) {
} else if (!strcasecmp(action, "validate")) {
validate();
} else if (!strcasecmp(action, "display_editpic")) {
- display_graphics_upload("your photo",
+ display_graphics_upload(_("your photo"),
"UIMG 0|_userpic_",
"/editpic");
} else if (!strcasecmp(action, "editpic")) {
do_graphics_upload("UIMG 1|_userpic_");
} else if (!strcasecmp(action, "display_editroompic")) {
- display_graphics_upload("the icon for this room",
+ display_graphics_upload(_("the icon for this room"),
"UIMG 0|_roompic_",
"/editroompic");
} else if (!strcasecmp(action, "editroompic")) {
} else if (!strcasecmp(action, "display_editfloorpic")) {
sprintf(buf, "UIMG 0|_floorpic_|%s",
bstr("which_floor"));
- display_graphics_upload("the icon for this floor",
+ display_graphics_upload(_("the icon for this floor"),
buf,
"/editfloorpic");
} else if (!strcasecmp(action, "editfloorpic")) {
display_generic();
} else if (!strcasecmp(action, "do_generic")) {
do_generic();
+ } else if (!strcasecmp(action, "ajax_servcmd")) {
+ ajax_servcmd();
} else if (!strcasecmp(action, "display_menubar")) {
display_menubar(1);
- } else if (!strcasecmp(action, "output_mimepart")) {
- output_mimepart();
+ } else if (!strcasecmp(action, "mimepart")) {
+ mimepart(arg1, arg2);
} else if (!strcasecmp(action, "edit_vcard")) {
edit_vcard();
} else if (!strcasecmp(action, "submit_vcard")) {
#endif
} else if (!strcasecmp(action, "summary")) {
summary();
+ } else if (!strcasecmp(action, "summary_inner_div")) {
+ begin_ajax_response();
+ summary_inner_div();
+ end_ajax_response();
} else if (!strcasecmp(action, "iconbar")) {
do_iconbar();
} else if (!strcasecmp(action, "display_customize_iconbar")) {
display_preferences();
} else if (!strcasecmp(action, "set_preferences")) {
set_preferences();
+ } else if (!strcasecmp(action, "recp_autocomplete")) {
+ recp_autocomplete(bstr("recp"));
+ } else if (!strcasecmp(action, "cc_autocomplete")) {
+ recp_autocomplete(bstr("cc"));
+ } else if (!strcasecmp(action, "bcc_autocomplete")) {
+ recp_autocomplete(bstr("bcc"));
} else if (!strcasecmp(action, "diagnostics")) {
- output_headers(1, 1, 1, 0, 0, 0, 0);
-
- wprintf("You're in session %d<hr />\n", WC->wc_session);
+ output_headers(1, 1, 1, 0, 0, 0);
+ wprintf("Session: %d<hr />\n", WC->wc_session);
wprintf("Command: <br /><PRE>\n");
escputs(cmd);
wprintf("</PRE><hr />\n");
wprintf("</PRE><hr />\n");
wDumpContent(1);
}
+
/* When all else fais, display the main menu. */
else {
display_main_menu();
projects / citadel.git / blobdiff