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 */ @@ -146,7 +141,13 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ wcsession *WCC = WC; 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) { @@ -192,12 +193,12 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ if ( (WCC->logged_in) && (!unset_cookies) ) { DoTemplate(HKEY("paging"), NULL, &NoCtx); } - if (do_room_banner == 1) { + if (do_room_banner) { tmplput_roombanner(NULL, NULL); } } - if (do_room_banner == 1) { + if (do_room_banner) { wc_printf("

\n"); } } @@ -229,12 +230,17 @@ void http_redirect(const char *whichpage) { /* - * 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) { - - syslog(9, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (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" @@ -246,6 +252,31 @@ void http_transmit_thing(const char *content_type, int is_static) 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 @@ -257,14 +288,13 @@ void http_transmit_thing(const char *content_type, int is_static) 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); - wc_printf("

\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); - wc_printf("

\n"); wDumpContent(1); } @@ -316,6 +346,11 @@ 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(); wc_printf("

"); @@ -372,7 +407,8 @@ void ajax_servcmd(void) char junk; size_t len; - syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") ); + if (verbose) + syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") ); begin_ajax_response(); Buf = NewStrBuf(); serv_puts(bstr("g_cmd")); @@ -468,8 +504,9 @@ void push_destination(void) { } FreeStrBuf(&WCC->PushedDestination); - WCC->PushedDestination = NewStrBufDup(SBSTR("url")); - syslog(9, "Push: %s", ChrPtr(WCC->PushedDestination)); + WCC->PushedDestination = NewStrBufDup(sbstr("url")); + if (verbose) + syslog(LOG_DEBUG, "Push: %s", ChrPtr(WCC->PushedDestination)); wc_printf("OK"); } @@ -507,7 +544,8 @@ void pop_destination(void) { / * All righty then! We have a destination saved, so go there now. / - syslog(9, "Pop: %s", ChrPtr(WCC->PushedDestination)); + if (verbose) + syslog(LOG_DEBUG, "Pop: %s", ChrPtr(WCC->PushedDestination)); http_redirect(ChrPtr(WCC->PushedDestination)); } @@ -627,11 +665,12 @@ void session_loop(void) / If the client sent a nonce that is incorrect, kill the request. / if (havebstr("nonce")) { - syslog(9, "Comparing supplied nonce %s to session nonce %d", - 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) { - syslog(9, "Ignoring request with mismatched nonce."); + 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"); begin_burst(); @@ -707,18 +746,21 @@ void session_loop(void) / if (havebstr("go")) { int ret; - syslog(9, "Explicit room selection: %s", bstr("go")); + 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) { - syslog(1, "Unable to change to [%s]; Reason: %d", bstr("go"), ret); + if (verbose) + syslog(LOG_DEBUG, "Unable to change to [%s]; Reason: %d", bstr("go"), ret); } } else if (havebstr("gotofirst")) { int ret; - syslog(9, "Explicit room selection: %s", bstr("gotofirst")); + 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) { - syslog(1, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret); + syslog(LOG_INFO, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret); } } @@ -729,20 +771,23 @@ void session_loop(void) else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) { int ret; - syslog(9, "We are in '%s' but cookie indicates '%s', going there...", - ChrPtr(WCC->CurRoom.name), - 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) { - syslog(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d", - 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) + && (WCC->serv_info != NULL) && (WCC->serv_info->serv_supports_guest == 0) ) { display_login(); @@ -801,10 +846,9 @@ void display_default_landing_page(void) { / default action / if (havebstr("go")) { - syslog(9, "Explicit room selection: %s", bstr("go")); - StrBuf teh_room = NewStrBufPlain(bstr("go"), strlen(bstr("go"))); - smart_goto(teh_room); - FreeStrBuf(&teh_room); + 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); @@ -865,7 +909,6 @@ void tmplput_importantmessage(StrBuf Target, WCTemplputParams TP) if (WCC != NULL) { if (StrLength(WCC->ImportantMsg) > 0) { StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0); - FlushStrBuf(WCC->ImportantMsg); } } } @@ -908,9 +951,9 @@ InitModule_WEBCIT WebcitAddUrlHandler(HKEY("pop"), "", 0, pop_destination, 0); WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED); - RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE); - RegisterConditional(HKEY("COND:REST:DEPTH"), 0, Conditional_REST_DEPTH, CTX_NONE); - RegisterConditional(HKEY("COND:IS_HTTPS"), 0, Conditional_IS_HTTPS, CTX_NONE); + 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); @@ -921,11 +964,11 @@ InitModule_WEBCIT snprintf(dir, SIZ, "%s/webcit.css", static_local_dir); if (!access(dir, R_OK)) { - syslog(9, "Using local Stylesheet [%s]", dir); + syslog(LOG_INFO, "Using local Stylesheet [%s]", dir); csslocal = NewStrBufPlain(HKEY("")); } else - syslog(9, "No Site-local Stylesheet [%s] installed.", dir); + syslog(LOG_INFO, "No Site-local Stylesheet [%s] installed.", dir); } @@ -975,6 +1018,10 @@ SessionDetachModule_WEBCIT else FlushStrBuf(sess->WBuf); FlushStrBuf(sess->HBuf); + if (StrLength(sess->ImportantMsg) > 0) { + FlushStrBuf(sess->ImportantMsg); + } + } void