#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;
{
WebcitHandler *Handler = (WebcitHandler*) vHandler;
FreeStrBuf(&Handler->Name);
+ FreeStrBuf(&Handler->DisplayName);
free (Handler);
-
}
void WebcitAddUrlHandler(const char * UrlString, long UrlSLen,
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);
+}
+
+void tmplput_HOST_DISPLAYNAME(StrBuf *Target, WCTemplputParams *TP)
+{
+ wcsession *WCC = WC;
+ StrBufAppendTemplate(Target, TP, WCC->Hdr->HR.http_host, 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
}
/*
void wDumpContent(int print_standard_html_footer)
{
if (print_standard_html_footer) {
- wprintf("</div> <!-- end of 'content' div -->\n");
+ wc_printf("</div> <!-- end of 'content' div -->\n");
do_template("trailing", NULL);
}
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 (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();
/* check for ImportantMessages (these display in a div overlaying the main screen) */
if (!IsEmptyStr(WCC->ImportantMessage)) {
- wprintf("<div id=\"important_message\">\n"
+ w
c_printf("<div id=\"important_message\">\n"
"<span class=\"imsg\">");
StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
- wprintf("</span><br />\n"
+ wc_printf("</span><br />\n"
"</div>\n"
);
StrBufAppendBufPlain(WCC->trailing_javascript,
WCC->ImportantMessage[0] = 0;
}
else if (StrLength(WCC->ImportantMsg) > 0) {
- wprintf("<div id=\"important_message\">\n"
+ w
c_printf("<div id=\"important_message\">\n"
"<span class=\"imsg\">");
StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
- wprintf("</span><br />\n"
+ wc_printf("</span><br />\n"
"</div>\n"
);
StrBufAppendBufPlain(WCC->trailing_javascript,
}
if (do_room_banner == 1) {
- wprintf("<div id=\"banner\">\n");
- embed_room_banner(NULL, navbar_default);
- wprintf("</div>\n");
+ w
c_printf("<div id=\"banner\">\n");
+ embed_room_banner();
+ wc_printf("</div>\n");
}
}
if (do_room_banner == 1) {
- wprintf("<div id=\"content\">\n");
+ w
c_printf("<div id=\"content\">\n");
}
}
hprintf("URI: %s\r\n", whichpage);
hprintf("Content-type: text/html; charset=utf-8\r\n");
begin_burst();
- wprintf("<html><body>");
- wprintf("Go <a href=\"%s\">here</A>.", whichpage);
- wprintf("</body></html>\n");
+ wc_printf("<html><body>");
+ w
c_printf("Go <a href=\"%s\">here</A>.", whichpage);
+ wc_printf("</body></html>\n");
end_burst();
}
{
hprintf("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);
- wprintf("</td></tr></table>\n");
- wprintf("</div>\n<div id=\"content\">\n");
+ w
c_printf("<div id=\"banner\">\n");
+ w
c_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");
+ w
c_printf("</div>\n<div id=\"content\">\n");
escputs(messagetext);
- wprintf("<hr />\n");
+ wc_printf("<hr />\n");
wDumpContent(1);
}
hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode));
hprintf("Content-Type: text/html\r\n");
begin_burst();
- wprintf("<h1>");
- wprintf(_("Authorization Required"));
- wprintf("</h1>\r\n");
+ wc_printf("<h1>");
+ wc_printf(_("Authorization Required"));
+ wc_printf("</h1>\r\n");
if (WCC->ImportantMsg != NULL)
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();
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)
{
+ int rc;
int body_start = 0;
wcsession *WCC = WC;
StrBuf *content = NULL;
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);
content = NULL;
}
FreeStrBuf(&content);
+ return 1;
}
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(WCC->Hdr->HR.ReqLine,
- Buf, &pCh, '/') >= 0)
+ while (StrBufExtract_NextToken(Buf, WCC->Hdr->HR.ReqLine, &pCh, '/') >= 0)
{
- Put(WCC->Directory, IKEY(i), Buf, HFreeStrBuf);
- if (i==0)
- pFloor = Buf;
+ 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++;
- Buf = NewStrBuf();
}
- if (i == 0)
- FreeStrBuf(&Buf);
- else if (pFloor != NULL)
+
+ FreeStrBuf(&Buf);
+ if (pFloor != NULL)
{
Floors = GetFloorListHash(NULL, NULL);
if (Floors != NULL)
{
- if (GetHash(Floors, SKEY(pFloor), &vFloor))
- WCC->CurrentFloor = (floor*) vFloor;
+ 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;
+}
* 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();
+
/* If there are variables in the URL, we must grab them now */
if (WCC->Hdr->PlainArgs != NULL)
ParseURLParams(WCC->Hdr->PlainArgs);
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;
}
&& (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) {
goto SKIP_ALL_THIS_CRAP;
}
}
+ else if (Status == 541) {
+ WCC->logged_in = 1;
+ }
}
xhttp = (WCC->Hdr->HR.eReqType != eGET) &&
* 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! */
if (WCC->Hdr->HR.Handler != NULL) {
if (!WCC->logged_in && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)) {
- display_login(NULL);
+ display_login();
}
else {
/*
if (xhttp)
authorization_required();
else
- display_login(NULL);
+ display_login();
}
/*
* Toplevel dav requests? or just a flat browser request?
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)
{
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);
+
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("URL:HOSTNAME", 0, 1, tmplput_HOST_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("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"));
+ csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\" />"));
}
else
lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir);
projects / citadel.git / blobdiff