/*
- * $Id$
- *
- * 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
*
- * 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");
}
}
-void display_openid_name_request(const StrBuf *claimed_id, const StrBuf *username)
-{
- StrBuf *Buf = NULL;
-
- output_headers(1, 1, 2, 0, 0, 0);
- wc_printf("<div id=\"login_screen\">\n");
-
- Buf = NewStrBufPlain(NULL, StrLength(claimed_id));
- StrEscAppend(Buf, claimed_id, NULL, 0, 0);
- svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID <tt>%s</tt> was successfully verified."),
- ChrPtr(Buf));
- SVPutBuf("CLAIMED_ID", Buf, 0);
-
-
- if (StrLength(username) > 0) {
- Buf = NewStrBufPlain(NULL, StrLength(username));
- StrEscAppend(Buf, username, NULL, 0, 0);
- svprintf(HKEY("REASON"), WCS_STRING,
- _("However, the user name '%s' conflicts with an existing user."),
- ChrPtr(Buf));
- FreeStrBuf(&Buf);
- }
- 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>"),
- ChrPtr(WC->serv_info->serv_humannode));
-
- do_template("openid_manual_create", NULL);
- wDumpContent(2);
-}
-
/* 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
*/
do_welcome();
}
} else {
- display_openid_name_request(sbstr("openid_url"), sbstr("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();
}
}
*/
void do_openid_login(void)
{
- wcsession *WCC = WC;
char buf[4096];
if (havebstr("language")) {
}
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"), ChrPtr(WCC->Hdr->HR.http_host),
- (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->HR.http_host)
+ ChrPtr(site_prefix),
+ ChrPtr(site_prefix)
);
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 if (!strcasecmp(ChrPtr(result), "verify_only")) {
- display_openid_name_request(claimed_id, username);
+ 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 {
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);
wc_printf("<br />\n");
wc_printf("</div>\n");
- wc_printf("</td></tr></table></div>\n");
+ wc_printf("</td></tr></table>\n");
wDumpContent(1);
}
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("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX);
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);
+
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