/*
- * auth.c
- *
- * This file contains code which relates to authentication of users to Citadel.
- *
* $Id$
+ *
+ * WebcitAuth; Handles authentication of users to a Citadel server.
*/
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
#include "webcit.h"
-
-char *axdefs[] =
-{
- "Deleted",
- "New User",
- "Problem User",
- "Local User",
- "Network User",
- "Preferred User",
- "Aide"
-};
+#include "webserver.h"
/*
+ * Access level definitions. This is initialized from a function rather than a
+ * static array so that the strings may be localized.
+ */
+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 */
+}
+
+
+
+
+/*
* Display the login screen
+ * mesg = the error message if last attempt failed.
*/
void display_login(char *mesg)
{
char buf[SIZ];
- output_headers(1, 1, 2, 0, 0, 0, 0);
- wprintf("<div id=\"text\">\n");
+ output_headers(1, 1, 2, 0, 0, 0);
+ wprintf("<div id=\"login_screen\">\n");
- if (mesg != NULL) if (strlen(mesg) > 0) {
- stresc(buf, mesg, 0, 0);
- svprintf("mesg", WCS_STRING, "%s", buf);
+ if (mesg != NULL) if (!IsEmptyStr(mesg)) {
+ stresc(buf, SIZ, mesg, 0, 0);
+ svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
}
- svprintf("hello", WCS_SERVCMD, "MESG hello");
- svprintf("BOXTITLE", WCS_STRING, "%s - powered by Citadel",
+ 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, "");
+ }
+
+#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");
-/*
+/*
+ * 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.
+ *
+ * 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)
{
char buf[SIZ];
WC->logged_in = 1;
- extract(WC->wc_username, &serv_response[4], 0);
- strcpy(WC->wc_password, pass);
+ 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;
load_preferences();
serv_puts("CHEK");
- serv_gets(buf);
+ 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(WC->cs_inet_email, &buf[4], 3);
+ extract_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email);
}
+
+ get_preference("current_iconbar", buf, sizeof buf);
+ WC->current_iconbar = atoi(buf);
+
+ get_preference("floordiv_expanded", WC->floordiv_expanded, sizeof WC->floordiv_expanded);
}
+/*
+ * Perform authentication using a user name and password
+ */
void do_login(void)
{
char buf[SIZ];
- if (!strcasecmp(bstr("action"), "Exit")) {
+ if (havebstr("language")) {
+ set_selected_language(bstr("language"));
+ go_selected_language();
+ }
+
+ if (havebstr("exit_action")) {
do_logout();
return;
}
- if (!strcasecmp(bstr("action"), "Login")) {
+ if (havebstr("login_action")) {
serv_printf("USER %s", bstr("name"));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '3') {
serv_printf("PASS %s", bstr("pass"));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
become_logged_in(bstr("name"),
bstr("pass"), buf);
return;
}
}
- if (!strcasecmp(bstr("action"), "New User")) {
+ if (havebstr("newuser_action")) {
+ if (!havebstr("pass")) {
+ display_login(_("Blank passwords are not allowed."));
+ return;
+ }
serv_printf("NEWU %s", bstr("name"));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
become_logged_in(bstr("name"), bstr("pass"), buf);
serv_printf("SETP %s", bstr("pass"));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
} else {
display_login(&buf[4]);
return;
do_welcome();
}
} else {
- display_login("Your password was not accepted.");
+ display_login(_("Your password was not accepted."));
}
}
-void do_welcome(void)
+
+/*
+ * Perform authentication using OpenID
+ * assemble the checkid_setup request and then redirect to the user's identity provider
+ */
+void do_openid_login(void)
{
- char startpage[SIZ];
+ char buf[4096];
- get_preference("startpage", startpage);
- if (strlen(startpage)==0) {
- strcpy(startpage, "/dotskip&room=_BASEROOM_");
- set_preference("startpage", startpage);
+ if (havebstr("language")) {
+ set_selected_language(bstr("language"));
+ go_selected_language();
}
- svprintf("STARTPAGE", WCS_STRING, startpage);
+ if (havebstr("exit_action")) {
+ do_logout();
+ return;
+ }
+ if (havebstr("login_action")) {
+ snprintf(buf, sizeof buf,
+ "OID1 %s|%s://%s/finish_openid_login|%s://%s",
+ bstr("openid_url"),
+ (is_https ? "https" : "http"), WC->http_host,
+ (is_https ? "https" : "http"), WC->http_host
+ );
- /* FIXME ... go to my start page, not to the summary */
- summary();
+ serv_puts(buf);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '2') {
+ lprintf(CTDL_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
+ http_redirect(&buf[4]);
+ return;
+ }
+ else {
+ display_openid_login(&buf[4]);
+ return;
+ }
+ }
+
+ /* If we get to this point then something failed. */
+ display_openid_login(_("Your password was not accepted."));
+}
+
+/*
+ * Complete the authentication using OpenID
+ * This function handles the positive or negative assertion from the user's Identity Provider
+ */
+void finish_openid_login(void)
+{
+ if (havebstr("openid.mode")) {
+ if (!strcasecmp(bstr("openid.mode"), "id_res")) {
+
+ display_openid_login("FIXME id accepted but the code isn't finished");
+ //FIXME finish this
+
+ }
+ }
+
+ 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
+ */
+void do_welcome(void)
+{
+ char buf[SIZ];
+#ifdef XXX_NOT_FINISHED_YET_XXX
+ FILE *fp;
+ int i;
+
+ /**
+ * See if we have to run the first-time setup wizard
+ */
+ if (WC->is_aide) {
+ if (!setup_wizard) {
+ int len;
+ sprintf(wizard_filename, "setupwiz.%s.%s",
+ ctdlhost, ctdlport);
+ len = strlen(wizard_filename);
+ for (i=0; i<len; ++i) {
+ if ( (wizard_filename[i]==' ')
+ || (wizard_filename[i] == '/')
+ ) {
+ wizard_filename[i] = '_';
+ }
+ }
+
+ fp = fopen(wizard_filename, "r");
+ if (fp != NULL) {
+ fgets(buf, sizeof buf, fp);
+ buf[strlen(buf)-1] = 0;
+ fclose(fp);
+ if (atoi(buf) == serv_info.serv_rev_level) {
+ setup_wizard = 1; /**< already run */
+ }
+ }
+ }
+
+ if (!setup_wizard) {
+ http_redirect("setup_wizard");
+ }
+ }
+#endif
+
+ /*
+ * Go to the user's preferred start page
+ */
+ get_preference("startpage", buf, sizeof buf);
+ if (IsEmptyStr(buf)) {
+ safestrncpy(buf, "dotskip&room=_BASEROOM_", sizeof buf);
+ set_preference("startpage", buf, 1);
+ }
+ if (buf[0] == '/') {
+ strcpy(buf, &buf[1]);
+ }
+ http_redirect(buf);
}
* Disconnect from the Citadel server, and end this WebCit session
*/
void end_webcit_session(void) {
+ char buf[256];
+
+ if (WC->logged_in) {
+ sprintf(buf, "%d", WC->current_iconbar);
+ set_preference("current_iconbar", buf, 0);
+ set_preference("floordiv_expanded", WC->floordiv_expanded, 1);
+ }
+
serv_puts("QUIT");
WC->killthis = 1;
/* close() of citadel socket will be done by do_housekeeping() */
}
-
+/*
+ * execute the logout
+ */
void do_logout(void)
{
char buf[SIZ];
- strcpy(WC->wc_username, "");
- strcpy(WC->wc_password, "");
- strcpy(WC->wc_roomname, "");
+ 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);
- /* Calling output_headers() this way causes the cookies to be un-set */
- output_headers(1, 1, 0, 1, 0, 0, 0);
+ /** Calling output_headers() this way causes the cookies to be un-set */
+ output_headers(1, 1, 0, 1, 0, 0);
- wprintf("<CENTER>");
+ wprintf("<div id=\"logout_screen\">");
+ wprintf("<div class=\"box\">");
+ wprintf("<div class=\"boxlabel\">");
+ wprintf(_("Log off"));
+ wprintf("</div><div class=\"boxcontent\">");
serv_puts("MESG goodbye");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (WC->serv_sock >= 0) {
if (buf[0] == '1') {
- fmout(NULL, "CENTER");
+ fmout("CENTER");
} else {
wprintf("Goodbye\n");
}
}
else {
- wprintf("This program was unable to connect or stay "
+ wprintf(_("This program was unable to connect or stay "
"connected to the Citadel server. Please report "
- "this problem to your system administrator."
+ "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 /><A HREF=\"/\">Log in again</A> "
- "<A HREF=\"javascript:window.close();\">Close window</A>"
- "</CENTER>\n");
+ wprintf("<hr /><div class=\"buttons\"> "
+ "<span class=\"button_link\"><a href=\".\">");
+ wprintf(_("Log in again"));
+ wprintf("</a></span> <span class=\"button_link\">"
+ "<a href=\"javascript:window.close();\">");
+ wprintf(_("Close window"));
+ wprintf("</a></span></div></div></div></div>\n");
wDumpContent(2);
end_webcit_session();
}
-/*
+/*
* validate new users
*/
void validate(void)
char buf[SIZ];
int a;
- output_headers(1, 1, 0, 0, 0, 0, 0);
+ output_headers(1, 1, 2, 0, 0, 0);
+ wprintf("<div id=\"banner\">\n");
+ wprintf("<h1>");
+ wprintf(_("Validate new users"));
+ wprintf("</h1>");
+ wprintf("</div>\n");
- strcpy(buf, bstr("user"));
- if (strlen(buf) > 0)
- if (strlen(bstr("axlevel")) > 0) {
+ wprintf("<div id=\"content\" class=\"service\">\n");
+
+ /* If the user just submitted a validation, process it... */
+ safestrncpy(buf, bstr("user"), sizeof buf);
+ if (!IsEmptyStr(buf)) {
+ if (havebstr("axlevel")) {
serv_printf("VALI %s|%s", buf, bstr("axlevel"));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ wprintf("<b>%s</b><br />\n", &buf[4]);
}
}
- serv_puts("GNUR");
- serv_gets(buf);
+ }
+ /* Now see if any more users require validation. */
+ 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");
+ wDumpContent(1);
+ return;
+ }
if (buf[0] != '3') {
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ wprintf("<b>%s</b><br />\n", &buf[4]);
wDumpContent(1);
return;
}
- wprintf("<CENTER>");
- do_template("beginbox_nt");
- wprintf("<CENTER>");
+ wprintf("<div class=\"fix_scrollbar_bug\">"
+ "<table class=\"auth_validate\"><tr><td>\n");
+ wprintf("<center>");
- strcpy(user, &buf[4]);
+ safestrncpy(user, &buf[4], sizeof user);
serv_printf("GREG %s", user);
- serv_gets(cmd);
+ serv_getln(cmd, sizeof cmd);
if (cmd[0] == '1') {
a = 0;
do {
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
++a;
if (a == 1)
- wprintf("User #%s<br /><H1>%s</H1>",
+ wprintf("#%s<br /><H1>%s</H1>",
buf, &cmd[4]);
if (a == 2)
wprintf("PW: %s<br />\n", buf);
if (a == 8)
wprintf("%s<br />\n", buf);
if (a == 9)
- wprintf("Current access level: %d (%s)\n",
+ wprintf(_("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]);
}
- wprintf("<hr />Select access level for this user:<br />\n");
+ wprintf("<hr />");
+ wprintf(_("Select access level for this user:"));
+ wprintf("<br />\n");
for (a = 0; a <= 6; ++a) {
- wprintf("<A HREF=\"/validate&user=");
+ wprintf("<a href=\"validate?nonce=%ld?user=", WC->nonce);
urlescputs(user);
wprintf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
wprintf("<br />\n");
wprintf("</CENTER>\n");
- do_template("endbox");
- wprintf("</CENTER>\n");
+ wprintf("</td></tr></table></div>\n");
wDumpContent(1);
}
-/*
+/*
* 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.)
*/
return;
}
- vcard_msgnum = locate_user_vcard(WC->wc_username, -1);
+ vcard_msgnum = locate_user_vcard(WC->wc_fullname, -1);
if (vcard_msgnum < 0L) {
if (during_login) do_welcome();
else display_main_menu();
}
if (during_login) {
- do_edit_vcard(vcard_msgnum, "1", "/do_welcome");
+ do_edit_vcard(vcard_msgnum, "1", "do_welcome", USERCONFIGROOM);
}
else {
- do_edit_vcard(vcard_msgnum, "1", "/display_main_menu");
+ do_edit_vcard(vcard_msgnum, "1", "display_main_menu", USERCONFIGROOM);
}
}
-/*
+/*
* display form for changing your password
*/
void display_changepw(void)
{
char buf[SIZ];
- output_headers(1, 1, 0, 0, 0, 0, 0);
+ 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");
- wprintf("<CENTER><br />");
+
+ if (!IsEmptyStr(WC->ImportantMessage)) {
+ wprintf("<span class=\"errormsg\">"
+ "%s</span><br />\n", WC->ImportantMessage);
+ safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+ }
+
serv_puts("MESG changepw");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
- fmout(NULL, "CENTER");
- }
-
- wprintf("<FORM ACTION=\"changepw\" METHOD=\"POST\">\n");
- wprintf("<CENTER>"
- "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
- "BGCOLOR=\"#EEEEEE\">"
- "<TR><TD>Enter new password:</TD>\n");
- wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
- wprintf("<TR><TD>Enter it again to confirm:</TD>\n");
- wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
- wprintf("</TABLE><br />\n");
- wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n"
- " "
- "<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
- wprintf("</CENTER>\n");
+ fmout("CENTER");
+ }
+
+ wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\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");
+
do_template("endbox");
wDumpContent(1);
}
/*
* change password
+ * if passwords match, propagate it to citserver.
*/
void changepw(void)
{
char buf[SIZ];
char newpass1[32], newpass2[32];
- if (strcmp(bstr("action"), "Change")) {
- strcpy(WC->ImportantMessage,
- "Cancelled. Password was not changed.");
+ if (!havebstr("change_action")) {
+ safestrncpy(WC->ImportantMessage,
+ _("Cancelled. Password was not changed."),
+ sizeof WC->ImportantMessage);
display_main_menu();
return;
}
- strcpy(newpass1, bstr("newpass1"));
- strcpy(newpass2, bstr("newpass2"));
+
+ safestrncpy(newpass1, bstr("newpass1"), sizeof newpass1);
+ safestrncpy(newpass2, bstr("newpass2"), sizeof newpass2);
if (strcasecmp(newpass1, newpass2)) {
- strcpy(WC->ImportantMessage,
- "They don't match. Password was not changed.");
- display_main_menu();
+ safestrncpy(WC->ImportantMessage,
+ _("They don't match. Password was not changed."),
+ sizeof WC->ImportantMessage);
+ display_changepw();
return;
}
+
+ if (IsEmptyStr(newpass1)) {
+ safestrncpy(WC->ImportantMessage,
+ _("Blank passwords are not allowed."),
+ sizeof WC->ImportantMessage);
+ display_changepw();
+ return;
+ }
+
serv_printf("SETP %s", newpass1);
- serv_gets(buf);
- strcpy(WC->ImportantMessage, &buf[4]);
- display_main_menu();
+ serv_getln(buf, sizeof buf);
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
+ if (buf[0] == '2') {
+ safestrncpy(WC->wc_password, buf, sizeof WC->wc_password);
+ display_main_menu();
+ }
+ else {
+ display_changepw();
+ }
+}
+
+
+
+void InitModule_AUTH(void)
+{
+ WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, 0);
+ return ;
}
projects / citadel.git / blobdiff