/*
* $Id$
- */
-/**
*
- * \defgroup WebcitAuth WebcitAuth; Handles authentication of users to a Citadel server.
- * \ingroup CitadelConfig
+ * WebcitAuth; Handles authentication of users to a Citadel server.
*/
-/*@{*/
#include "webcit.h"
-
-
-/**
- * \brief user states
+/*
+ * user states
* the plain text states of a user. filled in at \ function TODO initialize_ax_defs()
* due to NLS
*/
-/**
- * \brief Display the login screen
- * \param mesg The error message if last attempt failed.
+/*
+ * Display the login screen
+ * mesg = the error message if last attempt failed.
*/
void display_login(char *mesg)
{
if (mesg != NULL) if (!IsEmptyStr(mesg)) {
stresc(buf, SIZ, mesg, 0, 0);
- svprintf("mesg", WCS_STRING, "%s", buf);
+ svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
}
- svprintf("LOGIN_INSTRUCTIONS", WCS_STRING,
+ 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." "
serv_info.serv_humannode
);
- svprintf("USERNAME_BOX", WCS_STRING, "%s", _("User name:"));
- svprintf("PASSWORD_BOX", WCS_STRING, "%s", _("Password:"));
- svprintf("LANGUAGE_BOX", WCS_STRING, "%s", _("Language:"));
- svprintf("LOGIN_BUTTON", WCS_STRING, "%s", _("Login"));
- svprintf("NEWUSER_BUTTON", WCS_STRING, "%s", _("New User"));
- svprintf("EXIT_BUTTON", WCS_STRING, "%s", _("Exit"));
- svprintf("hello", WCS_SERVCMD, "MESG hello");
- svprintf(
"BOXTITLE", WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
+ 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) {
- svp
rintf("NEWUSER_BUTTON_PRE", WCS_STRING, "<div style=\"display:none;\">");
- svprintf("NEWUSER_BUTTON_POST", WCS_STRING, "</div>");
+ svp
ut("NEWUSER_BUTTON_PRE", WCS_STRING, "<div style=\"display:none;\">");
+ svput("NEWUSER_BUTTON_POST", WCS_STRING, "</div>");
}
else {
- svprintf("NEWUSER_BUTTON_PRE", WCS_STRING, "");
- svprintf("NEWUSER_BUTTON_POST", WCS_STRING, "");
- }
+ svput("NEWUSER_BUTTON_PRE", WCS_STRING, "");
+ svput("NEWUSER_BUTTON_POST", WCS_STRING, "");
+ }
+
+#ifdef TECH_PREVIEW
+ 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, "");
+#endif
do_template("login");
-/** \brief Initialize the session
+/*
+ * Display the openid-enabled login screen
+ * mesg = the error message if last attempt failed.
+ */
+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>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");
+ wDumpContent(2);
+}
+
+
+
+
+/* Initialize the session
+ *
* This function needs to get called whenever the session changes from
* not-logged-in to logged-in, either by an explicit login by the user or
* by a timed-out session automatically re-establishing with a little help
* from the browser cookie. Either way, we need to load access controls and
* preferences from the server.
*
- * \param user the username
- * \param pass his password
- * \param serv_response The parameters returned from a Citadel USER or NEWU command
+ * user the username
+ * 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)
{
}
-/**
- * \brief Login Checks
- * the logics to detect invalid passwords not to get on citservers nerves
+/*
+ * Perform authentication using a user name and password
*/
void do_login(void)
{
char buf[SIZ];
- if (!IsEmptyStr(bstr("language"))) {
+ if (havebstr("language")) {
set_selected_language(bstr("language"));
go_selected_language();
}
- if (!IsEmptyStr(bstr("exit_action"))) {
+ if (havebstr("exit_action")) {
do_logout();
return;
}
- if (!IsEmptyStr(bstr("login_action"))) {
+ if (havebstr("login_action")) {
serv_printf("USER %s", bstr("name"));
serv_getln(buf, sizeof buf);
if (buf[0] == '3') {
return;
}
}
- if (!IsEmptyStr(bstr("newuser_action"))) {
- if (IsEmptyStr(bstr("pass"))) {
+ if (havebstr("newuser_action")) {
+ if (!havebstr("pass")) {
display_login(_("Blank passwords are not allowed."));
return;
}
}
-/**
- * \brief display the user a welcome screen.
+
+
+
+/*
+ * Perform authentication using OpenID
+ */
+void do_openid_login(void)
+{
+ if (havebstr("language")) {
+ set_selected_language(bstr("language"));
+ go_selected_language();
+ }
+
+ if (havebstr("exit_action")) {
+ do_logout();
+ return;
+ }
+ if (havebstr("login_action")) {
+
+ fetch_http(bstr("openid_url")); // FIXME
+
+ }
+ if (WC->logged_in) {
+ if (WC->need_regi) {
+ display_reg(1);
+ } else {
+ do_welcome();
+ }
+ } else {
+ display_openid_login(_("Your password was not accepted."));
+ }
+
+}
+
+
+
+
+
+
+
+
+/*
+ * display the user a welcome screen.
+ *
* if this is the first time login, and the web based setup is enabled,
* lead the user through the setup routines
*/
}
#endif
- /**
+ /*
* Go to the user's preferred start page
*/
get_preference("startpage", buf, sizeof buf);
}
-/**
+/*
* Disconnect from the Citadel server, and end this WebCit session
*/
void end_webcit_session(void) {
/* close() of citadel socket will be done by do_housekeeping() */
}
-/**
+/*
* execute the logout
*/
void do_logout(void)
"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>",
+ _("Read More..."));
}
wprintf("<hr /><div class=\"buttons\"> "
}
-/* *
+/*
* validate new users
*/
void validate(void)
wprintf("<div id=\"content\" class=\"service\">\n");
- /** If the user just submitted a validation, process it... */
+ /* If the user just submitted a validation, process it... */
safestrncpy(buf, bstr("user"), sizeof buf);
if (!IsEmptyStr(buf)) {
- if (!IsEmptyStr(bstr("axlevel"))) {
+ if (havebstr("axlevel")) {
serv_printf("VALI %s|%s", buf, bstr("axlevel"));
serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
}
}
- /** Now see if any more users require validation. */
+ /* Now see if any more users require validation. */
serv_puts("GNUR");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
-/**
- * \brief Display form for registration.
+/*
+ * Display form for registration.
+ *
* (Set during_login to 1 if this registration is being performed during
* new user login and will require chaining to the proper screen.)
- * \param during_login are we just in the login phase?
*/
void display_reg(int during_login)
{
-/**
+/*
* display form for changing your password
*/
void display_changepw(void)
output_headers(1, 1, 1, 0, 0, 0);
- svprintf("BOXTITLE", WCS_STRING, _("Change your password"));
+ svput("BOXTITLE", WCS_STRING, _("Change your password"));
do_template("beginbox");
if (!IsEmptyStr(WC->ImportantMessage)) {
wDumpContent(1);
}
-/**
- * \brief change password
+/*
+ * change password
* if passwords match, propagate it to citserver.
*/
void changepw(void)
char buf[SIZ];
char newpass1[32], newpass2[32];
- if (IsEmptyStr(bstr("change_action"))) {
+ if (!havebstr("change_action")) {
safestrncpy(WC->ImportantMessage,
_("Cancelled. Password was not changed."),
sizeof WC->ImportantMessage);
-/** @} */
+void InitModule_AUTH(void)
+{
+ WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, 0);
+ return ;
+}
projects / citadel.git / blobdiff