/*
- * $Id$
- *
* WebcitAuth; Handles authentication of users to a Citadel server.
+ *
+ * Copyright (c) 1996-2010 by the citadel.org team
+ *
+ * This program is free 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
*/
#include "webcit.h"
#include "webserver.h"
#include <ctype.h>
+extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval);
void display_reg(int during_login);
char *axdefs[7];
void initialize_axdefs(void) {
- axdefs[0] = _("Deleted"); /* an erased user */
- axdefs[1] = _("New User"); /* a new user */
- axdefs[2] = _("Problem User"); /* a trouble maker */
- axdefs[3] = _("Local User"); /* user with normal privileges */
- axdefs[4] = _("Network User"); /* a user that may access network resources */
- axdefs[5] = _("Preferred User");/* a moderator */
- axdefs[6] = _("Aide"); /* chief */
-}
+ /* an erased user */
+ axdefs[0] = _("Deleted");
+
+ /* a new user */
+ axdefs[1] = _("New User");
+
+ /* a trouble maker */
+ axdefs[2] = _("Problem User");
+
+ /* user with normal privileges */
+ axdefs[3] = _("Local User");
+
+ /* a user that may access network resources */
+ axdefs[4] = _("Network User");
+
+ /* a moderator */
+ axdefs[5] = _("Preferred User");
+
+ /* chief */
+ axdefs[6] = _("Aide");
+}
* Display the login screen
* mesg = the error message if last attempt failed.
*/
-void display_login(char *mesg)
+void display_login(void)
{
- char buf[SIZ];
-
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"login_screen\">\n");
-
- if (mesg != NULL) if (!IsEmptyStr(mesg)) {
- stresc(buf, SIZ, mesg, 0, 0);
- svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
- }
-
- svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
- _("<ul>"
- "<li><b>If you already have an account on %s</b>, "
- "enter your user name and password and click "Login." "
- "<li><b>If you are a new user</b>, enter the name and password "
- "you wish to use, "
- "and click "New User." "
- "<li>Please log off properly when finished. "
- "<li>You must use a browser that supports <i>frames</i> and "
- "<i>cookies</i>. "
- "<li>Also keep in mind that if your browser is "
- "configured to block pop-up windows, you will not be able "
- "to receive any instant messages.<br />"
- "</ul>"),
- serv_info.serv_humannode
- );
-
- svput("USERNAME_BOX", WCS_STRING, _("User name:"));
- svput("PASSWORD_BOX", WCS_STRING, _("Password:"));
- svput("LANGUAGE_BOX", WCS_STRING, _("Language:"));
- svput("LOGIN_BUTTON", WCS_STRING, _("Login"));
- svput("NEWUSER_BUTTON", WCS_STRING, _("New User"));
- svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
- svput("HELLO", WCS_SERVCMD, "MESG hello");
- svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
- serv_info.serv_humannode);
- svcallback("DO_LANGUAGE_BOX", offer_languages);
- if (serv_info.serv_newuser_disabled) {
- svput("NEWUSER_BUTTON_PRE", WCS_STRING, "<div style=\"display:none;\">");
- svput("NEWUSER_BUTTON_POST", WCS_STRING, "</div>");
- }
- else {
- svput("NEWUSER_BUTTON_PRE", WCS_STRING, "");
- svput("NEWUSER_BUTTON_POST", WCS_STRING, "");
- }
-
- if (serv_info.serv_supports_openid) {
- svprintf(HKEY("OFFER_OPENID_LOGIN"), WCS_STRING,
- "<div align=center>"
- "<a href=\"display_openid_login\">"
- "<img src=\"static/openid-small.gif\" border=0 valign=middle>"
- "%s</a>"
- "</div>"
- ,
- "Log in using OpenID"
- );
- }
- else {
- svput("OFFER_OPENID_LOGIN", WCS_STRING, "");
- }
-
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
do_template("login", NULL);
-
- wDumpContent(2);
+ end_burst();
}
*/
void display_openid_login(char *mesg)
{
- char buf[SIZ];
-
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"login_screen\">\n");
-
- if (mesg != NULL) if (!IsEmptyStr(mesg)) {
- stresc(buf, SIZ, mesg, 0, 0);
- svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
- }
-
- svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
- _("<ul>"
- "<li>Enter your OpenID URL and click "Login"."
- "<li><a href=\"http://www.citadel.org/doku.php/documentation:openid\">"
- "Click here to learn what OpenID is and how Citadel is using it.</a>"
- "<li>Please log off properly when finished. "
- "<li>You must use a browser that supports <i>frames</i> and "
- "<i>cookies</i>. "
- "<li>Also keep in mind that if your browser is "
- "configured to block pop-up windows, you will not be able "
- "to receive any instant messages.<br />"
- "</ul>")
- );
-
- svput("OPENID_BOX", WCS_STRING, _("OpenID URL:"));
- svput("LANGUAGE_BOX", WCS_STRING, _("Language:"));
- svput("LOGIN_BUTTON", WCS_STRING, _("Login"));
- svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
- svput("HELLO", WCS_SERVCMD, "MESG hello");
- svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
- serv_info.serv_humannode);
- svcallback("DO_LANGUAGE_BOX", offer_languages);
-
- svprintf(HKEY("OFFER_CONVENTIONAL_LOGIN"), WCS_STRING,
- "<div align=center>"
- "<a href=\"display_login\">"
- "%s</a>"
- "</div>"
- ,
- "Log in using a user name and password"
- );
-
- do_template("openid_login", NULL);
- wDumpContent(2);
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ do_template("openid_login", NULL);
+ end_burst();
}
-void display_openid_name_request(char *claimed_id, char *username) {
- char buf[SIZ];
-
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"login_screen\">\n");
-
- stresc(buf, sizeof buf, claimed_id, 0, 0);
- svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID <tt>%s</tt> was successfully verified."),
- claimed_id);
- svput("CLAIMED_ID", WCS_STRING, claimed_id);
-
-
- if (!IsEmptyStr(username)) {
- stresc(buf, sizeof buf, username, 0, 0);
- svprintf(HKEY("REASON"), WCS_STRING,
- _("However, the user name '%s' conflicts with an existing user."), username);
- }
- else {
- svput("REASON", WCS_STRING, "");
- }
-
- svput("ACTION_REQUESTED", WCS_STRING, _("Please specify the user name you would like to use."));
-
- svput("USERNAME_BOX", WCS_STRING, _("User name:"));
- svput("NEWUSER_BUTTON", WCS_STRING, _("New User"));
- svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
-
- svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
- serv_info.serv_humannode);
-
- do_template("openid_manual_create", NULL);
- wDumpContent(2);
-}
-
/* Initialize the session
* pass his password
* serv_response The parameters returned from a Citadel USER or NEWU command
*/
-void become_logged_in(char *user, char *pass, char *serv_response)
+void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response)
{
- char buf[SIZ];
+ wcsession *WCC = WC;
+ StrBuf *Buf;
StrBuf *FloorDiv;
- WC->logged_in = 1;
- extract_token(WC->wc_fullname, &serv_response[4], 0, '|', sizeof WC->wc_fullname);
- safestrncpy(WC->wc_username, user, sizeof WC->wc_username);
- safestrncpy(WC->wc_password, pass, sizeof WC->wc_password);
- WC->axlevel = extract_int(&serv_response[4], 1);
- if (WC->axlevel >= 6) {
- WC->is_aide = 1;
+ WCC->logged_in = 1;
+
+ if (WCC->wc_fullname == NULL)
+ WCC->wc_fullname = NewStrBufPlain(NULL, StrLength(serv_response));
+ StrBufExtract_token(WCC->wc_fullname, serv_response, 0, '|');
+ StrBufCutLeft(WCC->wc_fullname, 4 );
+
+ if (WCC->wc_username == NULL)
+ WCC->wc_username = NewStrBufDup(user);
+ else {
+ FlushStrBuf(WCC->wc_username);
+ StrBufAppendBuf(WCC->wc_username, user, 0);
}
- load_preferences();
+ if (WCC->wc_password == NULL)
+ WCC->wc_password = NewStrBufDup(pass);
+ else {
+ FlushStrBuf(WCC->wc_password);
+ StrBufAppendBuf(WCC->wc_password, pass, 0);
+ }
- serv_puts("CHEK");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- WC->new_mail = extract_int(&buf[4], 0);
- WC->need_regi = extract_int(&buf[4], 1);
- WC->need_vali = extract_int(&buf[4], 2);
- extract_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email);
+ WCC->axlevel = StrBufExtract_int(serv_response, 1, '|');
+ if (WCC->axlevel >= 6) { /* TODO: make this a define, else it might trick us later */
+ WCC->is_aide = 1;
}
- get_pref_long("current_iconbar", &WC->current_iconbar, current_iconbar_menu);
+ load_preferences();
+ Buf = NewStrBuf();
+ serv_puts("CHEK");
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ const char *pch;
+
+ pch = ChrPtr(Buf) + 4;
+ /*WCC->new_mail =*/ StrBufExtractNext_long(Buf, &pch, '|');
+ WCC->need_regi = StrBufExtractNext_long(Buf, &pch, '|');
+ WCC->need_vali = StrBufExtractNext_long(Buf, &pch, '|');
+ if (WCC->cs_inet_email == NULL)
+ WCC->cs_inet_email = NewStrBuf();
+ StrBufExtract_NextToken(WCC->cs_inet_email, Buf, &pch, '|');
+ }
get_preference("floordiv_expanded", &FloorDiv);
- WC->floordiv_expanded = FloorDiv;
+ WCC->floordiv_expanded = FloorDiv;
+ FreeStrBuf(&Buf);
}
*/
void do_login(void)
{
- char buf[SIZ];
+ wcsession *WCC = WC;
+ StrBuf *Buf;
+ long ret, rc;
if (havebstr("language")) {
set_selected_language(bstr("language"));
do_logout();
return;
}
+ Buf = NewStrBuf();
if (havebstr("login_action")) {
serv_printf("USER %s", bstr("name"));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '3') {
+ StrBuf_ServGetln(Buf);
+ rc = GetServerStatus(Buf, &ret);
+ StrBufCutLeft(Buf, 4);
+ switch (rc) {
+ case 3:
serv_printf("PASS %s", bstr("pass"));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- become_logged_in(bstr("name"), bstr("pass"), buf);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ become_logged_in(sbstr("name"), sbstr("pass"), Buf);
} else {
- display_login(&buf[4]);
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage(SKEY(Buf));
+ display_login();
+ FreeStrBuf(&Buf);
return;
}
- } else {
- display_login(&buf[4]);
+ break;
+ case 5:
+ if (ret == 541)
+ {
+ AppendImportantMessage(SKEY(Buf));
+ display_main_menu();
+ return;
+ }
+ default:
+ AppendImportantMessage(SKEY(Buf));
+ display_login();
+ FreeStrBuf(&Buf);
return;
}
}
if (havebstr("newuser_action")) {
if (!havebstr("pass")) {
- display_login(_("Blank passwords are not allowed."));
+ AppendImportantMessage(_("Blank passwords are not allowed."), -1);
+ display_login();
+ FreeStrBuf(&Buf);
return;
}
serv_printf("NEWU %s", bstr("name"));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- become_logged_in(bstr("name"), bstr("pass"), buf);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ become_logged_in(sbstr("name"), sbstr("pass"), Buf);
serv_printf("SETP %s", bstr("pass"));
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetln(Buf); /* Don't care? */
} else {
- display_login(&buf[4]);
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage(SKEY(Buf));
+ display_login();
+ FreeStrBuf(&Buf);
return;
}
}
- if (WC->logged_in) {
- set_preference("language", NewStrBufPlain(bstr("language"), -1), 1);
- if (WC->need_regi) {
+ if (WCC->logged_in) {
+ if (WCC->need_regi) {
display_reg(1);
- } else if (WC->need_vali) {
+ } else if (WCC->need_vali) {
validate();
} else {
do_welcome();
}
} else {
- display_login(_("Your password was not accepted."));
+ AppendImportantMessage(_("Your password was not accepted."), -1);
+ display_login();
}
-
+ FreeStrBuf(&Buf);
}
/*
*/
void openid_manual_create(void)
{
+ StrBuf *Buf;
+
if (havebstr("exit_action")) {
do_logout();
return;
}
- char buf[1024];
if (havebstr("newuser_action")) {
+ Buf = NewStrBuf();
serv_printf("OIDC %s", bstr("name"));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- char gpass[1024] = "";
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ StrBuf *gpass;
+
+ gpass = NewStrBuf();
serv_puts("SETP GENERATE_RANDOM_PASSWORD");
- serv_getln(gpass, sizeof gpass);
- become_logged_in(bstr("name"), &gpass[4], buf);
+ StrBuf_ServGetln(gpass);
+ StrBufCutLeft(gpass, 4);
+ become_logged_in(sbstr("name"), gpass, Buf);
+ FreeStrBuf(&gpass);
}
+ FreeStrBuf(&Buf);
}
if (WC->logged_in) {
do_welcome();
}
} else {
- display_openid_name_request(bstr("openid_url"), bstr("name"));
+ const StrBuf *Buf;
+
+ putbstr("__claimed_id", NewStrBufDup(sbstr("openid_url")));
+ Buf = sbstr("name");
+ if (StrLength(Buf) > 0)
+ putbstr("__username", NewStrBufDup(Buf));
+ begin_burst();
+ do_template("openid_manual_create", NULL);
+ end_burst();
}
}
}
if (havebstr("login_action")) {
snprintf(buf, sizeof buf,
- "OIDS %s|%s://%s/finalize_openid_login|%s://%s",
+ "OIDS %s|%s/finalize_openid_login|%s",
bstr("openid_url"),
- (is_https ? "https" : "http"), WC->http_host,
- (is_https ? "https" : "http"), WC->http_host
+ ChrPtr(site_prefix),
+ ChrPtr(site_prefix)
);
serv_puts(buf);
*/
void finalize_openid_login(void)
{
- char buf[1024];
- struct wcsession *WCC = WC;
+ StrBuf *Buf;
+ wcsession *WCC = WC;
int already_logged_in = (WCC->logged_in) ;
int linecount = 0;
- char result[128] = "";
- char username[128] = "";
- char password[128] = "";
- char logged_in_response[1024] = "";
- char claimed_id[1024] = "";
+ StrBuf *result = NULL;
+ StrBuf *username = NULL;
+ StrBuf *password = NULL;
+ StrBuf *logged_in_response = NULL;
+ StrBuf *claimed_id = NULL;
if (havebstr("openid.mode")) {
if (!strcasecmp(bstr("openid.mode"), "id_res")) {
-
+ Buf = NewStrBuf();
serv_puts("OIDF");
- serv_getln(buf, sizeof buf);
-
- if (buf[0] == '8') {
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 8) {
urlcontent *u;
void *U;
long HKLen;
const char *HKey;
HashPos *Cursor;
- Cursor = GetNewHashPos ();
- while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
+ Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0);
+ while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) {
u = (urlcontent*) U;
if (!strncasecmp(u->url_key, "openid.", 7)) {
serv_printf("%s|%s", &u->url_key[7], ChrPtr(u->url_data));
serv_puts("000");
linecount = 0;
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (linecount == 0) safestrncpy(result, buf, sizeof result);
- if (!strcasecmp(result, "authenticate")) {
+ while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000"))
+ {
+ if (linecount == 0) result = NewStrBufDup(Buf);
+ if (!strcasecmp(ChrPtr(result), "authenticate")) {
if (linecount == 1) {
- safestrncpy(username, buf, sizeof username);
+ username = NewStrBufDup(Buf);
}
else if (linecount == 2) {
- safestrncpy(password, buf, sizeof password);
+ password = NewStrBufDup(Buf);
}
else if (linecount == 3) {
- safestrncpy(logged_in_response, buf,
- sizeof logged_in_response);
+ logged_in_response = NewStrBufDup(Buf);
}
}
- else if (!strcasecmp(result, "verify_only")) {
+ else if (!strcasecmp(ChrPtr(result), "verify_only")) {
if (linecount == 1) {
- safestrncpy(claimed_id, buf, sizeof claimed_id);
+ claimed_id = NewStrBufDup(Buf);
}
if (linecount == 2) {
- safestrncpy(username, buf, sizeof username);
+ username = NewStrBufDup(Buf);
}
}
++linecount;
}
}
+ FreeStrBuf(&Buf);
}
}
/* If we were already logged in, this was an attempt to associate an OpenID account */
if (already_logged_in) {
display_openids();
+ FreeStrBuf(&result);
+ FreeStrBuf(&username);
+ FreeStrBuf(&password);
+ FreeStrBuf(&claimed_id);
+ FreeStrBuf(&logged_in_response);
return;
}
/* If this operation logged us in, either by connecting with an existing account or by
* auto-creating one using Simple Registration Extension, we're already on our way.
*/
- if (!strcasecmp(result, "authenticate")) {
+ if (!strcasecmp(ChrPtr(result), "authenticate")) {
become_logged_in(username, password, logged_in_response);
}
* or conflicts with an existing user. Either way the user will need to specify a new name.
*/
- else if (!strcasecmp(result, "verify_only")) {
- display_openid_name_request(claimed_id, username);
+ else if (!strcasecmp(ChrPtr(result), "verify_only")) {
+ putbstr("__claimed_id", claimed_id);
+ claimed_id = NULL;
+ if (StrLength(username) > 0) {
+ putbstr("__username", username);
+ username = NULL;
+ }
+ begin_burst();
+ do_template("openid_manual_create", NULL);
+ end_burst();
}
/* Did we manage to log in? If so, continue with the normal flow... */
- if (WC->logged_in) {
+ else if (WC->logged_in) {
if (WC->need_regi) {
display_reg(1);
} else {
display_openid_login(_("Your password was not accepted."));
}
+ FreeStrBuf(&result);
+ FreeStrBuf(&username);
+ FreeStrBuf(&password);
+ FreeStrBuf(&claimed_id);
+ FreeStrBuf(&logged_in_response);
}
*/
if (!get_preference("startpage", &Buf)) {
Buf = NewStrBuf ();
- StrBufPrintf(Buf, "dotskip&room=_BASEROOM_");
+ StrBufPrintf(Buf, "dotskip?room=_BASEROOM_");
set_preference("startpage", Buf, 1);
}
if (ChrPtr(Buf)[0] == '/') {
StrBufCutLeft(Buf, 1);
}
- if (StrLength(Buf) == 0)
+ if (StrLength(Buf) == 0) {
StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
+ }
+ lprintf(9, "Redirecting to user's start page: %s\n", ChrPtr(Buf));
http_redirect(ChrPtr(Buf));
}
*/
void end_webcit_session(void) {
- if (WC->logged_in) {
- set_pref_long("current_iconbar", WC->current_iconbar, 0);
- }
-
serv_puts("QUIT");
WC->killthis = 1;
/* close() of citadel socket will be done by do_housekeeping() */
*/
void do_logout(void)
{
+ wcsession *WCC = WC;
char buf[SIZ];
- safestrncpy(WC->wc_username, "", sizeof WC->wc_username);
- safestrncpy(WC->wc_password, "", sizeof WC->wc_password);
- safestrncpy(WC->wc_roomname, "", sizeof WC->wc_roomname);
- safestrncpy(WC->wc_fullname, "", sizeof WC->wc_fullname);
+ FlushStrBuf(WCC->wc_username);
+ FlushStrBuf(WCC->wc_password);
+ FlushStrBuf(WCC->CurRoom.name);
+ FlushStrBuf(WCC->wc_fullname);
+
+ /* FIXME: this is to suppress the iconbar displaying, because we aren't
+ actually logged out yet */
+ WCC->logged_in = 0;
/** Calling output_headers() this way causes the cookies to be un-set */
output_headers(1, 1, 0, 1, 0, 0);
- wprintf("<div id=\"logout_screen\">");
- wprintf("<div class=\"box\">");
- wprintf("<div class=\"boxlabel\">");
- wprintf(_("Log off"));
- wprintf("</div><div class=\"boxcontent\">");
+ w
c_printf("<div id=\"logout_screen\">");
+ w
c_printf("<div class=\"box\">");
+ w
c_printf("<div class=\"boxlabel\">");
+ wc_printf(_("Log off"));
+ wc_printf("</div><div class=\"boxcontent\">");
serv_puts("MESG goodbye");
serv_getln(buf, sizeof buf);
- if (WC->serv_sock >= 0) {
+ if (WCC->serv_sock >= 0) {
if (buf[0] == '1') {
- fmout("CENTER");
+ fmout("'CENTER'");
} else {
- wprintf("Goodbye\n");
+ wc_printf("Goodbye\n");
}
}
else {
- wprintf(_("This program was unable to connect or stay "
+ wc_printf(_("This program was unable to connect or stay "
"connected to the Citadel server. Please report "
"this problem to your system administrator.")
);
- wprintf("<a href=\"http://www.citadel.org/doku.php/"
- "faq:mastering_your_os:net#netstat\">%s</a>",
+ w
c_printf("<a href=\"http://www.citadel.org/doku.php/"
+ "faq:mastering_your_os:net#netstat\">%s</a>",
_("Read More..."));
}
- wprintf("<hr /><div class=\"buttons\"> "
+ w
c_printf("<hr /><div class=\"buttons\"> "
"<span class=\"button_link\"><a href=\".\">");
- wprintf(_("Log in again"));
- wprintf("</a></span> <span class=\"button_link\">"
+ wc_printf(_("Log in again"));
+ wc_printf("</a></span>");
+
+ /* The "close window" link is commented out because some browsers don't
+ * allow it to work.
+ *
+ wc_printf(" <span class=\"button_link\">"
"<a href=\"javascript:window.close();\">");
- wprintf(_("Close window"));
- wprintf("</a></span></div></div></div></div>\n");
+ wc_printf(_("Close window"));
+ wc_printf("</a></span>");
+ */
+
+ wc_printf("</div></div></div>\n");
wDumpContent(2);
end_webcit_session();
}
int a;
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n");
- wprintf("<h1>");
- wprintf(_("Validate new users"));
- wprintf("</h1>");
- wprintf("</div>\n");
+ w
c_printf("<div id=\"banner\">\n");
+ wc_printf("<h1>");
+ wc_printf(_("Validate new users"));
+ wc_printf("</h1>");
+ wc_printf("</div>\n");
- wprintf("<div id=\"content\" class=\"service\">\n");
+ w
c_printf("<div id=\"content\" class=\"service\">\n");
/* If the user just submitted a validation, process it... */
safestrncpy(buf, bstr("user"), sizeof buf);
serv_printf("VALI %s|%s", buf, bstr("axlevel"));
serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
- wprintf("<b>%s</b><br />\n", &buf[4]);
+ wc_printf("<b>%s</b><br>\n", &buf[4]);
}
}
}
serv_puts("GNUR");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("<b>");
- wprintf(_("No users require validation at this time."));
- wprintf("</b><br />\n");
+ wc_printf("<b>");
+ wc_printf(_("No users require validation at this time."));
+ wc_printf("</b><br>\n");
wDumpContent(1);
return;
}
if (buf[0] != '3') {
- wprintf("<b>%s</b><br />\n", &buf[4]);
+ wc_printf("<b>%s</b><br>\n", &buf[4]);
wDumpContent(1);
return;
}
- wprintf("<div class=\"fix_scrollbar_bug\">"
+ w
c_printf("<div class=\"fix_scrollbar_bug\">"
"<table class=\"auth_validate\"><tr><td>\n");
- wprintf("<center>");
+ wc_printf("<div id=\"validate\">");
safestrncpy(user, &buf[4], sizeof user);
serv_printf("GREG %s", user);
serv_getln(buf, sizeof buf);
++a;
if (a == 1)
- wprintf("#%s<br /><H1>%s</H1>",
+ wc_printf("#%s<br><H1>%s</H1>",
buf, &cmd[4]);
if (a == 2) {
char *pch;
pch = _("strong");
}
- wprintf("PW: %s<br />\n", pch);
+ wc_printf("PW: %s<br>\n", pch);
}
if (a == 3)
- wprintf("%s<br />\n", buf);
+ wc_printf("%s<br>\n", buf);
if (a == 4)
- wprintf("%s<br />\n", buf);
+ wc_printf("%s<br>\n", buf);
if (a == 5)
- wprintf("%s, ", buf);
+ wc_printf("%s, ", buf);
if (a == 6)
- wprintf("%s ", buf);
+ wc_printf("%s ", buf);
if (a == 7)
- wprintf("%s<br />\n", buf);
+ wc_printf("%s<br>\n", buf);
if (a == 8)
- wprintf("%s<br />\n", buf);
+ wc_printf("%s<br>\n", buf);
if (a == 9)
- wprintf(_("Current access level: %d (%s)\n"),
+ wc_printf(_("Current access level: %d (%s)\n"),
atoi(buf), axdefs[atoi(buf)]);
} while (strcmp(buf, "000"));
} else {
- wprintf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
+ wc_printf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
}
- wprintf("<hr />");
- wprintf(_("Select access level for this user:"));
- wprintf("<br />\n");
+ wc_printf("<hr />");
+ wc_printf(_("Select access level for this user:"));
+ wc_printf("<br />\n");
for (a = 0; a <= 6; ++a) {
- wprintf("<a href=\"validate?nonce=%d?user=", WC->nonce);
+ w
c_printf("<a href=\"validate?nonce=%d?user=", WC->nonce);
urlescputs(user);
- wprintf("&axlevel=%d\">%s</A> \n",
+ wc_printf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
}
- wprintf("<br />\n");
+ wc_printf("<br />\n");
- wprintf("</CENTER>\n");
- wprintf("</td></tr></table></div>\n");
+ wc_printf("</div>\n");
+ wc_printf("</td></tr></table></div>\n");
wDumpContent(1);
}
*/
void display_reg(int during_login)
{
+ folder Room;
+ StrBuf *Buf;
+ message_summary *VCMsg = NULL;
+ wc_mime_attachment *VCAtt = NULL;
long vcard_msgnum;
- if (goto_config_room() != 0) {
- if (during_login) do_welcome();
- else display_main_menu();
+ Buf = NewStrBuf();
+ memset(&Room, 0, sizeof(folder));
+ if (goto_config_room(Buf, &Room) != 0) {
+ lprintf(9, "display_reg() exiting because goto_config_room() failed\n");
+ if (during_login) {
+ do_welcome();
+ }
+ else {
+ display_main_menu();
+ }
+ FreeStrBuf(&Buf);
+ FlushFolder(&Room);
return;
}
+ FlushFolder(&Room);
- vcard_msgnum = locate_user_vcard(WC->wc_fullname, -1);
+ FreeStrBuf(&Buf);
+ vcard_msgnum = locate_user_vcard_in_this_room(&VCMsg, &VCAtt);
if (vcard_msgnum < 0L) {
- if (during_login) do_welcome();
- else display_main_menu();
+ lprintf(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
+ if (during_login) {
+ do_welcome();
+ }
+ else {
+ display_main_menu();
+ }
return;
}
if (during_login) {
- do_edit_vcard(vcard_msgnum, "1", "do_welcome", USERCONFIGROOM);
+ do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM);
}
else {
- do_edit_vcard(vcard_msgnum, "1", "display_main_menu", USERCONFIGROOM);
+ StrBuf *ReturnTo;
+ ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst="));
+ StrBufAppendBuf(ReturnTo, WC->CurRoom.name, 0);
+ do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM);
+ FreeStrBuf(&ReturnTo);
}
+ /* FIXME - don't we have to free VCMsg and VCAtt ?? */
}
*/
void display_changepw(void)
{
+ WCTemplputParams SubTP;
char buf[SIZ];
-
+ StrBuf *Buf;
output_headers(1, 1, 1, 0, 0, 0);
- svput("BOXTITLE", WCS_STRING, _("Change your password"));
- do_template("beginbox", NULL);
+ Buf = NewStrBufPlain(_("Change your password"), -1);
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ SubTP.Filter.ContextType = CTX_STRBUF;
+ SubTP.Context = Buf;
+ DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+
+ FreeStrBuf(&Buf);
if (!IsEmptyStr(WC->ImportantMessage)) {
- wprintf("<span class=\"errormsg\">"
+ wc_printf("<span class=\"errormsg\">"
"%s</span><br />\n", WC->ImportantMessage);
safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
}
fmout("CENTER");
}
- wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
- wprintf("<table class=\"altern\" ");
- wprintf("<tr class=\"even\"><td>");
- wprintf(_("Enter new password:"));
- wprintf("</td><td>");
- wprintf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
- wprintf("<tr class=\"odd\"><td>");
- wprintf(_("Enter it again to confirm:"));
- wprintf("</td><td>");
- wprintf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
- wprintf("</table>\n");
-
- wprintf("<div class=\"buttons\">\n");
- wprintf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
- wprintf(" ");
- wprintf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
- wprintf("</div>\n");
- wprintf("</form>\n");
+ wc_printf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
+ wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+ w
c_printf("<table class=\"altern\" ");
+ wc_printf("<tr class=\"even\"><td>");
+ wc_printf(_("Enter new password:"));
+ wc_printf("</td><td>");
+ wc_printf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
+ wc_printf("<tr class=\"odd\"><td>");
+ wc_printf(_("Enter it again to confirm:"));
+ wc_printf("</td><td>");
+ wc_printf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
+ wc_printf("</table>\n");
+
+ w
c_printf("<div class=\"buttons\">\n");
+ wc_printf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
+ wc_printf(" ");
+ wc_printf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
+ wc_printf("</div>\n");
+ wc_printf("</form>\n");
do_template("endbox", NULL);
wDumpContent(1);
serv_getln(buf, sizeof buf);
sprintf(WC->ImportantMessage, "%s", &buf[4]);
if (buf[0] == '2') {
- safestrncpy(WC->wc_password, buf, sizeof WC->wc_password);
+ if (WC->wc_password == NULL)
+ WC->wc_password = NewStrBufPlain(buf, -1);
+ else {
+ FlushStrBuf(WC->wc_password);
+ StrBufAppendBufPlain(WC->wc_password, buf, -1, 0);
+ }
display_main_menu();
}
else {
}
}
-int ConditionalAide(WCTemplateToken *Token, void *Context, int ContextType)
+int ConditionalHaveAccessCreateRoom(StrBuf *Target, WCTemplputParams *TP)
{
- return (WC->is_aide == 0);
+ StrBuf *Buf;
+
+ Buf = NewStrBuf();
+ serv_puts("CRE8 0");
+ StrBuf_ServGetln(Buf);
+
+ if (GetServerStatus(Buf, NULL) == 2) {
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage(SKEY(Buf));
+ FreeStrBuf(&Buf);
+ return 0;
+ }
+ FreeStrBuf(&Buf);
+ return 1;
+}
+
+int ConditionalAide(StrBuf *Target, WCTemplputParams *TP)
+{
+ wcsession *WCC = WC;
+ return (WCC != NULL)? (WC->is_aide == 0) : 0;
}
-int ConditionalRoomAide(WCTemplateToken *Token, void *Context, int ContextType)
+int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP)
{
- return (WC->is_room_aide == 0);
+ wcsession *WCC = WC;
+ return (WCC != NULL)? (WCC->logged_in == 0) : 0;
}
+void _display_openid_login(void) {
+ display_openid_login(NULL);
+}
-void _display_openid_login(void) {display_openid_login(NULL);}
-void _display_reg(void) {display_reg(0);}
+void _display_reg(void) {
+ display_reg(0);
+}
+
+
+void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+ if (hdr->HR.got_auth == NO_AUTH) /* don't override cookie auth... */
+ {
+ if (strncasecmp(ChrPtr(Line), "Basic", 5) == 0) {
+ StrBufCutLeft(Line, 6);
+ StrBufDecodeBase64(Line);
+ hdr->HR.plainauth = Line;
+ hdr->HR.got_auth = AUTH_BASIC;
+ }
+ else
+ lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
+ }
+}
+
+void CheckAuthBasic(ParsedHttpHdrs *hdr)
+{
+/*
+ todo: enable this if we can have other sessions than authenticated ones.
+ if (hdr->DontNeedAuth)
+ return;
+*/
+ StrBufAppendBufPlain(hdr->HR.plainauth, HKEY(":"), 0);
+ StrBufAppendBuf(hdr->HR.plainauth, hdr->HR.user_agent, 0);
+ hdr->HR.SessionKey = hashlittle(SKEY(hdr->HR.plainauth), 89479832);
+/*
+ lprintf(1, "CheckAuthBasic: calculated sessionkey %ld\n",
+ hdr->HR.SessionKey);
+*/
+}
+
+void GetAuthBasic(ParsedHttpHdrs *hdr)
+{
+ const char *Pos = NULL;
+ if (hdr->c_username == NULL)
+ hdr->c_username = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
+ if (hdr->c_password == NULL)
+ hdr->c_password = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
+ StrBufExtract_NextToken(hdr->c_username, hdr->HR.plainauth, &Pos, ':');
+ StrBufExtract_NextToken(hdr->c_password, hdr->HR.plainauth, &Pos, ':');
+}
+
+void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+ const char *pch;
+/*
+ todo: enable this if we can have other sessions than authenticated ones.
+ if (hdr->DontNeedAuth)
+ return;
+*/
+ pch = strstr(ChrPtr(Line), "webcit=");
+ if (pch == NULL) {
+ return;
+ }
+
+ hdr->HR.RawCookie = Line;
+ StrBufCutLeft(hdr->HR.RawCookie, (pch - ChrPtr(hdr->HR.RawCookie)) + 7);
+ StrBufDecodeHex(hdr->HR.RawCookie);
+
+ cookie_to_stuff(Line, &hdr->HR.desired_session,
+ hdr->c_username,
+ hdr->c_password,
+ hdr->c_roomname,
+ hdr->c_language
+ );
+ hdr->HR.got_auth = AUTH_COOKIE;
+}
+
+void
+HttpNewModule_AUTH
+(ParsedHttpHdrs *httpreq)
+{
+ httpreq->c_username = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
+ httpreq->c_password = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
+ httpreq->c_roomname = NewStrBuf();
+ httpreq->c_language = NewStrBuf();
+}
+void
+HttpDetachModule_AUTH
+(ParsedHttpHdrs *httpreq)
+{
+ FLUSHStrBuf(httpreq->c_username);
+ FLUSHStrBuf(httpreq->c_password);
+ FLUSHStrBuf(httpreq->c_roomname);
+ FLUSHStrBuf(httpreq->c_language);
+}
+
+void
+HttpDestroyModule_AUTH
+(ParsedHttpHdrs *httpreq)
+{
+ FreeStrBuf(&httpreq->c_username);
+ FreeStrBuf(&httpreq->c_password);
+ FreeStrBuf(&httpreq->c_roomname);
+ FreeStrBuf(&httpreq->c_language);
+}
void
InitModule_AUTH
(void)
{
- WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("display_openid_login"), _display_openid_login, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("openid_login"), do_openid_login, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("finalize_openid_login"), finalize_openid_login, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("openid_manual_create"), openid_manual_create, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("do_logout"), do_logout, 0);
- WebcitAddUrlHandler(HKEY("validate"), validate, 0);
- WebcitAddUrlHandler(HKEY("display_reg"), _display_reg, 0);
- WebcitAddUrlHandler(HKEY("display_changepw"), display_changepw, 0);
- WebcitAddUrlHandler(HKEY("changepw"), changepw, 0);
- WebcitAddUrlHandler(HKEY("termquit"), do_logout, 0);
+ initialize_axdefs();
+ RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie);
+ RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth);
+
+ WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */
+ WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED);
+ WebcitAddUrlHandler(HKEY("login"), "", 0, do_login, ANONYMOUS|COOKIEUNNEEDED);
+ WebcitAddUrlHandler(HKEY("display_openid_login"), "", 0, _display_openid_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("openid_login"), "", 0, do_openid_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("finalize_openid_login"), "", 0, finalize_openid_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("openid_manual_create"), "", 0, openid_manual_create, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+ WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0);
+ WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0);
+ WebcitAddUrlHandler(HKEY("display_changepw"), "", 0, display_changepw, 0);
+ WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0);
+ WebcitAddUrlHandler(HKEY("termquit"), "", 0, do_logout, 0);
RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
- RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
-
+ RegisterConditional(HKEY("COND:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE);
+ RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2, ConditionalHaveAccessCreateRoom, CTX_NONE);
return ;
}
+
+
+void
+SessionDestroyModule_AUTH
+(wcsession *sess)
+{
+ FreeStrBuf(&sess->wc_username);
+ FreeStrBuf(&sess->wc_fullname);
+ FreeStrBuf(&sess->wc_password);
+ FreeStrBuf(&sess->httpauth_pass);
+ FreeStrBuf(&sess->cs_inet_email);
+}
projects / citadel.git / blobdiff