either. - */ - + int do_room_banner, /* 1 = include the room banner and

*/ 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"); + if (WCC->isFailure) + hprintf("HTTP/2.2 500 Internal Server Error"); + else if (WCC->Hdr->HaveRange > 1) + hprintf("HTTP/1.1 206 Partial Content\r\n"); + else + hprintf("HTTP/1.1 200 OK\r\n"); + http_datestring(httpnow, sizeof httpnow, time(NULL)); if (do_httpheaders) { @@ -157,78 +185,29 @@ 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(); - do_template("head", NULL); - - /* check for ImportantMessages (these display in a div overlaying the main screen) */ - if (!IsEmptyStr(WCC->ImportantMessage)) { - wprintf("

\n" - ""); - StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0); - wprintf("
\n" - "

\n" - ); - StrBufAppendBufPlain(WCC->trailing_javascript, - HKEY("setTimeout('hide_imsg_popup()', 5000); \n"), - 0 - ); - WCC->ImportantMessage[0] = 0; - } - else if (StrLength(WCC->ImportantMsg) > 0) { - wprintf("

\n" - ""); - StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0); - wprintf("
\n" - "

\n" - ); - StrBufAppendBufPlain(WCC->trailing_javascript, - HKEY("setTimeout('hide_imsg_popup()', 5000); \n"), - 0 - ); - FlushStrBuf(WCC->ImportantMsg); - } + do_template("head"); if ( (WCC->logged_in) && (!unset_cookies) ) { DoTemplate(HKEY("paging"), NULL, &NoCtx); } - - if (do_room_banner == 1) { - wprintf("\n"); + if (do_room_banner) { + tmplput_roombanner(NULL, NULL); } } - if (do_room_banner == 1) { - wprintf("

\n"); + if (do_room_banner) { + wc_printf("

\n"); } } void output_custom_content_header(const char *ctype) { - hprintf("HTTP/1.1 200 OK\r\n"); - hprintf("Content-type: %s; charset=utf-8\r\n",ctype); - hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software)); - hprintf("Connection: close\r\n"); + hprintf("HTTP/1.1 200 OK\r\n"); + hprintf("Content-type: %s; charset=utf-8\r\n",ctype); + hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software)); + hprintf("Connection: close\r\n"); } @@ -240,27 +219,28 @@ void http_redirect(const char *whichpage) { hprintf("Location: %s\r\n", whichpage); hprintf("URI: %s\r\n", whichpage); hprintf("Content-type: text/html; charset=utf-8\r\n"); + stuff_to_cookie(0); begin_burst(); - wprintf(""); - wprintf("Go here.", whichpage); - wprintf("\n"); + wc_printf(""); + wc_printf("Go here.", whichpage); + wc_printf("\n"); end_burst(); } /* - * Output a piece of content to the web browser using conformant HTTP and MIME semantics + * Output a piece of content to the web browser using conformant HTTP and MIME semantics. + * + * If this function is called, it is expected that begin_burst() has already been called + * and some sort of content has been fed into the buffer. This function will transmit a + * bunch of headers to the client. end_burst() will add some headers of its own, and then + * transmit the buffered content to the client. */ -void http_transmit_thing(const char *content_type, - int is_static) { - -#ifndef TECH_PREVIEW - lprintf(9, "http_transmit_thing(%s)%s\n", - content_type, - ((is_static > 0) ? " (static)" : "") - ); -#endif +void http_transmit_thing(const char *content_type, int is_static) +{ + if (verbose) + syslog(LOG_DEBUG, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : "")); output_headers(0, 0, 0, 0, 0, is_static); hprintf("Content-type: %s\r\n" @@ -272,6 +252,31 @@ void http_transmit_thing(const char *content_type, end_burst(); } +void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip) +{ + wcsession *WCC = WC; + if (verbose) + syslog(LOG_DEBUG, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : "")); + output_headers(0, 0, 0, 0, 0, is_static); + + if (is_gzip) + hprintf("Content-encoding: gzip\r\n"); + + if (WCC->Hdr->HaveRange) + hprintf("Accept-Ranges: bytes\r\n" + "Content-Range: bytes %ld-%ld/%ld\r\n", + WCC->Hdr->RangeStart, + WCC->Hdr->RangeTil, + WCC->Hdr->TotalBytes); + + hprintf("Content-type: %s\r\n" + "Server: "PACKAGE_STRING"\r\n" + "%s" + "Connection: close\r\n\r\n", + content_type, + (is_chunked)?"Transfer-Encoding: chunked\r\n":""); +} + /* * Convenience functions to display a page containing only a string @@ -283,15 +288,14 @@ void http_transmit_thing(const char *content_type, void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const char *messagetext) { hprintf("HTTP/1.1 200 OK\n"); - output_headers(1, 1, 2, 0, 0, 0); - wprintf("\n

