NewHandler->F = F;
NewHandler->Flags = Flags;
NewHandler->Name = NewStrBufPlain(UrlString, UrlSLen);
+ StrBufShrinkToFit(NewHandler->Name, 1);
Put(HandlerHash, UrlString, UrlSLen, NewHandler, DeleteWebcitHandler);
}
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");
* 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();
}
/*
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... */
+ if (WCC->Hdr->HR.Handler != NULL)
+ Flags = WCC->Hdr->HR.Handler->Flags; /* so we can temporarily add our own... */
- if (WCC->Hdr->ContentLength > 0) {
+ 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;
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 a 'gotofirst' parameter has been specified, attempt to goto that room
* supposed to be, and 'gotofirst' was not specified, then go there.
*/
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)
);
- int ret;
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",
}
}
- 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 & 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:
FreeStrBuf(&Buf);
fflush(stdout);
- WCC->Hdr->http_host = NULL;
}
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);
projects / citadel.git / blobdiff