]> code.citadel.org Git - citadel.git/blobdiff - webcit/auth.c
* Started moving all of the global variables into a struct, to facilitate
[citadel.git] / webcit / auth.c
index 24fc878f0cfdaaacea1743625aeebe939bebe678..28d89efba3319e3e89520b954307fb8c47002afc 100644 (file)
@@ -17,7 +17,8 @@
 #include "webcit.h"
 #include "child.h"
 
-char *axdefs[] = {
+char *axdefs[] =
+{
        "Deleted",
        "New User",
        "Problem User",
@@ -25,16 +26,17 @@ char *axdefs[] = {
        "Network User",
        "Preferred User",
        "Aide"
-       };
+};
 
 /*
  * Display the login screen
  */
-void display_login(char *mesg) {
+void display_login(char *mesg)
+{
        char buf[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1, "_top");
+       output_headers(3);
 
        /* Da banner */
        wprintf("<CENTER><TABLE border=0 width=100%><TR><TD>\n");
@@ -43,12 +45,12 @@ void display_login(char *mesg) {
 
        if (mesg != NULL) {
                wprintf("<font size=+1><b>%s</b></font>", mesg);
-               }
-       else {
+       } else {
                serv_puts("MESG hello");
                serv_gets(buf);
-               if (buf[0]=='1') fmout(NULL);
-               }
+               if (buf[0] == '1')
+                       fmout(NULL);
+       }
 
        wprintf("</CENTER></TD></TR></TABLE></CENTER>\n");
        wprintf("<HR>\n");
@@ -63,12 +65,8 @@ void display_login(char *mesg) {
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"pass\" MAXLENGTH=\"20\"></TD>\n");
        wprintf("</TR></TABLE>\n");
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Login\">\n");
-        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"New User\">\n");
-        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Exit\">\n");
-       
-       wprintf("<BR><INPUT TYPE=\"checkbox\" NAME=\"noframes\">");
-       wprintf("<FONT SIZE=-1>Check here to disable frames</FONT>\n");
-        wprintf("</FORM></CENTER>\n");
+       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"New User\">\n");
+       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Exit\">\n");
 
        /* Da instructions */
        wprintf("<LI><EM>If you already have an account on %s,",
@@ -79,12 +77,11 @@ void display_login(char *mesg) {
        wprintf("enter the name and password you wish to use, and click\n");
        wprintf("\"New User.\"<BR><LI>");
        wprintf("<EM>Please log off properly when finished.</EM>");
-       wprintf("<LI>You must use a browser that supports <i>frames</i> ");
-       wprintf("and <i>cookies</i>.\n");
+       wprintf("<LI>You must use a browser that supports <i>cookies</i>.<BR>\n");
        wprintf("</EM></UL>\n");
 
-       wDumpContent(1);
-       }
+       wDumpContent(0);        /* No menu here; not logged in yet! */
+}
 
 
 