\n"); + output_headers(1, 1, 1, 0, 0, 0); + wc_printf("

\n"); + wc_printf("

", titlebarcolor); + wc_printf("%s\n", titlebarmsg); + wc_printf("

\n"); + wc_printf("

\n"); escputs(messagetext); - - wprintf("

\n"); + wc_printf("

\n"); wDumpContent(1); } @@ -321,15 +325,14 @@ void url_do_template(void) { /* * convenience function to indicate success */ -void display_success(char *successmessage) +void display_success(const char *successmessage) { convenience_page("007700", "OK", successmessage); } /* - * Authorization required page - * This is probably temporary and should be revisited + * Authorization required page (sends a 401, causing the browser to request login credentials) */ void authorization_required(void) { @@ -343,24 +346,30 @@ void authorization_required(void) PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software) ); hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode)); + + /* if this is a false cookie authentication, remove it to avoid endless loops. */ + if (StrLength(WCC->Hdr->HR.RawCookie) > 0) + stuff_to_cookie(1); + 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) + if (WCC->ImportantMsg != NULL) { message = ChrPtr(WCC->ImportantMsg); - else if (WCC->ImportantMessage != NULL) - message = WCC->ImportantMessage; + } - wprintf(_("The resource you requested requires a valid username and password. " - "You could not be logged in: %s\n"), message); + 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(); } + /* * Convenience functions to wrap around asynchronous ajax responses */ @@ -368,25 +377,25 @@ 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); } - /* * Wraps a Citadel server command in an AJAX transaction. */ @@ -398,6 +407,8 @@ void ajax_servcmd(void) char *junk; size_t len; + if (verbose) + syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") ); begin_ajax_response(); Buf = NewStrBuf(); serv_puts(bstr("g_cmd")); @@ -415,7 +426,8 @@ void ajax_servcmd(void) } case 1: while (!Done) { - StrBuf_ServGetln(Buf); + if (StrBuf_ServGetln(Buf) < 0) + break; if ( (StrLength(Buf)==3) && !strcmp(ChrPtr(Buf), "000")) { Done = 1; @@ -446,7 +458,7 @@ void ajax_servcmd(void) * This is kind of an ugly hack, but this is the only place it can go. * If the command was GEXP, then the instant messenger window must be * running, so reset the "last_pager_check" watchdog timer so - * that page_popup() doesn't try to open it a second time. + * that page_popup() doesn't try to open it a second time. TODO: page_popup isn't with us anymore. */ if (!strncasecmp(bstr("g_cmd"), "GEXP", 4)) { WCC->last_pager_check = time(NULL); @@ -464,97 +476,158 @@ 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"); } } } +/* + * Save a URL destination so we can go to it later + */ +void push_destination(void) { + wcsession *WCC = WC; + + if (!WCC) { + wc_printf("no session"); + return; + } + + FreeStrBuf(&WCC->PushedDestination); + WCC->PushedDestination = NewStrBufDup(sbstr("url")); + if (verbose) + syslog(LOG_DEBUG, "Push: %s", ChrPtr(WCC->PushedDestination)); + wc_printf("OK"); +} + + +/* + * Go to the URL saved by push_destination() + */ +void pop_destination(void) { + wcsession *WCC = WC; -void ReadPostData(void) + /* + * If we are in the middle of a new user signup, the server may request that + * we first pass through a registration screen. + */ + if ((WCC) && (WCC->need_regi)) { + if ((WCC->PushedDestination != NULL) && (StrLength(WCC->PushedDestination) > 0)) { + /* Registering will take us to the My Citadel Config room, so save our place */ + StrBufAppendBufPlain(WCC->PushedDestination, HKEY("?go="), 0); + StrBufUrlescAppend(WCC->PushedDestination, WCC->CurRoom.name, NULL); + } + WCC->need_regi = 0; + display_reg(1); + return; + } + + /* + * Do something reasonable if we somehow ended up requesting a pop without + * having first done a push. + */ + if ( (!WCC) || (WCC->PushedDestination == NULL) || (StrLength(WCC->PushedDestination) == 0) ) { + do_welcome(); + return; + } + + /* + * All righty then! We have a destination saved, so go there now. + */ + if (verbose) + syslog(LOG_DEBUG, "Pop: %s", ChrPtr(WCC->PushedDestination)); + http_redirect(ChrPtr(WCC->PushedDestination)); +} + + + +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)) { char *Buf; char *BufEnd; + long len; + + len = StrLength(content); Buf = SmashStrBuf(&content); - content_end = Buf + WCC->Hdr->HR.ContentLength + body_start; + 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) +int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP) { - StrBuf *Buf; + long Depth, IsDepth; + long offset = 0; wcsession *WCC = WC; - long i = 0; - const char *pCh = NULL; - WCC->Directory = NewHash(1, Flathash); - - Buf = NewStrBuf(); - while (StrBufExtract_NextToken(WCC->Hdr->HR.ReqLine, - Buf, &pCh, '/') >= 0) - { - Put(WCC->Directory, IKEY(i), Buf, HFreeStrBuf); - i++; - Buf = NewStrBuf(); + 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; } - if (i == 0) - FreeStrBuf(&Buf); + else + return Depth == IsDepth; } - /* * Entry point for WebCit transaction */ void session_loop(void) { - int Flags = 0; int xhttp; StrBuf *Buf; @@ -563,22 +636,27 @@ 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 */ @@ -587,41 +665,59 @@ void session_loop(void) /* If the client sent a nonce that is incorrect, kill the request. */ if (havebstr("nonce")) { - lprintf(9, "Comparing supplied nonce %s to session nonce %ld\n", - bstr("nonce"), WCC->nonce); + if (verbose) + syslog(LOG_DEBUG, "Comparing supplied nonce %s to session nonce %d", + bstr("nonce"), WCC->nonce + ); if (ibstr("nonce") != WCC->nonce) { - lprintf(9, "Ignoring request with mismatched nonce.\n"); + syslog(LOG_INFO, "Ignoring request with mismatched nonce."); 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; } } /* - * If we're not connected to a Citadel server, try to hook up the - * connection now. + * If we're not connected to a Citadel server, try to hook up the 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("
"); + wc_printf("%s", + _("Read More...") + ); + wc_printf("\n"); + end_burst(); goto SKIP_ALL_THIS_CRAP; + } } - /* * If we're not logged in, but we have authentication data (either from * a cookie or from http-auth), try logging in to Citadel using that. */ - if ((!WCC->logged_in) - && (StrLength(WCC->Hdr->c_username) > 0) - && (StrLength(WCC->Hdr->c_password) > 0)) - { + if ( (!WCC->logged_in) + && (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) { @@ -635,6 +731,9 @@ void session_loop(void) goto SKIP_ALL_THIS_CRAP; } } + else if (Status == 541) { + WCC->logged_in = 1; + } } xhttp = (WCC->Hdr->HR.eReqType != eGET) && @@ -642,72 +741,91 @@ void session_loop(void) (WCC->Hdr->HR.eReqType != eHEAD); /* - * If a 'gotofirst' parameter has been specified, attempt to goto that room + * If a 'go' (or 'gotofirst') parameter has been specified, attempt to goto that room * prior to doing anything else. */ - if (havebstr("gotofirst")) { + if (havebstr("go")) { int ret; + if (verbose) + syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go")); + ret = gotoroom(sbstr("go")); /* do quietly to avoid session output! */ + if ((ret/100) != 2) { + if (verbose) + syslog(LOG_DEBUG, "Unable to change to [%s]; Reason: %d", bstr("go"), ret); + } + } + else if (havebstr("gotofirst")) { + int ret; + if (verbose) + syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("gotofirst")); ret = gotoroom(sbstr("gotofirst")); /* do quietly to avoid session output! */ if ((ret/100) != 2) { - lprintf(1, "GOTOFIRST: Unable to change to [%s]; Reason: %d\n", - bstr("gotofirst"), ret); + syslog(LOG_INFO, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret); } } /* * 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. + * supposed to be, and 'go' 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->Hdr->c_roomname) + if (verbose) + syslog(LOG_DEBUG, "We are in '%s' but cookie indicates '%s', going there...", + ChrPtr(WCC->CurRoom.name), + ChrPtr(WCC->Hdr->c_roomname) ); ret = gotoroom(WCC->Hdr->c_roomname); /* do quietly to avoid session output! */ if ((ret/100) != 2) { - lprintf(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d\n", - ChrPtr(WCC->Hdr->c_roomname), ret); + if (verbose) + syslog(LOG_DEBUG, "COOKIEGOTO: Unable to change to [%s]; Reason: %d", + ChrPtr(WCC->Hdr->c_roomname), ret); } } if (WCC->Hdr->HR.Handler != NULL) { - if (!WCC->logged_in && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)) { - display_login(NULL); + if ( (!WCC->logged_in) + && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0) + && (WCC->serv_info != NULL) + && (WCC->serv_info->serv_supports_guest == 0) + ) { + display_login(); } else { -/* - if ((WCC->Hdr->HR.Handler->Flags & PARSE_REST_URL) != 0) - ParseREST_URL(); -*/ - if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) + if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) { begin_ajax_response(); + } WCC->Hdr->HR.Handler->F(); - if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) + if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) { end_ajax_response(); + } } } - /* When all else fais, display the main menu. */ + /* When all else fails, display the default landing page or a main menu. */ else { /* * ordinary browser users get a nice login screen, DAV etc. requsets * are given a 401 so they can handle it appropriate. */ if (!WCC->logged_in) { - if (xhttp) + if (xhttp) { authorization_required(); - else - display_login(NULL); + } + else { + display_default_landing_page(); + } } /* * Toplevel dav requests? or just a flat browser request? */ else { - if (xhttp) - groupdav_main(); - else + if (xhttp) { + dav_main(); + } + else { display_main_menu(); + } } } @@ -717,6 +835,36 @@ SKIP_ALL_THIS_CRAP: } + +/* + * Display the appropriate landing page for this site. + */ +void display_default_landing_page(void) { + wcsession *WCC = WC; + + if (WCC && WCC->serv_info && WCC->serv_info->serv_supports_guest) { + /* default action */ + + if (havebstr("go")) { + if (verbose) + syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go")); + smart_goto(sbstr("go")); + } + else if (default_landing_page) { + http_redirect(default_landing_page); + } + else { + StrBuf *teh_lobby = NewStrBufPlain(HKEY("_BASEROOM_")); + smart_goto(teh_lobby); + FreeStrBuf(&teh_lobby); + } + } + else { + display_login(); + } +} + + /* * Replacement for sleep() that uses select() in order to avoid SIGALRM */ @@ -729,13 +877,27 @@ 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) { wcsession *WCC = WC; if (WCC != NULL) - return ((!IsEmptyStr(WCC->ImportantMessage)) || - (StrLength(WCC->ImportantMsg) > 0)); + return (StrLength(WCC->ImportantMsg) > 0); else return 0; } @@ -745,13 +907,8 @@ void tmplput_importantmessage(StrBuf *Target, WCTemplputParams *TP) wcsession *WCC = WC; if (WCC != NULL) { - if (!IsEmptyStr(WCC->ImportantMessage)) { - StrEscAppend(Target, NULL, WCC->ImportantMessage, 0, 0); - WCC->ImportantMessage[0] = '\0'; - } - else if (StrLength(WCC->ImportantMsg) > 0) { + if (StrLength(WCC->ImportantMsg) > 0) { StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0); - FlushStrBuf(WCC->ImportantMsg); } } } @@ -770,6 +927,12 @@ void tmplput_csslocal(StrBuf *Target, WCTemplputParams *TP) csslocal, 0); } +void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP) +{ + StrBufAppendBufPlain(Target, + HKEY(PACKAGE_STRING), 0); +} + extern char static_local_dir[PATH_MAX]; @@ -778,25 +941,34 @@ 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("401"), 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); + WebcitAddUrlHandler(HKEY("blank"), "", 0, blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC); + WebcitAddUrlHandler(HKEY("landing"), "", 0, display_default_landing_page, ANONYMOUS|COOKIEUNNEEDED); + 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("push"), "", 0, push_destination, AJAX); + WebcitAddUrlHandler(HKEY("pop"), "", 0, pop_destination, 0); + + WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED); + RegisterConditional("COND:IMPMSG", 0, ConditionalImportantMesage, CTX_NONE); + RegisterConditional("COND:REST:DEPTH", 0, Conditional_REST_DEPTH, CTX_NONE); + RegisterConditional("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); + RegisterNamespace("PACKAGESTRING", 0, 1, tmplput_packagestring, 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("")); + syslog(LOG_INFO, "Using local Stylesheet [%s]", dir); + csslocal = NewStrBufPlain(HKEY("")); } else - lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir); + syslog(LOG_INFO, "No Site-local Stylesheet [%s] installed.", dir); } @@ -831,11 +1003,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. */ @@ -846,6 +1018,10 @@ SessionDetachModule_WEBCIT else FlushStrBuf(sess->WBuf); FlushStrBuf(sess->HBuf); + if (StrLength(sess->ImportantMsg) > 0) { + FlushStrBuf(sess->ImportantMsg); + } + } void @@ -855,5 +1031,6 @@ SessionDestroyModule_WEBCIT FreeStrBuf(&sess->WBuf); FreeStrBuf(&sess->HBuf); FreeStrBuf(&sess->ImportantMsg); + FreeStrBuf(&sess->PushedDestination); }