StrBuf *csslocal = NULL;
HashList *HandlerHash = NULL;
+
+void DeleteWebcitHandler(void *vHandler)
+{
+ WebcitHandler *Handler = (WebcitHandler*) vHandler;
+ FreeStrBuf(&Handler->Name);
+ free (Handler);
+
+}
+
void WebcitAddUrlHandler(const char * UrlString,
long UrlSLen,
WebcitHandlerFunc F,
NewHandler = (WebcitHandler*) malloc(sizeof(WebcitHandler));
NewHandler->F = F;
NewHandler->Flags = Flags;
- Put(HandlerHash, UrlString, UrlSLen, NewHandler, NULL);
+ NewHandler->Name = NewStrBufPlain(UrlString, UrlSLen);
+ StrBufShrinkToFit(NewHandler->Name, 1);
+ Put(HandlerHash, UrlString, UrlSLen, NewHandler, DeleteWebcitHandler);
}
PACKAGE_STRING);
}
- if (cache) {
+ if (cache > 0) {
char httpTomorow[128];
http_datestring(httpTomorow, sizeof httpTomorow,
);
}
- stuff_to_cookie(cookie, 1024,
- WCC->wc_session, WCC->wc_username,
- WCC->wc_password, WCC->wc_roomname);
+ if (cache < 2) {
- 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);
+ 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);
+ }
}
}
hprintf("Location: %s\r\n", whichpage);
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");
#ifndef TECH_PREVIEW
lprintf(9, "http_transmit_thing(%s)%s\n",
content_type,
- (is_static ? " (static)" : "")
+ ((is_static > 0) ? " (static)" : "")
);
#endif
output_headers(0, 0, 0, 0, 0, is_static);
}
-/*
- * dump out static pages from disk
- */
-void output_static(void)
-{
- int fd;
- struct stat statbuf;
- off_t bytes;
- off_t count = 0;
- const char *content_type;
- int len;
- const char *Err;
- char what[] = "TODO";
- fd = open(what, O_RDONLY);
- if (fd <= 0) {
- lprintf(9, "output_static('%s') -- NOT FOUND --\n", what);
- hprintf("HTTP/1.1 404 %s\r\n", strerror(errno));
- hprintf("Content-Type: text/plain\r\n");
- wprintf("Cannot open %s: %s\r\n", what, strerror(errno));
- end_burst();
- } else {
- len = strlen (what);
- content_type = GuessMimeByFilename(what, len);
-
- if (fstat(fd, &statbuf) == -1) {
- lprintf(9, "output_static('%s') -- FSTAT FAILED --\n", what);
- hprintf("HTTP/1.1 404 %s\r\n", strerror(errno));
- hprintf("Content-Type: text/plain\r\n");
- wprintf("Cannot fstat %s: %s\n", what, strerror(errno));
- end_burst();
- return;
- }
-
- count = 0;
- bytes = statbuf.st_size;
-
- if (StrBufReadBLOB(WC->WBuf, &fd, 1, bytes, &Err) < 0)
- {
- if (fd > 0) close(fd);
- lprintf(9, "output_static('%s') -- FREAD FAILED (%s) --\n", what, strerror(errno));
- hprintf("HTTP/1.1 500 internal server error \r\n");
- hprintf("Content-Type: text/plain\r\n");
- end_burst();
- return;
- }
-
-
- close(fd);
-#ifndef TECH_PREVIEW
- lprintf(9, "output_static('%s') %s\n", what, content_type);
-#endif
- http_transmit_thing(content_type, 1);
- }
- if (yesbstr("force_close_session")) {
- end_webcit_session();
- }
-}
-
/*
* Convenience functions to display a page containing only a string
* Authorization required page
* This is probably temporary and should be revisited
*/
-void authorization_required(const char *message)
+void authorization_required(void)
{
+ wcsession *WCC = WC;
+ const char *message = "";
+
hprintf("HTTP/1.1 401 Authorization Required\r\n");
+ hprintf(
+ "Server: %s / %s\r\n"
+ "Connection: close\r\n",
+ PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software)
+ );
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");
+
+
+ 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);
wDumpContent(0);
-
+ end_webcit_session();
}
/*
wDumpContent(0);
}
- /* If it's a "force 404" situation then display the error and bail. */
-void do_404(void)
-{
- hprintf("HTTP/1.1 404 Not found\r\n");
- hprintf("Content-Type: text/plain\r\n");
- wprintf("Not found\r\n");
- end_burst();
-}
-/* TODO: staticdata
-{
- /* Static content can be sent without connecting to Citadel. * /
- is_static = 0;
- for (a=0; a<ndirs && ! is_static; ++a) {
- if (!strcasecmp(action, (char*)static_content_dirs[a])) { /* map web to disk location * /
- is_static = 1;
- n_static = a;
- }
- }
- if (is_static) {
- if (nBackDots < 2)
- {
- snprintf(buf, sizeof buf, "%s/%s/%s/%s/%s/%s/%s/%s",
- static_dirs[n_static],
- index[1], index[2], index[3], index[4], index[5], index[6], index[7]);
- for (a=0; a<8; ++a) {
- if (buf[strlen(buf)-1] == '/') {
- buf[strlen(buf)-1] = 0;
- }
- }
- for (a = 0; a < strlen(buf); ++a) {
- if (isspace(buf[a])) {
- buf[a] = 0;
- }
- }
- output_static(buf);
- }
- else
- {
- lprintf(9, "Suspicious request. Ignoring.");
- hprintf("HTTP/1.1 404 Security check failed\r\n");
- hprintf("Content-Type: text/plain\r\n\r\n");
- wprintf("You have sent a malformed or invalid request.\r\n");
- end_burst();
- }
- goto SKIP_ALL_THIS_CRAP; /* Don't try to connect * /
- }
- }*/
/*
wcsession *WCC = WC;
StrBuf *content = NULL;
- content = NewStrBuf();
+ content = NewStrBufPlain(NULL, WCC->Hdr->HR.ContentLength + 256);
StrBufPrintf(content,
"Content-type: %s\n"
"Content-length: %ld\n\n",
- ChrPtr(WCC->Hdr->ContentType),
- WCC->Hdr->ContentLength);
+ ChrPtr(WCC->Hdr->HR.ContentType),
+ WCC->Hdr->HR.ContentLength);
/*
hprintf("Content-type: %s\n"
"Content-length: %d\n\n",
body_start = StrLength(content);
/** Read the entire input data at once. */
- client_read_to(&WCC->Hdr->http_sock,
- content,
- WCC->Hdr->ReadBuf, &WCC->Hdr->Pos,
- WCC->Hdr->ContentLength,
+ client_read_to(WCC->Hdr, content,
+ WCC->Hdr->HR.ContentLength,
SLEEPING);
- if (!strncasecmp(ChrPtr(WCC->Hdr->ContentType), "application/x-www-form-urlencoded", 33)) {
+ if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33)) {
StrBufCutLeft(content, body_start);
ParseURLParams(content);
- } else if (!strncasecmp(ChrPtr(WCC->Hdr->ContentType), "multipart", 9)) {
+ } else if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "multipart", 9)) {
content_end = ChrPtr(content) +
- WCC->Hdr->ContentLength +
+ WCC->Hdr->HR.ContentLength +
body_start;
mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0);
+ } else if (WCC->Hdr->HR.ContentLength > 0) {
+ WCC->upload = content;
+ content = NULL;
}
FreeStrBuf(&content);
}
int xhttp;
StrBuf *Buf;
- char buf[SIZ];
-
/*
* 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.
WCC->is_mobile = 0;
WCC->trailing_javascript = NewStrBuf();
WCC->Hdr->nWildfireHeaders = 0;
- if (WCC->Hdr->Handler != NULL)
- Flags = WCC->Hdr->Handler->Flags; /* so we can temporarily add our own... */
- /** Figure out the action * /
- index[0] = action;
- sizes[0] = sizeof action;
- for (a=1; a<9; a++)
- {
- index[a] = arg[a-1];
- sizes[a] = sizeof arg[a-1];
- }
- nBackDots = 0;
- nEmpty = 0;
-/*
- for ( a = 0; a < 9; ++a)
- {
- extract_token(index[a], ChrPtr(ReqLine), a + 1, '/', sizes[a]);
- if (strstr(index[a], "?")) *strstr(index[a], "?") = 0;
- if (strstr(index[a], "&")) *strstr(index[a], "&") = 0;
- if (strstr(index[a], " ")) *strstr(index[a], " ") = 0;
- if ((index[a][0] == '.') && (index[a][1] == '.'))
- nBackDots++;
- if (index[a][0] == '\0')
- nEmpty++;
- }
-*/
- if (WCC->Hdr->ContentLength > 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();
}
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");
+ begin_burst();
wprintf("Security check failed.\r\n");
end_burst();
goto SKIP_ALL_THIS_CRAP;
/*
- * If we're not logged in, but we have HTTP Authentication data,
- * try logging in to Citadel using that.
+ * 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)
WCC->Hdr->c_password, Buf);
} else {
/* Should only display when password is wrong */
- authorization_required(&buf[4]);
+ WCC->ImportantMsg = NewStrBufPlain(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
+ authorization_required();
FreeStrBuf(&Buf);
goto SKIP_ALL_THIS_CRAP;
}
}
}
- xhttp = (WCC->Hdr->eReqType != eGET) &&
- (WCC->Hdr->eReqType != ePOST) &&
- (WCC->Hdr->eReqType != eHEAD);
+ xhttp = (WCC->Hdr->HR.eReqType != eGET) &&
+ (WCC->Hdr->HR.eReqType != ePOST) &&
+ (WCC->Hdr->HR.eReqType != eHEAD);
/*
- * If we're not logged in, but we have username and password cookies
- * supplied by the browser, try using them to log in.
+ * If a 'gotofirst' parameter has been specified, attempt to goto that room
+ * prior to doing anything else.
*/
- if ((!WCC->logged_in)
- && (StrLength(WCC->Hdr->c_username)>0)
- && (StrLength(WCC->Hdr->c_password)>0)) {
- ReEstablish_Session();
+ if (havebstr("gotofirst")) {
+ int ret;
+ 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);
+ }
}
/*
- * If a 'gotofirst' parameter has been specified, attempt to goto that room
- * prior to doing anything else.
+ * 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.
*/
- if (havebstr("gotofirst")) {
+ else if ( (StrLength(WCC->wc_roomname) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
int ret;
- ret = gotoroom(sbstr("gotofirst")); /* do this quietly to avoid session output! */
- if (ret != 0)
- lprintf(1, "GOTOFIRST: Unable to change to [%s]; Reason: %d\n", bstr("gotofirst"), ret);
+
+ lprintf(9, "We are in '%s' but cookie indicates '%s', going there...\n",
+ ChrPtr(WCC->wc_roomname),
+ 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 (WCC->Hdr->Handler != NULL) {
- if (!WCC->logged_in && ((WCC->Hdr->Handler->Flags & ANONYMOUS) == 0)) {
+ if (WCC->Hdr->HR.Handler != NULL) {
+ if (!WCC->logged_in && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)) {
display_login(NULL);
}
else {
-/*
- if((WCC->Hdr->Handler->Flags & NEED_URL)) {
- if (WCC->UrlFragment1 == NULL)
- WCC->UrlFragment1 = NewStrBuf();
- if (WCC->UrlFragment2 == NULL)
- WCC->UrlFragment2 = NewStrBuf();
- if (WCC->UrlFragment3 == NULL)
- WCC->UrlFragment3 = NewStrBuf();
- if (WCC->UrlFragment4 == NULL)
- WCC->UrlFragment4 = NewStrBuf();
- StrBufPlain(WCC->UrlFragment1, index[0], -1);
- StrBufPlain(WCC->UrlFragment2, index[1], -1);
- StrBufPlain(WCC->UrlFragment3, index[2], -1);
- StrBufPlain(WCC->UrlFragment4, index[3], -1);
- }
-*/
- if ((WCC->Hdr->Handler->Flags & AJAX) != 0)
+ if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
begin_ajax_response();
- WCC->Hdr->Handler->F();
- if ((WCC->Hdr->Handler->Flags & AJAX) != 0)
+ WCC->Hdr->HR.Handler->F();
+ if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
end_ajax_response();
}
}
/* When all else fais, display the main menu. */
else {
- if (!WCC->logged_in)
- display_login(NULL);
- else
- display_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 (xhttp)
+ authorization_required();
+ else
+ display_login(NULL);
+ }
+ /*
+ * Toplevel dav requests? or just a flat browser request?
+ */
+ else {
+ if (xhttp)
+ groupdav_main();
+ else
+ display_main_menu();
+ }
}
SKIP_ALL_THIS_CRAP:
- if (WCC->SavePrefsToServer) {
- save_preferences();
- WCC->SavePrefsToServer = 0;
- }
FreeStrBuf(&Buf);
fflush(stdout);
- WCC->Hdr->http_host = NULL;
}
extern char static_local_dir[PATH_MAX];
- /* TODO: integrate this into the static startup logic
-
- * While we're at it, gracefully handle requests for the
- * robots.txt and favicon.ico files.
- * /
- if ((StrLength(ReqLine) >= 11) &&
- !strncasecmp(ChrPtr(ReqLine), "/robots.txt", 11)) {
- StrBufPlain(ReqLine,
- HKEY("/static/robots.txt"
- "?force_close_session=yes HTTP/1.1"));
- Hdr.eReqType = eGET;
- }
- else if ((StrLength(ReqLine) >= 11) &&
- !strncasecmp(ChrPtr(ReqLine), "/favicon.ico", 12)) {
- StrBufPlain(ReqLine, HKEY("/static/favicon.ico"));
- Hdr.eReqType = eGET;
- }
-
-*/
void
InitModule_WEBCIT
(void)
{
char dir[SIZ];
- WebcitAddUrlHandler(HKEY("404"), do_404, ANONYMOUS|COOKIEUNNEEDED);
WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
-
- WebcitAddUrlHandler(HKEY("robots.txt"), output_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
- WebcitAddUrlHandler(HKEY("favicon.ico"), output_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
- WebcitAddUrlHandler(HKEY("static"), output_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
- WebcitAddUrlHandler(HKEY("static.local"), output_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
- WebcitAddUrlHandler(HKEY("tinymce"), output_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
-
- WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS);
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);
- snprintf(dir, SIZ, "%s/static.local/webcit.css", static_local_dir);
+ 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\">"));
}
else
- lprintf(9, "Didn't find site local Stylesheet [%s]\n", dir);
+ lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir);
}
(wcsession *sess)
{
sess->ImportantMsg = NewStrBuf();
- sess->WBuf = NewStrBuf();
- sess->HBuf = NewStrBuf();
+ sess->WBuf = NewStrBufPlain(NULL, SIZ * 4);
+ sess->HBuf = NewStrBufPlain(NULL, SIZ / 4);
}
void
{
DeleteHash(&sess->Hdr->urlstrings);// TODO?
if (sess->upload_length > 0) {
- free(sess->upload);
+ FreeStrBuf(&sess->upload);
sess->upload_length = 0;
}
FreeStrBuf(&sess->trailing_javascript);
{
FreeStrBuf(&sess->WBuf);
FreeStrBuf(&sess->HBuf);
- /*
- FreeStrBuf(&sess->UrlFragment1);
- FreeStrBuf(&sess->UrlFragment2);
- FreeStrBuf(&sess->UrlFragment3);
- FreeStrBuf(&sess->UrlFragment4);
- */
FreeStrBuf(&sess->ImportantMsg);
}
projects / citadel.git / blobdiff