X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.c;h=8f51833deb32a180f9ebced1bc9ddc3177a9c016;hb=639575323070fadad9cc0e2687741e07c0d42cdd;hp=869793a2c2ace1b4c524d9d388b99c2e3c2dbaef;hpb=19efac53a8a87446e66e6e0213d7f9b46af60a48;p=citadel.git diff --git a/webcit/webcit.c b/webcit/webcit.c index 869793a2c..8f51833de 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * 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. @@ -13,26 +11,28 @@ #include "webserver.h" -/* - * String to unset the cookie. - * Any date "in the past" will work, so I chose my birthday, right down to - * the exact minute. :) - */ -static char *unset = "; expires=28-May-1971 18:10:00 GMT"; StrBuf *csslocal = NULL; HashList *HandlerHash = NULL; +void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt) +{ + wcsession *WCC = WC; + int n; + + n = GetCount(WCC->Hdr->HTTPHeaders); + Put(WCC->Hdr->HTTPHeaders, IKEY(n), Data, DeleteIt); +} void DeleteWebcitHandler(void *vHandler) { WebcitHandler *Handler = (WebcitHandler*) vHandler; FreeStrBuf(&Handler->Name); + FreeStrBuf(&Handler->DisplayName); free (Handler); - } -void WebcitAddUrlHandler(const char * UrlString, - long UrlSLen, +void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, + const char *DisplayName, long dslen, WebcitHandlerFunc F, long Flags) { @@ -42,24 +42,43 @@ void WebcitAddUrlHandler(const char * UrlString, NewHandler->Flags = Flags; NewHandler->Name = NewStrBufPlain(UrlString, UrlSLen); StrBufShrinkToFit(NewHandler->Name, 1); + NewHandler->DisplayName = NewStrBufPlain(DisplayName, dslen); + StrBufShrinkToFit(NewHandler->DisplayName, 1); Put(HandlerHash, UrlString, UrlSLen, NewHandler, DeleteWebcitHandler); } +void tmplput_HANDLER_DISPLAYNAME(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->Hdr->HR.Handler != NULL) + StrBufAppendTemplate(Target, TP, WCC->Hdr->HR.Handler->DisplayName, 0); +} + /* * web-printing funcion. uses our vsnprintf wrapper */ -void wprintf(const char *format,...) +#ifdef UBER_VERBOSE_DEBUGGING +void wcc_printf(const char *FILE, const char *FUNCTION, long LINE, const char *format,...) +#else +void wc_printf(const char *format,...) +#endif { wcsession *WCC = WC; va_list arg_ptr; if (WCC->WBuf == NULL) WCC->WBuf = NewStrBuf(); +#ifdef UBER_VERBOSE_DEBUGGING + StrBufAppendPrintf(WCC->WBuf, "\n%s:%s:%d[", FILE, FUNCTION, LINE); +#endif va_start(arg_ptr, format); StrBufVAppendPrintf(WCC->WBuf, format, arg_ptr); va_end(arg_ptr); +#ifdef UBER_VERBOSE_DEBUGGING + StrBufAppendPrintf(WCC->WBuf, "]\n"); +#endif } /* @@ -87,7 +106,7 @@ void hprintf(const char *format,...) void wDumpContent(int print_standard_html_footer) { if (print_standard_html_footer) { - wprintf(" \n"); + wc_printf(" \n"); do_template("trailing", NULL); } @@ -103,20 +122,19 @@ void wDumpContent(int print_standard_html_footer) /* * Output HTTP headers and leading HTML for a page */ -void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ +void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ int do_htmlhead, /* 1 = output HTML section and opener */ - int do_room_banner, /* 0=no, 1=yes, + int do_room_banner, /* 0=no, 1=yes, * 2 = I'm going to embed my own, so don't open the - *
either. + *
either. */ int unset_cookies, /* 1 = session is terminating, so unset the cookies */ - int suppress_check, /* 1 = suppress check for instant messages */ - int cache /* 1 = allow browser to cache this page */ + int suppress_check, /* 1 = suppress check for instant messages */ + int cache /* 1 = allow browser to cache this page */ ) { wcsession *WCC = WC; - char cookie[1024]; char httpnow[128]; hprintf("HTTP/1.1 200 OK\n"); @@ -157,25 +175,7 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers ); } - if (cache < 2) { - - stuff_to_cookie(cookie, 1024, - WCC->wc_session, - WCC->wc_username, - WCC->wc_password, - WCC->wc_roomname, - get_selected_language() - ); - - if (unset_cookies) { - hprintf("Set-cookie: webcit=%s; path=/\r\n", unset); - } else { - hprintf("Set-cookie: webcit=%s; path=/\r\n", cookie); - if (server_cookie != NULL) { - hprintf("%s\n", server_cookie); - } - } - } + if (cache < 2) stuff_to_cookie(unset_cookies); if (do_htmlhead) { begin_burst(); @@ -183,10 +183,10 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers /* check for ImportantMessages (these display in a div overlaying the main screen) */ if (!IsEmptyStr(WCC->ImportantMessage)) { - wprintf("
\n" + wc_printf("
\n" ""); StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0); - wprintf("
\n" + wc_printf("
\n" "
\n" ); StrBufAppendBufPlain(WCC->trailing_javascript, @@ -196,10 +196,10 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers WCC->ImportantMessage[0] = 0; } else if (StrLength(WCC->ImportantMsg) > 0) { - wprintf("
\n" + wc_printf("
\n" ""); StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0); - wprintf("
\n" + wc_printf("
\n" "
\n" ); StrBufAppendBufPlain(WCC->trailing_javascript, @@ -209,19 +209,16 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers FlushStrBuf(WCC->ImportantMsg); } if ( (WCC->logged_in) && (!unset_cookies) ) { - /*DoTemplate(HKEY("iconbar"), NULL, &NoCtx);*/ - page_popup(); + DoTemplate(HKEY("paging"), NULL, &NoCtx); } if (do_room_banner == 1) { - wprintf("
\n"); - embed_room_banner(NULL, navbar_default); - wprintf("
\n"); + tmplput_roombanner(NULL, NULL); } } if (do_room_banner == 1) { - wprintf("
\n"); + wc_printf("
\n"); } } @@ -242,9 +239,9 @@ void http_redirect(const char *whichpage) { hprintf("URI: %s\r\n", whichpage); hprintf("Content-type: text/html; charset=utf-8\r\n"); begin_burst(); - wprintf(""); - wprintf("Go here.", whichpage); - wprintf("\n"); + wc_printf(""); + wc_printf("Go here.", whichpage); + wc_printf("\n"); end_burst(); } @@ -273,41 +270,6 @@ void http_transmit_thing(const char *content_type, end_burst(); } -/* - * print menu box like used in the floor view or admin interface. - * This function takes pair of strings as va_args, - * Title Title string of the box - * Class CSS Class for the box - * nLines How many string pairs should we print? (URL, UrlText) - * ... Pairs of URL Strings and their Names - */ -void print_menu_box(char* Title, char *Class, int nLines, ...) -{ - va_list arg_list; - long i; - - svput("BOXTITLE", WCS_STRING, Title); - do_template("beginboxx", NULL); - - wprintf(""); - - do_template("endbox", NULL); -} - - /* * Convenience functions to display a page containing only a string @@ -320,14 +282,14 @@ void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const { hprintf("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("
\n
\n"); + wc_printf("
\n"); + wc_printf("
", titlebarcolor); + wc_printf("%s\n", titlebarmsg); + wc_printf("
\n"); + wc_printf("
\n
\n"); escputs(messagetext); - wprintf("
\n"); + wc_printf("
\n"); wDumpContent(1); } @@ -381,9 +343,9 @@ void authorization_required(void) hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode)); hprintf("Content-Type: text/html\r\n"); begin_burst(); - wprintf("

"); - wprintf(_("Authorization Required")); - wprintf("

\r\n"); + wc_printf("

"); + wc_printf(_("Authorization Required")); + wc_printf("

\r\n"); if (WCC->ImportantMsg != NULL) @@ -391,7 +353,7 @@ void authorization_required(void) else if (WCC->ImportantMessage != NULL) message = WCC->ImportantMessage; - wprintf(_("The resource you requested requires a valid username and password. " + wc_printf(_("The resource you requested requires a valid username and password. " "You could not be logged in: %s\n"), message); wDumpContent(0); end_webcit_session(); @@ -404,21 +366,21 @@ void begin_ajax_response(void) { wcsession *WCC = WC; FlushStrBuf(WCC->HBuf); - output_headers(0, 0, 0, 0, 0, 0); + output_headers(0, 0, 0, 0, 0, 0); - hprintf("Content-type: text/html; charset=UTF-8\r\n" - "Server: %s\r\n" - "Connection: close\r\n" + hprintf("Content-type: text/html; charset=UTF-8\r\n" + "Server: %s\r\n" + "Connection: close\r\n" , - PACKAGE_STRING); - begin_burst(); + PACKAGE_STRING); + begin_burst(); } /* * print ajax response footer */ void end_ajax_response(void) { - wDumpContent(0); + wDumpContent(0); } @@ -500,65 +462,137 @@ void seconds_since_last_gexp(void) char buf[256]; if ( (time(NULL) - WC->last_pager_check) < 30) { - wprintf("NO\n"); + wc_printf("NO\n"); } else { memset(buf, 0, 5); serv_puts("NOOP"); serv_getln(buf, sizeof buf); if (buf[3] == '*') { - wprintf("YES"); + wc_printf("YES"); } else { - wprintf("NO"); + wc_printf("NO"); } } } -void ReadPostData(void) +int ReadPostData(void) { - const char *content_end = NULL; - int body_start = 0; + int rc; + int urlencoded_post = 0; wcsession *WCC = WC; StrBuf *content = NULL; + urlencoded_post = (strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33) == 0) ; + content = NewStrBufPlain(NULL, WCC->Hdr->HR.ContentLength + 256); - StrBufPrintf(content, + if (!urlencoded_post) + { + StrBufPrintf(content, "Content-type: %s\n" - "Content-length: %ld\n\n", - ChrPtr(WCC->Hdr->HR.ContentType), + "Content-length: %ld\n\n", + ChrPtr(WCC->Hdr->HR.ContentType), WCC->Hdr->HR.ContentLength); -/* - hprintf("Content-type: %s\n" - "Content-length: %d\n\n", - ContentType, ContentLength); -*/ - body_start = StrLength(content); + } /** Read the entire input data at once. */ - client_read_to(WCC->Hdr, content, - WCC->Hdr->HR.ContentLength, - SLEEPING); + rc = client_read_to(WCC->Hdr, content, + WCC->Hdr->HR.ContentLength, + SLEEPING); + if (rc < 0) + return rc; + - if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33)) { - StrBufCutLeft(content, body_start); + if (urlencoded_post) { ParseURLParams(content); } else if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "multipart", 9)) { - content_end = ChrPtr(content) + - WCC->Hdr->HR.ContentLength + - body_start; - mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0); + char *Buf; + char *BufEnd; + long len; + + len = StrLength(content); + Buf = SmashStrBuf(&content); + BufEnd = Buf + len; + mime_parser(Buf, BufEnd, *upload_handler, NULL, NULL, NULL, 0); + free(Buf); } else if (WCC->Hdr->HR.ContentLength > 0) { WCC->upload = content; + WCC->upload_length = StrLength(WCC->upload); content = NULL; } FreeStrBuf(&content); + return 1; +} + + +void ParseREST_URL(void) +{ + StrBuf *Buf; + StrBuf *pFloor = NULL; + wcsession *WCC = WC; + long i = 0; + const char *pCh = NULL; + HashList *Floors; + void *vFloor; + + lprintf(1, "parsing rest URL: %s\n", ChrPtr(WCC->Hdr->HR.ReqLine)); + + WCC->Directory = NewHash(1, Flathash); + WCC->CurrentFloor = NULL; + + Buf = NewStrBuf(); + while (StrBufExtract_NextToken(Buf, WCC->Hdr->HR.ReqLine, &pCh, '/') >= 0) + { + if (StrLength(Buf) != 0) { + /* ignore empty path segments */ + StrBufUnescape(Buf, 1); + Put(WCC->Directory, IKEY(i), Buf, HFreeStrBuf); + if (i==0) + pFloor = Buf; + Buf = NewStrBuf(); + } + i++; + } + + FreeStrBuf(&Buf); + if (pFloor != NULL) + { + Floors = GetFloorListHash(NULL, NULL); + + if (Floors != NULL) + { + if (GetHash(WCC->FloorsByName, SKEY(pFloor), &vFloor)) + WCC->CurrentFloor = (Floor*) vFloor; + } + } +} + +int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP) +{ + long Depth, IsDepth; + long offset = 0; + wcsession *WCC = WC; + + if (WCC->Hdr->HR.Handler != NULL) + offset ++; + Depth = GetTemplateTokenNumber(Target, TP, 2, 0); + IsDepth = GetCount(WCC->Directory) + offset; + +// LogTemplateError(Target, "bla", 1, TP, "REST_DEPTH: %ld : %ld\n", Depth, IsDepth); + if (Depth < 0) { + Depth = -Depth; + return IsDepth > Depth; + } + else + return Depth == IsDepth; } + /* * Entry point for WebCit transaction */ @@ -573,22 +607,30 @@ void session_loop(void) * so we can use them to reconnect a timed out session if we have to. */ wcsession *WCC; - - - Buf = NewStrBuf(); - + WCC= WC; - WCC->upload_length = 0; WCC->upload = NULL; WCC->is_mobile = 0; - WCC->trailing_javascript = NewStrBuf(); WCC->Hdr->nWildfireHeaders = 0; if (WCC->Hdr->HR.Handler != NULL) Flags = WCC->Hdr->HR.Handler->Flags; /* so we can temporarily add our own... */ if (WCC->Hdr->HR.ContentLength > 0) { - ReadPostData(); + if (ReadPostData() < 0) { + return; + } + } + + Buf = NewStrBuf(); + WCC->trailing_javascript = NewStrBuf(); + + /* Convert base64-encoded URL's back to plain text */ + if (!strncmp(ChrPtr(WCC->Hdr->this_page), "/B64", 4)) { + StrBufCutLeft(WCC->Hdr->this_page, 4); + StrBufDecodeBase64(WCC->Hdr->this_page); + http_redirect(ChrPtr(WCC->Hdr->this_page)); + goto SKIP_ALL_THIS_CRAP; } /* If there are variables in the URL, we must grab them now */ @@ -602,9 +644,9 @@ void session_loop(void) if (ibstr("nonce") != WCC->nonce) { lprintf(9, "Ignoring request with mismatched nonce.\n"); hprintf("HTTP/1.1 404 Security check failed\r\n"); - hprintf("Content-Type: text/plain\r\n\r\n"); + hprintf("Content-Type: text/plain\r\n"); begin_burst(); - wprintf("Security check failed.\r\n"); + wc_printf("Security check failed.\r\n"); end_burst(); goto SKIP_ALL_THIS_CRAP; } @@ -615,7 +657,17 @@ void session_loop(void) * connection now. */ if (!WCC->connected) { - if (GetConnected ()) + if (GetConnected()) { + hprintf("HTTP/1.1 503 Service Unavailable\r\n"); + hprintf("Content-Type: text/html\r\n"); + begin_burst(); + wc_printf("503 Service Unavailable\n"); + wc_printf(_("This program was unable to connect or stay " + "connected to the Citadel server. Please report " + "this problem to your system administrator.") + ); + wc_printf("\n"); + end_burst(); goto SKIP_ALL_THIS_CRAP; } @@ -628,10 +680,12 @@ void session_loop(void) && (StrLength(WCC->Hdr->c_username) > 0) && (StrLength(WCC->Hdr->c_password) > 0)) { + long Status; + FlushStrBuf(Buf); serv_printf("USER %s", ChrPtr(WCC->Hdr->c_username)); StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) == 3) { + if (GetServerStatus(Buf, &Status) == 3) { serv_printf("PASS %s", ChrPtr(WCC->Hdr->c_password)); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) == 2) { @@ -645,6 +699,9 @@ void session_loop(void) goto SKIP_ALL_THIS_CRAP; } } + else if (Status == 541) { + WCC->logged_in = 1; + } } xhttp = (WCC->Hdr->HR.eReqType != eGET) && @@ -668,11 +725,11 @@ void session_loop(void) * If we aren't in any room yet, but we have cookie data telling us where we're * supposed to be, and 'gotofirst' was not specified, then go there. */ - else if ( (StrLength(WCC->wc_roomname) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) { + else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) { int ret; lprintf(9, "We are in '%s' but cookie indicates '%s', going there...\n", - ChrPtr(WCC->wc_roomname), + ChrPtr(WCC->CurRoom.name), ChrPtr(WCC->Hdr->c_roomname) ); ret = gotoroom(WCC->Hdr->c_roomname); /* do quietly to avoid session output! */ @@ -684,9 +741,13 @@ void session_loop(void) if (WCC->Hdr->HR.Handler != NULL) { if (!WCC->logged_in && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)) { - display_login(NULL); + display_login(); } else { +/* + if ((WCC->Hdr->HR.Handler->Flags & PARSE_REST_URL) != 0) + ParseREST_URL(); +*/ if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) begin_ajax_response(); WCC->Hdr->HR.Handler->F(); @@ -704,7 +765,7 @@ void session_loop(void) if (xhttp) authorization_required(); else - display_login(NULL); + display_login(); } /* * Toplevel dav requests? or just a flat browser request? @@ -735,6 +796,21 @@ void sleeeeeeeeeep(int seconds) select(0, NULL, NULL, NULL, &tv); } +int Conditional_IS_HTTPS(StrBuf *Target, WCTemplputParams *TP) +{ + return is_https != 0; +} + +void AppendImportantMessage(const char *pch, long len) +{ + wcsession *WCC = WC; + + if (StrLength(WCC->ImportantMsg) > 0) { + StrBufAppendBufPlain(WCC->ImportantMsg, HKEY("\n"), 0); + } + + StrBufAppendBufPlain(WCC->ImportantMsg, pch, len, 0); +} int ConditionalImportantMesage(StrBuf *Target, WCTemplputParams *TP) { @@ -784,22 +860,27 @@ InitModule_WEBCIT (void) { char dir[SIZ]; - WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC); - WebcitAddUrlHandler(HKEY("do_template"), url_do_template, ANONYMOUS); - WebcitAddUrlHandler(HKEY("sslg"), seconds_since_last_gexp, AJAX|LOGCHATTY); - WebcitAddUrlHandler(HKEY("ajax_servcmd"), ajax_servcmd, 0); - WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE); + WebcitAddUrlHandler(HKEY("blank"), "", 0, blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC); + WebcitAddUrlHandler(HKEY("do_template"), "", 0, url_do_template, ANONYMOUS); + WebcitAddUrlHandler(HKEY("sslg"), "", 0, seconds_since_last_gexp, AJAX|LOGCHATTY); + WebcitAddUrlHandler(HKEY("ajax_servcmd"), "", 0, ajax_servcmd, 0); + WebcitAddUrlHandler(HKEY("webcit"), "", 0, blank_page, URLNAMESPACE); - WebcitAddUrlHandler(HKEY("401"), authorization_required, ANONYMOUS|COOKIEUNNEEDED); + WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED); RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE); - RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, CTX_NONE); - RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, CTX_NONE); - RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, CTX_NONE); + RegisterConditional(HKEY("COND:REST:DEPTH"), 0, Conditional_REST_DEPTH, CTX_NONE); + RegisterConditional(HKEY("COND:IS_HTTPS"), 0, Conditional_IS_HTTPS, CTX_NONE); + + RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, NULL, CTX_NONE); + RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE); + RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE); + RegisterNamespace("URL:DISPLAYNAME", 0, 1, tmplput_HANDLER_DISPLAYNAME, NULL, CTX_NONE); + snprintf(dir, SIZ, "%s/webcit.css", static_local_dir); if (!access(dir, R_OK)) { lprintf(9, "Using local Stylesheet [%s]\n", dir); - csslocal = NewStrBufPlain(HKEY("")); + csslocal = NewStrBufPlain(HKEY("")); } else lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir); @@ -837,11 +918,11 @@ void SessionDetachModule_WEBCIT (wcsession *sess) { - DeleteHash(&sess->Hdr->urlstrings);// TODO? - if (sess->upload_length > 0) { - FreeStrBuf(&sess->upload); - sess->upload_length = 0; - } + DeleteHash(&sess->Directory); + + FreeStrBuf(&sess->upload); + sess->upload_length = 0; + FreeStrBuf(&sess->trailing_javascript); if (StrLength(sess->WBuf) > SIZ * 30) /* Bigger than 120K? release. */