@@ -92,131 +89,106 @@ void display_login(char *mesg) {
 /*
  * This function needs to get called whenever a PASS or NEWU succeeds.
  */
-void become_logged_in(char *user, char *pass, char *serv_response) {
-       logged_in = 1;
-       extract(wc_username, &serv_response[4], 0);
-       strcpy(wc_password, pass);
-       axlevel = extract_int(&serv_response[4], 1);
-       if (axlevel >=6) is_aide = 1;
-       }
-
-
-void do_login(void) {
+void become_logged_in(char *user, char *pass, char *serv_response)
+{
+       WC->logged_in = 1;
+       extract(WC->wc_username, &serv_response[4], 0);
+       strcpy(WC->wc_password, pass);
+       WC->axlevel = extract_int(&serv_response[4], 1);
+       if (WC->axlevel >= 6)
+               WC->is_aide = 1;
+}
+
+
+void do_login(void)
+{
        char buf[256];
        int need_regi = 0;
 
 
-       if (!strcasecmp(bstr("noframes"), "on"))
-               noframes = 1;
-       else
-               noframes = 0;
-
        if (!strcasecmp(bstr("action"), "Exit")) {
                do_logout();
-               }
-
+       }
        if (!strcasecmp(bstr("action"), "Login")) {
                serv_printf("USER %s", bstr("name"));
                serv_gets(buf);
-               if (buf[0]=='3') {
+               if (buf[0] == '3') {
                        serv_printf("PASS %s", bstr("pass"));
                        serv_gets(buf);
-                       if (buf[0]=='2') {
+                       if (buf[0] == '2') {
                                become_logged_in(bstr("name"),
-                                       bstr("pass"), buf);
-                               }
-                       else {
+                                                bstr("pass"), buf);
+                       } else {
                                display_login(&buf[4]);
                                return;
-                               }
                        }
-               else {
+               else {
                        display_login(&buf[4]);
                        return;
-                       }
                }
-
+       }
        if (!strcasecmp(bstr("action"), "New User")) {
                serv_printf("NEWU %s", bstr("name"));
                serv_gets(buf);
-               if (buf[0]=='2') {
+               if (buf[0] == '2') {
                        become_logged_in(bstr("name"), bstr("pass"), buf);
                        serv_printf("SETP %s", bstr("pass"));
                        serv_gets(buf);
-                       }
-               else {
+               } else {
                        display_login(&buf[4]);
                        return;
-                       }
                }
-
-       if (logged_in) {
+       }
+       if (WC->logged_in) {
                serv_puts("CHEK");
                serv_gets(buf);
-               if (buf[0]=='2') {
+               if (buf[0] == '2') {
+                       WC->new_mail = extract_int(&buf[4], 0);
                        need_regi = extract_int(&buf[4], 1);
-                       /* FIX also check for new mail etc. here */
-                       }
+                       WC->need_vali = extract_int(&buf[4], 2);
+               }
                if (need_regi) {
                        display_reg(1);
-                       }
-               else {
+               } else {
                        do_welcome();
-                       }
                }
-       else {
+       else {
                display_login("Your password was not accepted.");
-               }
-
        }
 
-void do_welcome(void) {
+}
 
+void do_welcome(void)
+{
+       smart_goto("_BASEROOM_");
+}
 
-       fprintf(stderr, "DO_WELCOME CALLED, NOFRAMES=%d\n", noframes);
 
-       if (noframes) {
-               printf("HTTP/1.0 200 OK\n");
-               output_headers(1, "_top");
-               wprintf("<CENTER><H1>");
-               escputs(wc_username);
-               wprintf("</H1>\n");
-               /* FIX add user stats here */
-       
-               wprintf("<HR>");
-               embed_main_menu();
-       
-               wDumpContent(1);
-               }
-
-       else {
-               output_static("frameset.html");
-               }
-       }
-
-
-void do_logout(void) {
+void do_logout(void)
+{
        char buf[256];
 
-       strcpy(wc_username, "");
-       strcpy(wc_password, "");
-       strcpy(wc_roomname, "");
+       strcpy(WC->wc_username, "");
+       strcpy(WC->wc_password, "");
+       strcpy(WC->wc_roomname, "");
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(2, "_top");      /* note "2" causes cookies to be unset */
+       output_headers(2);      /* note "2" causes cookies to be unset */
 
-       wprintf("<CENTER>");    
+       wprintf("<CENTER>");
        serv_puts("MESG goodbye");
        serv_gets(buf);
 
-       if (buf[0]=='1') fmout(NULL);
-       else wprintf("Goodbye\n");
+       if (buf[0] == '1')
+               fmout(NULL);
+       else
+               wprintf("Goodbye\n");
 
        wprintf("<HR><A HREF=\"/\">Log in again</A></CENTER>\n");
-       wDumpContent(1);
+       wDumpContent(2);
        serv_puts("QUIT");
        exit(0);
-       }
+}
 
 
 
@@ -225,68 +197,76 @@ void do_logout(void) {
 /* 
  * validate new users
  */
-void validate(void) {
+void validate(void)
+{
        char cmd[256];
        char user[256];
        char buf[256];
        int a;
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1, "bottom");
+       output_headers(1);
 
-       strcpy(buf,bstr("user"));
-       if (strlen(buf)>0) if (strlen(bstr("axlevel"))>0) {
-               serv_printf("VALI %s|%s",buf,bstr("axlevel"));
-               serv_gets(buf);
-               if (buf[0]!='2') {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+       strcpy(buf, bstr("user"));
+       if (strlen(buf) > 0)
+               if (strlen(bstr("WC->axlevel")) > 0) {
+                       serv_printf("VALI %s|%s", buf, bstr("WC->axlevel"));
+                       serv_gets(buf);
+                       if (buf[0] != '2') {
+                               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
                        }
                }
-       
        serv_puts("GNUR");
        serv_gets(buf);
 
-       if (buf[0]!='3') {
+       if (buf[0] != '3') {
                wprintf("<EM>%s</EM><BR>\n", &buf[4]);
                wDumpContent(1);
                return;
-               }
-
-       strcpy(user,&buf[4]);
-       serv_printf("GREG %s",user);
+       }
+       strcpy(user, &buf[4]);
+       serv_printf("GREG %s", user);
        serv_gets(cmd);
-       if (cmd[0]=='1') {
+       if (cmd[0] == '1') {
                a = 0;
                do {
                        serv_gets(buf);
                        ++a;
-                       if (a==1) wprintf("User #%s<BR><H1>%s</H1>",
-                               buf,&cmd[4]);
-                       if (a==2) wprintf("PW: %s<BR>\n",buf);
-                       if (a==3) wprintf("%s<BR>\n",buf);
-                       if (a==4) 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);
-                       if (a==8) wprintf("%s<BR>\n",buf);
-                       if (a==9) 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]);
-               }
+                       if (a == 1)
+                               wprintf("User #%s<BR><H1>%s</H1>",
+                                       buf, &cmd[4]);
+                       if (a == 2)
+                               wprintf("PW: %s<BR>\n", buf);
+                       if (a == 3)
+                               wprintf("%s<BR>\n", buf);
+                       if (a == 4)
+                               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);
+                       if (a == 8)
+                               wprintf("%s<BR>\n", buf);
+                       if (a == 9)
+                               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("<CENTER><TABLE border><CAPTION>Select access level:");
        wprintf("</CAPTION><TR>");
-       for (a=0; a<=6; ++a) {
+       for (a = 0; a <= 6; ++a) {
                wprintf(
-               "<TD><A HREF=\"/validate&user=%s&axlevel=%d\">%s</A></TD>\n",
-                       urlesc(user), a, axdefs[a]);
-               }
+                              "<TD><A HREF=\"/validate&user=%s&WC->axlevel=%d\">%s</A></TD>\n",
+                              urlesc(user), a, axdefs[a]);
+       }
        wprintf("</TR></TABLE><CENTER><BR>\n");
        wDumpContent(1);
-       }
+}
 
 
 
@@ -298,81 +278,88 @@ void validate(void) {
  * (Set during_login to 1 if this registration is being performed during
  * new user login and will require chaining to the proper screen.)
  */
-void display_reg(int during_login) {
+void display_reg(int during_login)
+{
        char buf[256];
        int a;
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1, "bottom");
+       output_headers(1);
 
-        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
-        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-        wprintf("<B>Enter registration info</B>\n");
-        wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Enter registration info</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
        serv_puts("MESG register");
        serv_gets(buf);
-       if (buf[0]=='1') fmout(NULL);
+       if (buf[0] == '1')
+               fmout(NULL);
 
        wprintf("<FORM ACTION=\"/register\" METHOD=\"POST\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"during_login\" VALUE=\"%d\">\n", during_login);
 
        serv_puts("GREG _SELF_");
        serv_gets(buf);
-       if (buf[0]!='1') {
-               wprintf("<EM>%s</EM><BR>\n",&buf[4]);
-               }
-       else {
-       
-               wprintf("<H1>%s</H1><TABLE border>\n",&buf[4]);
+       if (buf[0] != '1') {
+               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+       } else {
+
+               wprintf("<H1>%s</H1><TABLE border>\n", &buf[4]);
                a = 0;
-               while (serv_gets(buf), strcmp(buf,"000")) {
+               while (serv_gets(buf), strcmp(buf, "000")) {
                        ++a;
                        wprintf("<TR><TD>");
-                       switch(a) {
-                               case 3: wprintf("Real Name:</TD><TD><INPUT TYPE=\"text\" NAME=\"realname\" VALUE=\"%s\" MAXLENGTH=\"29\"><BR>\n",buf);
-                                       break;
-                               case 4: wprintf("Street Address:</TD><TD><INPUT TYPE=\"text\" NAME=\"address\" VALUE=\"%s\" MAXLENGTH=\"24\"><BR>\n",buf);
-                                       break;
-                               case 5: wprintf("City/town:</TD><TD><INPUT TYPE=\"text\" NAME=\"city\" VALUE=\"%s\" MAXLENGTH=\"14\"><BR>\n",buf);
-                                       break;
-                               case 6: wprintf("State/province:</TD><TD><INPUT TYPE=\"text\" NAME=\"state\" VALUE=\"%s\" MAXLENGTH=\"2\"><BR>\n",buf);
-                                       break;
-                               case 7: wprintf("ZIP code:</TD><TD><INPUT TYPE=\"text\" NAME=\"zip\" VALUE=\"%s\" MAXLENGTH=\"10\"><BR>\n",buf);
-                                       break;
-                               case 8: wprintf("Telephone:</TD><TD><INPUT TYPE=\"text\" NAME=\"phone\" VALUE=\"%s\" MAXLENGTH=\"14\"><BR>\n",buf);
-                                       break;
-                               case 9: wprintf("E-Mail:</TD><TD><INPUT TYPE=\"text\" NAME=\"email\" VALUE=\"%s\" MAXLENGTH=\"31\"><BR>\n",buf);
-                                       break;
-                               }
-                       wprintf("</TD></TR>\n");
+                       switch (a) {
+                       case 3:
+                               wprintf("Real Name:</TD><TD><INPUT TYPE=\"text\" NAME=\"realname\" VALUE=\"%s\" MAXLENGTH=\"29\"><BR>\n", buf);
+                               break;
+                       case 4:
+                               wprintf("Street Address:</TD><TD><INPUT TYPE=\"text\" NAME=\"address\" VALUE=\"%s\" MAXLENGTH=\"24\"><BR>\n", buf);
+                               break;
+                       case 5:
+                               wprintf("City/town:</TD><TD><INPUT TYPE=\"text\" NAME=\"city\" VALUE=\"%s\" MAXLENGTH=\"14\"><BR>\n", buf);
+                               break;
+                       case 6:
+                               wprintf("State/province:</TD><TD><INPUT TYPE=\"text\" NAME=\"state\" VALUE=\"%s\" MAXLENGTH=\"2\"><BR>\n", buf);
+                               break;
+                       case 7:
+                               wprintf("ZIP code:</TD><TD><INPUT TYPE=\"text\" NAME=\"zip\" VALUE=\"%s\" MAXLENGTH=\"10\"><BR>\n", buf);
+                               break;
+                       case 8:
+                               wprintf("Telephone:</TD><TD><INPUT TYPE=\"text\" NAME=\"phone\" VALUE=\"%s\" MAXLENGTH=\"14\"><BR>\n", buf);
+                               break;
+                       case 10:
+                               wprintf("E-Mail:</TD><TD><INPUT TYPE=\"text\" NAME=\"email\" VALUE=\"%s\" MAXLENGTH=\"31\"><BR>\n", buf);
+                               break;
                        }
-               wprintf("</TABLE><P>");
+                       wprintf("</TD></TR>\n");
                }
+               wprintf("</TABLE><P>");
+       }
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Register\">\n");
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
        wprintf("</CENTER>\n");
        wDumpContent(1);
-       }
+}
 
 /*
  * register
  */
-void register_user(void) {
+void register_user(void)
+{
        char buf[256];
-       
-       if (strcmp(bstr("action"),"Register")) {
+
+       if (strcmp(bstr("action"), "Register")) {
                display_error("Cancelled.  Registration was not saved.");
                return;
-               }
-
+       }
        serv_puts("REGI");
        serv_gets(buf);
-       if (buf[0]!='4') {
+       if (buf[0] != '4') {
                display_error(&buf[4]);
-               }
-
+       }
        serv_puts(bstr("realname"));
        serv_puts(bstr("address"));
        serv_puts(bstr("city"));
@@ -381,14 +368,13 @@ void register_user(void) {
        serv_puts(bstr("phone"));
        serv_puts(bstr("email"));
        serv_puts("000");
-       
+
        if (atoi(bstr("during_login"))) {
                do_welcome();
-               }
-       else {
+       } else {
                display_error("Registration information has been saved.");
-               }
        }
+}
 
 
 
@@ -397,56 +383,59 @@ void register_user(void) {
 /* 
  * display form for changing your password
  */
-void display_changepw(void) {
+void display_changepw(void)
+{
        char buf[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1, "bottom");
+       output_headers(1);
 
-        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("<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("<CENTER>");
        serv_puts("MESG changepw");
        serv_gets(buf);
-       if (buf[0]=='1') fmout(NULL);
+       if (buf[0] == '1')
+               fmout(NULL);
 
        wprintf("<FORM ACTION=\"changepw\" METHOD=\"POST\">\n");
        wprintf("<CENTER><TABLE border><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>\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");
        wDumpContent(1);
-       }
+}
 
 /*
  * change password
  */
-void changepw(void) {
+void changepw(void)
+{
        char buf[256];
        char newpass1[32], newpass2[32];
-       
-       if (strcmp(bstr("action"),"Change")) {
+
+       if (strcmp(bstr("action"), "Change")) {
                display_error("Cancelled.  Password was not changed.");
                return;
-               }
-
+       }
        strcpy(newpass1, bstr("newpass1"));
        strcpy(newpass2, bstr("newpass2"));
 
        if (strcasecmp(newpass1, newpass2)) {
                display_error("They don't match.  Password was not changed.");
                return;
-               }
-
+       }
        serv_printf("SETP %s", newpass1);
        serv_gets(buf);
-       if (buf[0]=='2') display_success(&buf[4]);
-       else display_error(&buf[4]);
-       }
+       if (buf[0] == '2')
+               display_success(&buf[4]);
+       else
+               display_error(&buf[4]);
+}