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,
long Flags)
{
- WebcitHandler *NewHandler;
-
- if (HandlerHash == NULL)
- HandlerHash = NewHash(1, NULL);
-
+ WebcitHandler *NewHandler;
NewHandler = (WebcitHandler*) malloc(sizeof(WebcitHandler));
NewHandler->F = F;
NewHandler->Flags = Flags;
- Put(HandlerHash, UrlString, UrlSLen, NewHandler, NULL);
+ NewHandler->Name = NewStrBufPlain(UrlString, UrlSLen);
+ 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);
+ }
}
}
#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(const char *what)
-{
- int fd;
- struct stat statbuf;
- off_t bytes;
- off_t count = 0;
- const char *content_type;
- int len;
- const char *Err;
-
- 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
wDumpContent(0);
}
+
+
/*
* Wraps a Citadel server command in an AJAX transaction.
*/
}
}
-/**
- * \brief Detects a 'mobile' user agent
- */
-int is_mobile_ua(char *user_agent) {
- if (strstr(user_agent,"iPhone OS") != NULL) {
- return 1;
- } else if (strstr(user_agent,"Windows CE") != NULL) {
- return 1;
- } else if (strstr(user_agent,"SymbianOS") != NULL) {
- return 1;
- } else if (strstr(user_agent, "Opera Mobi") != NULL) {
- return 1;
- } else if (strstr(user_agent, "Firefox/2.0.0 Opera 9.51 Beta") != NULL) {
- /* For some reason a new install of Opera 9.51beta decided to spoof. */
- return 1;
- }
- return 0;
+
+
+void ReadPostData(void)
+{
+ const char *content_end = NULL;
+ int body_start = 0;
+ wcsession *WCC = WC;
+ StrBuf *content = NULL;
+
+ content = NewStrBufPlain(NULL, WCC->Hdr->HR.ContentLength + 256);
+
+ StrBufPrintf(content,
+ "Content-type: %s\n"
+ "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);
+
+ 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->HR.ContentType), "multipart", 9)) {
+ content_end = ChrPtr(content) +
+ WCC->Hdr->HR.ContentLength +
+ body_start;
+ mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0);
+ }
+ FreeStrBuf(&content);
}
/*
* Entry point for WebCit transaction
*/
-void session_loop(StrBuf *ReqLine,
- StrBuf *ReadBuf,
- const char **Pos)
+void session_loop(void)
{
+ int Flags = 0;
+ int xhttp;
StrBuf *Buf;
- const char *pch, *pchs, *pche;
- void *vLine;
- char action[1024];
- char arg[8][128];
- size_t sizes[10];
- char *index[10];
+
char buf[SIZ];
- int a, nBackDots, nEmpty;
- int ContentLength = 0;
- StrBuf *ContentType = NULL;
- StrBuf *UrlLine = NULL;
- StrBuf *content = NULL;
- const char *content_end = NULL;
- StrBuf *browser_host = NULL;
- char user_agent[256];
- int body_start = 0;
- int is_static = 0;
- int n_static = 0;
- int len = 0;
- void *vHandler;
- WebcitHandler *Handler;
- struct timeval tx_start;
- struct timeval tx_finish;
/*
* 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.
*/
- StrBuf *c_username;
- StrBuf *c_password;
- StrBuf *c_roomname;
- char c_httpauth_string[SIZ];
- StrBuf *c_httpauth_user;
- StrBuf *c_httpauth_pass;
wcsession *WCC;
- gettimeofday(&tx_start, NULL); /* start a stopwatch for performance timing */
Buf = NewStrBuf();
- c_username = NewStrBuf();
- c_password = NewStrBuf();
- c_roomname = NewStrBuf();
- safestrncpy(c_httpauth_string, "", sizeof c_httpauth_string);
- c_httpauth_user = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
- c_httpauth_pass = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
WCC= WC;
WCC->upload = NULL;
WCC->is_mobile = 0;
WCC->trailing_javascript = NewStrBuf();
- WCC->nWildfireHeaders = 0;
+ WCC->Hdr->nWildfireHeaders = 0;
+ if (WCC->Hdr->HR.Handler != NULL)
+ Flags = WCC->Hdr->HR.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 (GetHash(WCC->headers, HKEY("COOKIE"), &vLine) &&
- (vLine != NULL)){
- cookie_to_stuff((StrBuf *)vLine, NULL,
- c_username,
- c_password,
- c_roomname);
- }
- if (GetHash(WCC->headers, HKEY("AUTHORIZATION"), &vLine) &&
- (vLine!=NULL)) {
- StrBufDecodeBase64((StrBuf*)vLine);
- StrBufExtract_token(c_httpauth_user, (StrBuf*)vLine, 0, ':');
- StrBufExtract_token(c_httpauth_pass, (StrBuf*)vLine, 1, ':');
- }
- if (GetHash(WCC->headers, HKEY("CONTENT-LENGTH"), &vLine) &&
- (vLine!=NULL)) {
- ContentLength = StrToi((StrBuf*)vLine);
- }
- if (GetHash(WCC->headers, HKEY("CONTENT-TYPE"), &vLine) &&
- (vLine!=NULL)) {
- ContentType = (StrBuf*)vLine;
+ if (WCC->Hdr->HR.ContentLength > 0) {
+ ReadPostData();
}
- if (GetHash(WCC->headers, HKEY("USER-AGENT"), &vLine) &&
- (vLine!=NULL)) {
- safestrncpy(user_agent, ChrPtr((StrBuf*)vLine), sizeof user_agent);
-#ifdef TECH_PREVIEW
- if ((WCC->is_mobile < 0) && is_mobile_ua(&buf[12])) {
- WCC->is_mobile = 1;
- }
- else {
- WCC->is_mobile = 0;
- }
-#endif
- }
- if ((follow_xff) &&
- GetHash(WCC->headers, HKEY("X-FORWARDED-HOST"), &vLine) &&
- (vLine != NULL)) {
- WCC->http_host = (StrBuf*)vLine;
- }
- if ((StrLength(WCC->http_host) == 0) &&
- GetHash(WCC->headers, HKEY("HOST"), &vLine) &&
- (vLine!=NULL)) {
- WCC->http_host = (StrBuf*)vLine;
- }
-
- if (GetHash(WCC->headers, HKEY("X-FORWARDED-FOR"), &vLine) &&
- (vLine!=NULL)) {
- browser_host = (StrBuf*) vLine;
-
- while (StrBufNum_tokens(browser_host, ',') > 1) {
- StrBufRemove_token(browser_host, 0, ',');
- }
- StrBufTrim(browser_host);
- }
-
- if (ContentLength > 0) {
- content = NewStrBuf();
- StrBufPrintf(content, "Content-type: %s\n"
- "Content-length: %d\n\n",
- ChrPtr(ContentType), 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->http_sock,
- content,
- ReadBuf, Pos,
- ContentLength,
- SLEEPING);
-
- if (!strncasecmp(ChrPtr(ContentType), "application/x-www-form-urlencoded", 33)) {
- StrBufCutLeft(content, body_start);
- ParseURLParams(content);
- } else if (!strncasecmp(ChrPtr(ContentType), "multipart", 9)) {
- content_end = ChrPtr(content) + ContentLength + body_start;
- mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0);
- }
- } else {
- content = NULL;
- }
-
- /* make a note of where we are in case the user wants to save it */
- WCC->this_page = NewStrBufDup(ReqLine);
- StrBufRemove_token(WCC->this_page, 2, ' ');
- StrBufRemove_token(WCC->this_page, 0, ' ');
/* If there are variables in the URL, we must grab them now */
- UrlLine = NewStrBufDup(ReqLine);
- len = StrLength(UrlLine);
- pch = pchs = ChrPtr(UrlLine);
- pche = pchs + len;
- while (pch < pche) {
- if ((*pch == '?') || (*pch == '&')) {
- StrBufCutLeft(UrlLine, pch - pchs + 1);
- ParseURLParams(UrlLine);
- break;
- }
- pch ++;
- }
- FreeStrBuf(&UrlLine);
-
- /* If it's a "force 404" situation then display the error and bail. */
- if (!strcmp(action, "404")) {
- hprintf("HTTP/1.1 404 Not found\r\n");
- hprintf("Content-Type: text/plain\r\n");
- wprintf("Not found\r\n");
- end_burst();
- goto SKIP_ALL_THIS_CRAP;
- }
-
- /* 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 */
- }
+ if (WCC->Hdr->PlainArgs != NULL)
+ ParseURLParams(WCC->Hdr->PlainArgs);
/* If the client sent a nonce that is incorrect, kill the request. */
if (havebstr("nonce")) {
* connection now.
*/
if (!WCC->connected) {
- if (WCC->ReadBuf == NULL)
- WCC->ReadBuf = NewStrBuf();
- if (!strcasecmp(ctdlhost, "uds")) {
- /* unix domain socket */
- snprintf(buf, SIZ, "%s/citadel.socket", ctdlport);
- WCC->serv_sock = uds_connectsock(buf);
- }
- else {
- /* tcp socket */
- WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
- }
-
- if (WCC->serv_sock < 0) {
- do_logout();
- FreeStrBuf(&WCC->ReadBuf);
+ if (GetConnected ())
goto SKIP_ALL_THIS_CRAP;
- }
- else {
- WCC->connected = 1;
- serv_getln(buf, sizeof buf); /* get the server greeting */
-
- /* Are there too many users already logged in? */
- if (!strncmp(buf, "571", 3)) {
- wprintf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time. Please try again later or contact your system administrator."));
- end_burst();
- end_webcit_session();
- goto SKIP_ALL_THIS_CRAP;
- }
-
- /*
- * From what host is our user connecting? Go with
- * the host at the other end of the HTTP socket,
- * unless we are following X-Forwarded-For: headers
- * and such a header has already turned up something.
- */
- if ( (!follow_xff) || (StrLength(browser_host) == 0) ) {
- if (browser_host == NULL) {
- browser_host = NewStrBuf();
- Put(WCC->headers, HKEY("FreeMeWithTheOtherHeaders"),
- browser_host, HFreeStrBuf);
- }
- locate_host(browser_host, WCC->http_sock);
- }
- if (WCC->serv_info == NULL)
- WCC->serv_info = get_serv_info(browser_host, user_agent);
- if (WCC->serv_info == NULL){
- begin_burst();
- wprintf(_("Received unexpected answer from Citadel "
- "server; bailing out."));
- hprintf("HTTP/1.1 200 OK\r\n");
- hprintf("Content-type: text/plain; charset=utf-8\r\n");
- end_burst();
- end_webcit_session();
- goto SKIP_ALL_THIS_CRAP;
- }
- if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
- begin_burst();
- wprintf(_("You are connected to a Citadel "
- "server running Citadel %d.%02d. \n"
- "In order to run this version of WebCit "
- "you must also have Citadel %d.%02d or"
- " newer.\n\n\n"),
- WCC->serv_info->serv_rev_level / 100,
- WCC->serv_info->serv_rev_level % 100,
- MINIMUM_CIT_VERSION / 100,
- MINIMUM_CIT_VERSION % 100
- );
- hprintf("HTTP/1.1 200 OK\r\n");
- hprintf("Content-type: text/plain; charset=utf-8\r\n");
- end_burst();
- end_webcit_session();
- goto SKIP_ALL_THIS_CRAP;
- }
- }
}
- /*
- * Functions which can be performed without logging in
- */
- if (!strcasecmp(action, "listsub")) {
- do_listsub();
- goto SKIP_ALL_THIS_CRAP;
- }
- if (!strcasecmp(action, "freebusy")) {
- do_freebusy(ChrPtr(ReqLine));
- 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(c_httpauth_user) > 0)
- && (StrLength(c_httpauth_pass) > 0))
+ && (StrLength(WCC->Hdr->c_username) > 0)
+ && (StrLength(WCC->Hdr->c_password) > 0))
{
FlushStrBuf(Buf);
- serv_printf("USER %s", ChrPtr(c_httpauth_user));
+ serv_printf("USER %s", ChrPtr(WCC->Hdr->c_username));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 3) {
- serv_printf("PASS %s", ChrPtr(c_httpauth_pass));
+ serv_printf("PASS %s", ChrPtr(WCC->Hdr->c_password));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 2) {
- become_logged_in(c_httpauth_user,
- c_httpauth_pass, Buf);
- if (WCC->httpauth_user == NULL)
- WCC->httpauth_user = NewStrBufDup(c_httpauth_user);
- else {
- FlushStrBuf(WCC->httpauth_user);
- StrBufAppendBuf(WCC->httpauth_user, c_httpauth_user, 0);
- }
- if (WCC->httpauth_pass == NULL)
- WCC->httpauth_pass = NewStrBufDup(c_httpauth_pass);
- else {
- FlushStrBuf(WCC->httpauth_pass);
- StrBufAppendBuf(WCC->httpauth_pass, c_httpauth_pass, 0);
- }
+ become_logged_in(WCC->Hdr->c_username,
+ WCC->Hdr->c_password, Buf);
} else {
/* Should only display when password is wrong */
authorization_required(&buf[4]);
}
}
- /* This needs to run early */
-#ifdef TECH_PREVIEW
- if (!strcasecmp(action, "rss")) {
- display_rss(sbstr("room"));
- goto SKIP_ALL_THIS_CRAP;
- }
-#endif
-
- /*
- * The GroupDAV stuff relies on HTTP authentication instead of
- * our session's authentication.
- */
- if (!strncasecmp(action, "groupdav", 8)) {
- groupdav_main(WCC->headers,
- ReqLine,
- ContentType, /* do GroupDAV methods */
- ContentLength, content, body_start);
- if (!WCC->logged_in) {
- WCC->killthis = 1; /* If not logged in, don't */
- } /* keep the session active */
- goto SKIP_ALL_THIS_CRAP;
- }
-
-
- /*
- * Automatically send requests with any method other than GET or
- * POST to the GroupDAV code as well.
- */
- if ((WCC->eReqType != eGET) &&
- (WCC->eReqType != ePOST) &&
- (WCC->eReqType != eHEAD)) {
- groupdav_main(WCC->headers, ReqLine,
- ContentType, /** do GroupDAV methods */
- ContentLength, content, body_start);
- if (!WCC->logged_in) {
- WCC->killthis = 1; /** If not logged in, don't */
- } /** keep the session active */
- goto SKIP_ALL_THIS_CRAP;
- }
-
- /*
- * If we're not logged in, but we have username and password cookies
- * supplied by the browser, try using them to log in.
- */
- if ((!WCC->logged_in)
- && (StrLength(c_username)>0)
- && (StrLength(c_password)>0)) {
- serv_printf("USER %s", ChrPtr(c_username));
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) == 3) {
- serv_printf("PASS %s", ChrPtr(c_password));
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) == 2) {
- become_logged_in(c_username, c_password, Buf);
- get_preference("default_header_charset", &WCC->DefaultCharset);
- }
- }
- }
+ xhttp = (WCC->Hdr->HR.eReqType != eGET) &&
+ (WCC->Hdr->HR.eReqType != ePOST) &&
+ (WCC->Hdr->HR.eReqType != eHEAD);
/*
* If a 'gotofirst' parameter has been specified, attempt to goto that room
* prior to doing anything else.
*/
if (havebstr("gotofirst")) {
- gotoroom(sbstr("gotofirst")); /* do this quietly to avoid session output! */
+ 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 we don't have a current room, but a cookie specifying the
- * current room is supplied, make an effort to go there.
+ * 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 ((StrLength(WCC->wc_roomname) == 0) && (StrLength(c_roomname) > 0)) {
- serv_printf("GOTO %s", ChrPtr(c_roomname));
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) == 2) {
- if (WCC->wc_roomname == NULL) {
- WCC->wc_roomname = NewStrBufDup(c_roomname);
- }
- else {
- FlushStrBuf(WCC->wc_roomname);
- StrBufAppendBuf(WCC->wc_roomname, c_roomname, 0);
- }
+ else if ( (StrLength(WCC->wc_roomname) == 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)
+ );
+ 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);
}
}
-
- GetHash(HandlerHash, action, strlen(action) /* TODO*/, &vHandler),
- Handler = (WebcitHandler*) vHandler;
- if (Handler != NULL) {
- if (!WCC->logged_in && ((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((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 ((Handler->Flags & AJAX) != 0)
+ if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
begin_ajax_response();
- Handler->F();
- if ((Handler->Flags & AJAX) != 0)
+ WCC->Hdr->HR.Handler->F();
+ if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
end_ajax_response();
}
}
}
SKIP_ALL_THIS_CRAP:
- if (WCC->SavePrefsToServer) {
- save_preferences();
- WCC->SavePrefsToServer = 0;
- }
FreeStrBuf(&Buf);
- FreeStrBuf(&c_username);
- FreeStrBuf(&c_password);
- FreeStrBuf(&c_roomname);
- FreeStrBuf(&c_httpauth_user);
- FreeStrBuf(&c_httpauth_pass);
- FreeStrBuf(&WCC->this_page);
fflush(stdout);
- if (content != NULL) {
- FreeStrBuf(&content);
- content = NULL;
- }
- WCC->http_host = NULL;
-
- /* How long did this transaction take? */
- gettimeofday(&tx_finish, NULL);
-
- lprintf(9, "Transaction completed in %ld.%06ld seconds.\n",
- ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
- ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000
- );
}
extern char static_local_dir[PATH_MAX];
+
void
InitModule_WEBCIT
(void)
{
char dir[SIZ];
- WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
WebcitAddUrlHandler(HKEY("do_template"), url_do_template, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("sslg"), seconds_since_last_gexp, AJAX);
+ WebcitAddUrlHandler(HKEY("sslg"), seconds_since_last_gexp, AJAX|LOGCHATTY);
WebcitAddUrlHandler(HKEY("ajax_servcmd"), ajax_servcmd, 0);
+ WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE);
RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, CTX_NONE);
(wcsession *sess)
{
sess->ImportantMsg = NewStrBuf();
- sess->WBuf = NewStrBuf();
- sess->HBuf = NewStrBuf();
+ sess->WBuf = NewStrBufPlain(NULL, SIZ * 4);
+ sess->HBuf = NewStrBufPlain(NULL, SIZ / 4);
}
void
SessionDetachModule_WEBCIT
(wcsession *sess)
{
- DeleteHash(&sess->urlstrings);
+ DeleteHash(&sess->Hdr->urlstrings);// TODO?
if (sess->upload_length > 0) {
free(sess->upload);
sess->upload_length = 0;
{
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