/*
- * auth.c
+ * $Id$
*
- * This file contains code which relates to authentication of users to Citadel.
+ * Handles authentication of users to a Citadel server.
*
- * $Id$
*/
-
-#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[] =
{
char buf[SIZ];
- output_headers(3);
+ output_headers(1, 1, 2, 0, 0, 0);
+ wprintf("<div style=\"position:absolute; top:20px; left:20px; right:20px\">\n");
if (mesg != NULL) if (strlen(mesg) > 0) {
- stresc(buf, mesg, 0);
+ stresc(buf, mesg, 0, 0);
svprintf("mesg", WCS_STRING, "%s", buf);
}
+ svprintf("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
+ );
+
+ 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 Citadel"),
+ serv_info.serv_humannode);
do_template("login");
- clear_local_substs();
- wDumpContent(0); /* No menu here; not logged in yet! */
+ wDumpContent(2);
}
char buf[SIZ];
WC->logged_in = 1;
- extract(WC->wc_username, &serv_response[4], 0);
- strcpy(WC->wc_password, pass);
+ extract_token(WC->wc_username, &serv_response[4], 0, '|', 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);
}
}
{
char buf[SIZ];
- if (!strcasecmp(bstr("action"), "Exit")) {
+ if (strlen(bstr("exit_action")) > 0) {
do_logout();
return;
}
- if (!strcasecmp(bstr("action"), "Login")) {
+ if (strlen(bstr("login_action")) > 0) {
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 (strlen(bstr("newuser_action")) > 0) {
+ if (strlen(bstr("pass")) == 0) {
+ 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)
{
- char startpage[SIZ];
+ 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) {
+ sprintf(wizard_filename, "setupwiz.%s.%s",
+ ctdlhost, ctdlport);
+ for (i=0; i<strlen(wizard_filename); ++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 */
+ }
+ }
+ }
- get_preference("startpage", startpage);
- if (strlen(startpage)==0) {
- strcpy(startpage, "/dotskip&room=_BASEROOM_");
- set_preference("startpage", startpage);
+ if (!setup_wizard) {
+ http_redirect("/setup_wizard");
+ }
}
-
- svprintf("STARTPAGE", WCS_STRING, startpage);
-
- do_template("mainframeset");
- clear_local_substs();
+#endif
+
+ /*
+ * Go to the user's preferred start page
+ */
+ get_preference("startpage", buf, sizeof buf);
+ if (strlen(buf)==0) {
+ safestrncpy(buf, "/dotskip&room=_BASEROOM_", sizeof buf);
+ set_preference("startpage", buf, 1);
+ }
+ http_redirect(buf);
}
{
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);
- output_headers(2); /* note "2" causes cookies to be unset */
+ /* Calling output_headers() this way causes the cookies to be un-set */
+ output_headers(1, 1, 0, 1, 0, 0);
- wprintf("<CENTER>");
+ wprintf("<center>");
serv_puts("MESG goodbye");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (WC->serv_sock >= 0) {
if (buf[0] == '1') {
- fmout(NULL);
+ 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("<HR><A HREF=\"/\">Log in again</A> "
- "<A HREF=\"javascript:window.close();\">Close window</A>"
- "</CENTER>\n");
+ wprintf("<hr /><a href=\"/\">Log in again</A> "
+ "<a href=\"javascript:window.close();\">");
+ wprintf(_("Close window"));
+ wprintf("</a></center>\n");
wDumpContent(2);
end_webcit_session();
}
-
/*
* validate new users
*/
char buf[SIZ];
int a;
- output_headers(3);
+ output_headers(1, 1, 2, 0, 0, 0);
+ wprintf("<div id=\"banner\">\n"
+ "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+ "<SPAN CLASS=\"titlebar\">");
+ wprintf(_("Validate new users"));
+ wprintf("</SPAN></TD></TR></TABLE>\n</div>\n<div id=\"content\">\n");
- strcpy(buf, bstr("user"));
+ safestrncpy(buf, bstr("user"), sizeof buf);
if (strlen(buf) > 0)
- if (strlen(bstr("WC->axlevel")) > 0) {
- serv_printf("VALI %s|%s", buf, bstr("WC->axlevel"));
- serv_gets(buf);
+ if (strlen(bstr("axlevel")) > 0) {
+ serv_printf("VALI %s|%s", buf, bstr("axlevel"));
+ 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);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '3') {
- wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+ wprintf("<b>%s</b><br />\n", &buf[4]);
wDumpContent(1);
return;
}
- strcpy(user, &buf[4]);
+
+ wprintf("<div id=\"fix_scrollbar_bug\">"
+ "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+ wprintf("<center>");
+
+ 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("User #%s<br /><H1>%s</H1>",
buf, &cmd[4]);
if (a == 2)
- wprintf("PW: %s<BR>\n", buf);
+ wprintf("PW: %s<br />\n", buf);
if (a == 3)
- wprintf("%s<BR>\n", buf);
+ wprintf("%s<br />\n", buf);
if (a == 4)
- wprintf("%s<BR>\n", buf);
+ wprintf("%s<br />\n", buf);
if (a == 5)
wprintf("%s, ", buf);
if (a == 6)
wprintf("%s ", buf);
if (a == 7)
- wprintf("%s<BR>\n", buf);
+ wprintf("%s<br />\n", buf);
if (a == 8)
- wprintf("%s<BR>\n", buf);
+ 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("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
}
- wprintf("<CENTER><TABLE border><CAPTION>Select access level:");
- wprintf("</CAPTION><TR>");
+ wprintf("<hr />");
+ wprintf(_("Select access level for this user:"));
+ wprintf("<br />\n");
for (a = 0; a <= 6; ++a) {
- wprintf("<TD><A HREF=\"/validate&user=");
+ wprintf("<A HREF=\"/validate&user=");
urlescputs(user);
- wprintf("&WC->axlevel=%d\">%s</A></TD>\n",
+ wprintf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
}
- wprintf("</TR></TABLE><CENTER><BR>\n");
+ wprintf("<br />\n");
+
+ wprintf("</CENTER>\n");
+ wprintf("</td></tr></table></div>\n");
wDumpContent(1);
}
{
char buf[SIZ];
- output_headers(3);
+ output_headers(1, 1, 2, 0, 0, 0);
+ wprintf("<div id=\"banner\">\n"
+ "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+ "<SPAN CLASS=\"titlebar\">");
+ wprintf(_("Change your password"));
+ wprintf("</SPAN>"
+ "</TD></TR></TABLE>\n"
+ "</div>\n<div id=\"content\">\n"
+ );
+
+ if (strlen(WC->ImportantMessage) > 0) {
+ do_template("beginbox_nt");
+ wprintf("<SPAN CLASS=\"errormsg\">"
+ "%s</SPAN><br />\n", WC->ImportantMessage);
+ do_template("endbox");
+ safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+ }
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
- wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
- wprintf("<B>Change your password</B>\n");
- wprintf("</FONT></TD></TR></TABLE>\n");
+ wprintf("<div id=\"fix_scrollbar_bug\">"
+ "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
- wprintf("<CENTER>");
+ wprintf("<CENTER><br />");
serv_puts("MESG changepw");
- serv_gets(buf);
- if (buf[0] == '1')
- fmout(NULL);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '1') {
+ fmout("CENTER");
+ }
- wprintf("<FORM ACTION=\"changepw\" METHOD=\"POST\">\n");
- wprintf("<CENTER><TABLE border><TR><TD>Enter new password:</TD>\n");
+ wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
+ wprintf("<CENTER>"
+ "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
+ "BGCOLOR=\"#EEEEEE\">"
+ "<TR><TD>");
+ wprintf(_("Enter new password:"));
+ wprintf("</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("<TR><TD>");
+ wprintf(_("Enter it again to confirm:"));
+ wprintf("</TD>\n");
wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
- wprintf("</TABLE>\n");
- wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n");
- wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
- wprintf("</CENTER>\n");
+
+ wprintf("</TABLE><br />\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("</form></center>\n");
+ wprintf("</td></tr></table></div>\n");
wDumpContent(1);
}
char buf[SIZ];
char newpass1[32], newpass2[32];
- if (strcmp(bstr("action"), "Change")) {
- display_error("Cancelled. Password was not changed.");
+ if (strlen(bstr("change_action")) == 0) {
+ 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)) {
- display_error("They don't match. Password was not changed.");
+ safestrncpy(WC->ImportantMessage,
+ _("They don't match. Password was not changed."),
+ sizeof WC->ImportantMessage);
+ display_changepw();
return;
}
+
+ if (strlen(newpass1) == 0) {
+ safestrncpy(WC->ImportantMessage,
+ _("Blank passwords are not allowed."),
+ sizeof WC->ImportantMessage);
+ display_changepw();
+ return;
+ }
+
serv_printf("SETP %s", newpass1);
- serv_gets(buf);
- if (buf[0] == '2')
- display_success(&buf[4]);
- else
- display_error(&buf[4]);
+ 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();
+ }
}
projects / citadel.git / blobdiff