/*
- * WebcitAuth; Handles authentication of users to a Citadel server.
+ * These functions handle authentication of users to a Citadel server.
*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2011 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 open source 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
*
* 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
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 openid-enabled login screen
- * mesg = the error message if last attempt failed.
- */
-void display_openid_login(char *mesg)
-{
- begin_burst();
- output_headers(1, 0, 0, 0, 1, 0);
- do_template("openid_login", NULL);
- end_burst();
-}
-
-
-
/* Initialize the session
*
FreeStrBuf(&Buf);
}
+
+
+/*
+ * modal/ajax version of 'login' (username and password)
+ */
+void ajax_login_username_password(void) {
+ StrBuf *Buf = NewStrBuf();
+
+ serv_printf("USER %s", bstr("name"));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 3) {
+ serv_printf("PASS %s", bstr("pass"));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ become_logged_in(sbstr("name"), sbstr("pass"), Buf);
+ }
+ }
+
+ /* The client is expecting to read back a citadel protocol response */
+ wc_printf("%s", ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+}
+
+
+
/*
* Try to create an account manually after an OpenID was verified
*/
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- lprintf(CTDL_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
+ syslog(LOG_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
http_redirect(&buf[4]);
return;
}
else {
- display_openid_login(&buf[4]);
+ display_login();
return;
}
}
/* If we get to this point then something failed. */
- display_openid_login(_("Your password was not accepted."));
+ display_login();
}
/*
do_welcome();
}
} else {
- display_openid_login(_("Your password was not accepted."));
+ display_login();
}
FreeStrBuf(&result);
if (StrLength(Buf) == 0) {
StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
}
- lprintf(9, "Redirecting to user's start page: %s\n", ChrPtr(Buf));
+ syslog(9, "Redirecting to user's start page: %s\n", ChrPtr(Buf));
http_redirect(ChrPtr(Buf));
}
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 */
+ serv_puts("LOUT");
+ serv_getln(buf, sizeof buf);
WCC->logged_in = 0;
- /** Calling output_headers() this way causes the cookies to be un-set */
+ if (WC->serv_info->serv_supports_guest) {
+ display_default_landing_page();
+ return;
+ }
+
+ FlushStrBuf(WCC->CurRoom.name);
+
+ /* Calling output_headers() this way causes the cookies to be un-set */
output_headers(1, 1, 0, 1, 0, 0);
wc_printf("<div id=\"logout_screen\">");
"<span class=\"button_link\"><a href=\".\">");
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();\">");
- wc_printf(_("Close window"));
- wc_printf("</a></span>");
- */
-
wc_printf("</div></div></div>\n");
wDumpContent(2);
end_webcit_session();
return;
}
- wc_printf("<div class=\"fix_scrollbar_bug\">"
- "<table class=\"auth_validate\"><tr><td>\n");
+ wc_printf("<table class=\"auth_validate\"><tr><td>\n");
wc_printf("<div id=\"validate\">");
safestrncpy(user, &buf[4], sizeof user);
atoi(buf), axdefs[atoi(buf)]);
} while (strcmp(buf, "000"));
} else {
- wc_printf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
+ wc_printf("<H1>%s</H1>%s<br>\n", user, &cmd[4]);
}
wc_printf("<hr />");
wc_printf(_("Select access level for this user:"));
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
for (a = 0; a <= 6; ++a) {
wc_printf("<a href=\"validate?nonce=%d?user=", WC->nonce);
urlescputs(user);
wc_printf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
}
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
wc_printf("</div>\n");
- wc_printf("</td></tr></table></div>\n");
+ wc_printf("</td></tr></table>\n");
wDumpContent(1);
}
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");
+ syslog(9, "display_reg() exiting because goto_config_room() failed\n");
if (during_login) {
do_welcome();
}
FreeStrBuf(&Buf);
vcard_msgnum = locate_user_vcard_in_this_room(&VCMsg, &VCAtt);
if (vcard_msgnum < 0L) {
- lprintf(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
+ syslog(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
if (during_login) {
do_welcome();
}
}
else {
StrBuf *ReturnTo;
- ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst="));
+ ReturnTo = NewStrBufPlain(HKEY("display_main_menu?go="));
StrBufAppendBuf(ReturnTo, WC->CurRoom.name, 0);
do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM);
FreeStrBuf(&ReturnTo);
if (!IsEmptyStr(WC->ImportantMessage)) {
wc_printf("<span class=\"errormsg\">"
- "%s</span><br />\n", WC->ImportantMessage);
+ "%s</span><br>\n", WC->ImportantMessage);
safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
}
{
wcsession *WCC = WC;
return (WCC != NULL)? (WCC->logged_in == 0) : 0;
-}
-
-void _display_openid_login(void) {
- display_openid_login(NULL);
}
+
void _display_reg(void) {
display_reg(0);
}
hdr->HR.got_auth = AUTH_BASIC;
}
else
- lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
+ syslog(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
}
}
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",
+ syslog(1, "CheckAuthBasic: calculated sessionkey %ld\n",
hdr->HR.SessionKey);
*/
}
RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie);
RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth);
- WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */
+ /* no url pattern at all? Show login. */
+ WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED);
+
+ /* some of these will be removed soon */
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("do_welcome"), "", 0, do_welcome, 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);
+ WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+ WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0,
+ ajax_login_username_password, AJAX|ANONYMOUS);
RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
RegisterConditional(HKEY("COND:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE);
RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2, ConditionalHaveAccessCreateRoom, CTX_NONE);
- return ;
+ return;
}
projects / citadel.git / blobdiff