-/*
- * 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.
- *
- * Copyright (c) 1996-2011 by the citadel.org team
- *
- * This program is open source software. You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+// 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.
+//
+// Copyright (c) 1996-2021 by the citadel.org team
+//
+// This program is open source software. You can redistribute it and/or
+// modify it under the terms of the GNU General Public License, version 3.
+
#define SHOW_ME_VAPPEND_PRINTF
#include <stdio.h>
#include <stdarg.h>
#include "webcit.h"
#include "dav.h"
-#include "webserver.h"
+
StrBuf *csslocal = NULL;
HashList *HandlerHash = NULL;
void stuff_to_cookie(int unset_cookie);
-int GetConnected(void);
-
+extern int GetConnected(void);
+extern int verbose;
void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt)
{
- wcsession *WCC = WC;
int n;
- n = GetCount(WCC->Hdr->HTTPHeaders);
- Put(WCC->Hdr->HTTPHeaders, IKEY(n), Data, DeleteIt);
+ n = GetCount(WC->Hdr->HTTPHeaders);
+ Put(WC->Hdr->HTTPHeaders, IKEY(n), Data, DeleteIt);
}
void DeleteWebcitHandler(void *vHandler)
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);
+ if (WC->Hdr->HR.Handler != NULL)
+ StrBufAppendTemplate(Target, TP, WC->Hdr->HR.Handler->DisplayName, 0);
}
void wc_printf(const char *format,...)
#endif
{
- wcsession *WCC = WC;
va_list arg_ptr;
- if (WCC->WBuf == NULL)
- WCC->WBuf = NewStrBuf();
+ if (WC->WBuf == NULL)
+ WC->WBuf = NewStrBuf();
#ifdef UBER_VERBOSE_DEBUGGING
- StrBufAppendPrintf(WCC->WBuf, "\n%s:%s:%d[", FILE, FUNCTION, LINE);
+ StrBufAppendPrintf(WC->WBuf, "\n%s:%s:%d[", FILE, FUNCTION, LINE);
#endif
va_start(arg_ptr, format);
- StrBufVAppendPrintf(WCC->WBuf, format, arg_ptr);
+ StrBufVAppendPrintf(WC->WBuf, format, arg_ptr);
va_end(arg_ptr);
#ifdef UBER_VERBOSE_DEBUGGING
- StrBufAppendPrintf(WCC->WBuf, "]\n");
+ StrBufAppendPrintf(WC->WBuf, "]\n");
#endif
}
*/
void hprintf(const char *format,...)
{
- wcsession *WCC = WC;
va_list arg_ptr;
va_start(arg_ptr, format);
- StrBufVAppendPrintf(WCC->HBuf, format, arg_ptr);
+ StrBufVAppendPrintf(WC->HBuf, format, arg_ptr);
va_end(arg_ptr);
}
*/
void output_headers( int do_httpheaders, /* 1 = output HTTP headers */
int do_htmlhead, /* 1 = output HTML <head> section and <body> opener */
-
- int do_room_banner, /* 0=no, 1=yes,
- * 2 = I'm going to embed my own, so don't open the
- * <div id="content"> either.
- */
-
+ int do_room_banner, /* 1 = include the room banner and <div id="content"></div> */
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 */
) {
- wcsession *WCC = WC;
char httpnow[128];
- hprintf("HTTP/1.1 200 OK\n");
+ if (WC->isFailure)
+ hprintf("HTTP/2.2 500 Internal Server Error");
+ else if (WC->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) {
- if (WCC->serv_info != NULL)
+ if (WC->serv_info != NULL)
hprintf("Content-type: text/html; charset=utf-8\r\n"
"Server: %s / %s\n"
"Connection: close\r\n",
PACKAGE_STRING,
- ChrPtr(WCC->serv_info->serv_software));
+ ChrPtr(WC->serv_info->serv_software));
else
hprintf("Content-type: text/html; charset=utf-8\r\n"
"Server: %s / [n/a]\n"
if (do_htmlhead) {
begin_burst();
do_template("head");
-
- /* check for ImportantMessages (these display in a div overlaying the main screen) */
- if (StrLength(WCC->ImportantMsg) > 0) {
- wc_printf("<div id=\"important_message\">\n"
- "<span class=\"imsg\">");
- StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
- wc_printf("</span><br>\n"
- "</div>\n"
- );
- StrBufAppendBufPlain(WCC->trailing_javascript,
- HKEY("setTimeout('hide_imsg_popup()', 5000); \n"),
- 0
- );
- FlushStrBuf(WCC->ImportantMsg);
- }
- if ( (WCC->logged_in) && (!unset_cookies) ) {
+ if ( (WC->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("<div id=\"content\">\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");
}
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();
wc_printf("<html><body>");
wc_printf("Go <a href=\"%s\">here</A>.", 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"
end_burst();
}
+void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip)
+{
+ 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 (WC->Hdr->HaveRange)
+ hprintf("Accept-Ranges: bytes\r\n"
+ "Content-Range: bytes %ld-%ld/%ld\r\n",
+ WC->Hdr->RangeStart,
+ WC->Hdr->RangeTil,
+ WC->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
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("<div id=\"banner\">\n");
+ output_headers(1, 1, 1, 0, 0, 0);
+ wc_printf("<div id=\"room_banner_override\">\n");
wc_printf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
wc_printf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
wc_printf("</td></tr></table>\n");
wc_printf("</div>\n<div id=\"content\">\n");
escputs(messagetext);
-
wc_printf("<hr />\n");
wDumpContent(1);
}
*/
void authorization_required(void)
{
- wcsession *WCC = WC;
const char *message = "";
hprintf("HTTP/1.1 401 Authorization Required\r\n");
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(WC->Hdr->HR.RawCookie) > 0)
+ stuff_to_cookie(1);
+
hprintf("Content-Type: text/html\r\n");
begin_burst();
wc_printf("<h1>");
wc_printf(_("Authorization Required"));
wc_printf("</h1>\r\n");
-
- if (WCC->ImportantMsg != NULL)
- message = ChrPtr(WCC->ImportantMsg);
+ if (WC->ImportantMsg != NULL) {
+ message = ChrPtr(WC->ImportantMsg);
+ }
- wc_printf(_("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
*/
void begin_ajax_response(void) {
- wcsession *WCC = WC;
- FlushStrBuf(WCC->HBuf);
+ FlushStrBuf(WC->HBuf);
output_headers(0, 0, 0, 0, 0, 0);
hprintf("Content-type: text/html; charset=UTF-8\r\n"
begin_burst();
}
+
/*
* print ajax response footer
*/
}
-
/*
* Wraps a Citadel server command in an AJAX transaction.
*/
-void ajax_servcmd(void)
-{
- wcsession *WCC = WC;
+void ajax_servcmd(void) {
int Done = 0;
StrBuf *Buf;
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"));
StrBuf_ServGetln(Buf);
- StrBufAppendBuf(WCC->WBuf, Buf, 0);
- StrBufAppendBufPlain(WCC->WBuf, HKEY("\n"), 0);
+ StrBufAppendBuf(WC->WBuf, Buf, 0);
+ StrBufAppendBufPlain(WC->WBuf, HKEY("\n"), 0);
switch (GetServerStatus(Buf, NULL)) {
case 8:
serv_puts("\n\n000");
if ( (StrLength(Buf)==3) &&
!strcmp(ChrPtr(Buf), "000")) {
- StrBufAppendBufPlain(WCC->WBuf, HKEY("\000"), 0);
+ StrBufAppendBufPlain(WC->WBuf, HKEY("\000"), 0);
break;
}
case 1:
!strcmp(ChrPtr(Buf), "000")) {
Done = 1;
}
- StrBufAppendBuf(WCC->WBuf, Buf, 0);
- StrBufAppendBufPlain(WCC->WBuf, HKEY("\n"), 0);
+ StrBufAppendBuf(WC->WBuf, Buf, 0);
+ StrBufAppendBufPlain(WC->WBuf, HKEY("\n"), 0);
}
break;
case 4:
* 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);
+ WC->last_pager_check = time(NULL);
}
FreeStrBuf(&Buf);
}
* Save a URL destination so we can go to it later
*/
void push_destination(void) {
- wcsession *WCC = WC;
- if (!WCC) {
+ if (!WC) {
wc_printf("no session");
return;
}
- FreeStrBuf(&WCC->PushedDestination);
- WCC->PushedDestination = NewStrBufDup(SBSTR("url"));
- syslog(9, "Push: %s", ChrPtr(WCC->PushedDestination));
+ FreeStrBuf(&WC->PushedDestination);
+ WC->PushedDestination = NewStrBufDup(sbstr("url"));
+ if (verbose)
+ syslog(LOG_DEBUG, "Push: %s", ChrPtr(WC->PushedDestination));
wc_printf("OK");
}
+
/*
* Go to the URL saved by push_destination()
*/
void pop_destination(void) {
- wcsession *WCC = WC;
-
/*
* 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)) {
+ if ((WC) && (WC->need_regi)) {
+ if ((WC->PushedDestination != NULL) && (StrLength(WC->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);
+ StrBufAppendBufPlain(WC->PushedDestination, HKEY("?go="), 0);
+ StrBufUrlescAppend(WC->PushedDestination, WC->CurRoom.name, NULL);
}
- WCC->need_regi = 0;
+ WC->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) ) {
+ if ( (!WC) || (WC->PushedDestination == NULL) || (StrLength(WC->PushedDestination) == 0) ) {
do_welcome();
return;
}
/*
* All righty then! We have a destination saved, so go there now.
*/
- syslog(9, "Pop: %s", ChrPtr(WCC->PushedDestination));
- http_redirect(ChrPtr(WCC->PushedDestination));
+ if (verbose) {
+ syslog(LOG_DEBUG, "Pop: %s", ChrPtr(WC->PushedDestination));
+ }
+ http_redirect(ChrPtr(WC->PushedDestination));
}
-
-int ReadPostData(void)
-{
+int ReadPostData(void) {
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) ;
+ urlencoded_post = (strncasecmp(ChrPtr(WC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33) == 0) ;
- content = NewStrBufPlain(NULL, WCC->Hdr->HR.ContentLength + 256);
+ content = NewStrBufPlain(NULL, WC->Hdr->HR.ContentLength + 256);
- if (!urlencoded_post)
- {
+ if (!urlencoded_post) {
StrBufPrintf(content,
- "Content-type: %s\n"
- "Content-length: %ld\n\n",
- ChrPtr(WCC->Hdr->HR.ContentType),
- WCC->Hdr->HR.ContentLength);
+ "Content-type: %s\n"
+ "Content-length: %ld\n\n",
+ ChrPtr(WC->Hdr->HR.ContentType),
+ WC->Hdr->HR.ContentLength
+ );
}
- /** Read the entire input data at once. */
- rc = client_read_to(WCC->Hdr, content,
- WCC->Hdr->HR.ContentLength,
- SLEEPING);
- if (rc < 0)
+ /* Read the entire input data at once. */
+ rc = client_read_to(WC->Hdr, content, WC->Hdr->HR.ContentLength, SLEEPING);
+ if (rc < 0) {
return rc;
-
+ }
if (urlencoded_post) {
ParseURLParams(content);
- } else if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "multipart", 9)) {
+ }
+ else if (!strncasecmp(ChrPtr(WC->Hdr->HR.ContentType), "multipart", 9)) {
char *Buf;
char *BufEnd;
long len;
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);
+ }
+ else if (WC->Hdr->HR.ContentLength > 0) {
+ WC->upload = content;
+ WC->upload_length = StrLength(WC->upload);
content = NULL;
}
FreeStrBuf(&content);
}
-void ParseREST_URL(void)
-{
- StrBuf *Buf;
- StrBuf *pFloor = NULL;
- wcsession *WCC = WC;
- long i = 0;
- const char *pCh = NULL;
- HashList *Floors;
- void *vFloor;
-
- syslog(1, "parsing rest URL: %s", 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)
+ if (WC->Hdr->HR.Handler != NULL)
offset ++;
Depth = GetTemplateTokenNumber(Target, TP, 2, 0);
- IsDepth = GetCount(WCC->Directory) + offset;
+ IsDepth = GetCount(WC->Directory) + offset;
// LogTemplateError(Target, "bla", 1, TP, "REST_DEPTH: %ld : %ld\n", Depth, IsDepth);
if (Depth < 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.
*/
- wcsession *WCC;
-
- WCC= WC;
- WCC->upload_length = 0;
- WCC->upload = NULL;
- WCC->Hdr->nWildfireHeaders = 0;
-
- if (WCC->Hdr->HR.ContentLength > 0) {
+ WC->upload_length = 0;
+ WC->upload = NULL;
+ WC->Hdr->nWildfireHeaders = 0;
+
+ if (WC->Hdr->HR.ContentLength > 0) {
if (ReadPostData() < 0) {
return;
}
}
Buf = NewStrBuf();
- WCC->trailing_javascript = NewStrBuf();
+ WC->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));
+ if (!strncmp(ChrPtr(WC->Hdr->this_page), "/B64", 4)) {
+ StrBufCutLeft(WC->Hdr->this_page, 4);
+ StrBufDecodeBase64(WC->Hdr->this_page);
+ http_redirect(ChrPtr(WC->Hdr->this_page));
goto SKIP_ALL_THIS_CRAP;
}
/* If there are variables in the URL, we must grab them now */
- if (WCC->Hdr->PlainArgs != NULL)
- ParseURLParams(WCC->Hdr->PlainArgs);
+ if (WC->Hdr->PlainArgs != NULL) {
+ ParseURLParams(WC->Hdr->PlainArgs);
+ }
/* 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 (ibstr("nonce") != WCC->nonce) {
- syslog(9, "Ignoring request with mismatched nonce.");
+ if (verbose) {
+ syslog(LOG_DEBUG, "Comparing supplied nonce %s to session nonce %d", bstr("nonce"), WC->nonce);
+ }
+ if (ibstr("nonce") != WC->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();
/*
* If we're not connected to a Citadel server, try to hook up the connection now.
*/
- if (!WCC->connected) {
+ if (!WC->connected) {
if (GetConnected()) {
hprintf("HTTP/1.1 503 Service Unavailable\r\n");
hprintf("Content-Type: text/html\r\n");
* 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 ( (!WC->logged_in)
+ && (StrLength(WC->Hdr->c_username) > 0)
+ && (StrLength(WC->Hdr->c_password) > 0)
+ ) {
long Status;
FlushStrBuf(Buf);
- serv_printf("USER %s", ChrPtr(WCC->Hdr->c_username));
+ serv_printf("USER %s", ChrPtr(WC->Hdr->c_username));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, &Status) == 3) {
- serv_printf("PASS %s", ChrPtr(WCC->Hdr->c_password));
+ serv_printf("PASS %s", ChrPtr(WC->Hdr->c_password));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 2) {
- become_logged_in(WCC->Hdr->c_username,
- WCC->Hdr->c_password, Buf);
- } else {
+ become_logged_in(WC->Hdr->c_username, WC->Hdr->c_password, Buf);
+ }
+ else {
/* Should only display when password is wrong */
- WCC->ImportantMsg = NewStrBufPlain(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
+ WC->ImportantMsg = NewStrBufPlain(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
authorization_required();
FreeStrBuf(&Buf);
goto SKIP_ALL_THIS_CRAP;
}
}
else if (Status == 541) {
- WCC->logged_in = 1;
+ WC->logged_in = 1;
}
}
- xhttp = (WCC->Hdr->HR.eReqType != eGET) &&
- (WCC->Hdr->HR.eReqType != ePOST) &&
- (WCC->Hdr->HR.eReqType != eHEAD);
+ xhttp = (WC->Hdr->HR.eReqType != eGET) &&
+ (WC->Hdr->HR.eReqType != ePOST) &&
+ (WC->Hdr->HR.eReqType != eHEAD);
/*
* If a 'go' (or 'gotofirst') parameter has been specified, attempt to goto that room
*/
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);
}
}
* If we aren't in any room yet, but we have cookie data telling us where we're
* supposed to be, and 'go' was not specified, then go there.
*/
- else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
+ else if ( (StrLength(WC->CurRoom.name) == 0) && ( (StrLength(WC->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(WC->CurRoom.name),
+ ChrPtr(WC->Hdr->c_roomname)
);
- ret = gotoroom(WCC->Hdr->c_roomname); /* do quietly to avoid session output! */
+ ret = gotoroom(WC->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(WC->Hdr->c_roomname), ret);
}
}
- if (WCC->Hdr->HR.Handler != NULL) {
- if ( (!WCC->logged_in)
- && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)
- && (WCC->serv_info->serv_supports_guest == 0)
+ if (WC->Hdr->HR.Handler != NULL) {
+ if ( (!WC->logged_in)
+ && ((WC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)
+ && (WC->serv_info != NULL)
+ && (WC->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 ((WC->Hdr->HR.Handler->Flags & AJAX) != 0) {
begin_ajax_response();
- WCC->Hdr->HR.Handler->F();
- if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
+ }
+ WC->Hdr->HR.Handler->F();
+ if ((WC->Hdr->HR.Handler->Flags & AJAX) != 0) {
end_ajax_response();
+ }
}
}
/* When all else fails, display the default landing page or a main menu. */
* 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 (!WC->logged_in) {
if (xhttp) {
authorization_required();
}
* Toplevel dav requests? or just a flat browser request?
*/
else {
- if (xhttp)
+ if (xhttp) {
dav_main();
- else
+ }
+ else {
display_main_menu();
+ }
}
}
* 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) {
+ if (WC && WC->serv_info && WC->serv_info->serv_supports_guest) {
/* default action */
- if (default_landing_page) {
+ 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 {
void AppendImportantMessage(const char *pch, long len)
{
- wcsession *WCC = WC;
- if (StrLength(WCC->ImportantMsg) > 0) {
- StrBufAppendBufPlain(WCC->ImportantMsg, HKEY("\n"), 0);
+ if (StrLength(WC->ImportantMsg) > 0) {
+ StrBufAppendBufPlain(WC->ImportantMsg, HKEY("\n"), 0);
}
- StrBufAppendBufPlain(WCC->ImportantMsg, pch, len, 0);
+ StrBufAppendBufPlain(WC->ImportantMsg, pch, len, 0);
}
int ConditionalImportantMesage(StrBuf *Target, WCTemplputParams *TP)
{
- wcsession *WCC = WC;
- if (WCC != NULL)
- return (StrLength(WCC->ImportantMsg) > 0);
- else
+ if (WC != NULL) {
+ return (StrLength(WC->ImportantMsg) > 0);
+ }
+ else {
return 0;
+ }
}
void tmplput_importantmessage(StrBuf *Target, WCTemplputParams *TP)
{
- wcsession *WCC = WC;
- if (WCC != NULL) {
- if (StrLength(WCC->ImportantMsg) > 0) {
- StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0);
- FlushStrBuf(WCC->ImportantMsg);
+ if (WC != NULL) {
+ if (StrLength(WC->ImportantMsg) > 0) {
+ StrBufAppendTemplate(Target, TP, WC->ImportantMsg, 0);
}
}
}
void tmplput_trailing_javascript(StrBuf *Target, WCTemplputParams *TP)
{
- wcsession *WCC = WC;
- if (WCC != NULL)
- StrBufAppendTemplate(Target, TP, WCC->trailing_javascript, 0);
+ if (WC != NULL) {
+ StrBufAppendTemplate(Target, TP, WC->trailing_javascript, 0);
+ }
}
void tmplput_csslocal(StrBuf *Target, WCTemplputParams *TP)
csslocal, 0);
}
-void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP)
-{
- StrBufAppendBufPlain(Target,
- HKEY(PACKAGE_STRING), 0);
+void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP) {
+ StrBufAppendBufPlain(Target, HKEY(PACKAGE_STRING), 0);
}
extern char static_local_dir[PATH_MAX];
{
char dir[SIZ];
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("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);
+ RegisterNamespace("IMPORTANTMESSAGE", 0, 1, 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)) {
- syslog(9, "Using local Stylesheet [%s]", dir);
+ syslog(LOG_INFO, "Using local Stylesheet [%s]", dir);
csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\" />"));
}
else
- syslog(9, "No Site-local Stylesheet [%s] installed.", dir);
+ syslog(LOG_INFO, "No Site-local Stylesheet [%s] installed.", dir);
}
else
FlushStrBuf(sess->WBuf);
FlushStrBuf(sess->HBuf);
+ if (StrLength(sess->ImportantMsg) > 0) {
+ FlushStrBuf(sess->ImportantMsg);
+ }
+
}
void
projects / citadel.git / blobdiff