X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=624844a4c6ae548e22da011b224fe81f70540df5;hb=c90b9009ad3b2411389d3dad969c19ec17688268;hp=3588631fc222cb63a27efc7a8486ebc0e8e7af0f;hpb=05b7980adba4f517c3fc30d3ce97adb5c337c750;p=citadel.git diff --git a/webcit/auth.c b/webcit/auth.c index 3588631fc..624844a4c 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -17,7 +17,8 @@ #include "webcit.h" #include "child.h" -char *axdefs[] = { +char *axdefs[] = +{ "Deleted", "New User", "Problem User", @@ -25,12 +26,13 @@ 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"); @@ -43,12 +45,12 @@ void display_login(char *mesg) { if (mesg != NULL) { wprintf("%s", mesg); - } - else { + } else { serv_puts("MESG hello"); serv_gets(buf); - if (buf[0]=='1') fmout(NULL); - } + if (buf[0] == '1') + fmout(NULL); + } wprintf("\n"); wprintf("
\n"); @@ -63,12 +65,12 @@ void display_login(char *mesg) { wprintf("\n"); wprintf("\n"); wprintf("\n"); - wprintf("\n"); - wprintf("\n"); - + wprintf("\n"); + wprintf("\n"); + wprintf("
"); wprintf(" Check here to disable frames\n"); - wprintf("\n"); + wprintf("\n"); /* Da instructions */ wprintf("
  • If you already have an account on %s,", @@ -80,12 +82,10 @@ void display_login(char *mesg) { wprintf("\"New User.\"
  • "); wprintf("Please log off properly when finished."); wprintf("
  • You must use a browser that supports cookies.
    \n"); - wprintf("
  • Your browser is: "); - escputs(browser); wprintf("\n"); wDumpContent(1); - } +} @@ -93,16 +93,19 @@ 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) { +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; - } + if (axlevel >= 6) + is_aide = 1; +} -void do_login(void) { +void do_login(void) +{ char buf[256]; int need_regi = 0; @@ -114,64 +117,57 @@ void do_login(void) { 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) { serv_puts("CHEK"); serv_gets(buf); - if (buf[0]=='2') { + if (buf[0] == '2') { need_regi = extract_int(&buf[4], 1); /* FIX also check for new mail etc. here */ - } + } 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) +{ if (noframes) { printf("HTTP/1.0 200 OK\n"); @@ -181,15 +177,14 @@ void do_welcome(void) { wprintf("\n"); /* FIX add user stats here */ wDumpContent(1); - } - - else { + } else { output_static("frameset.html"); - } } +} -void do_logout(void) { +void do_logout(void) +{ char buf[256]; strcpy(wc_username, ""); @@ -199,18 +194,20 @@ void do_logout(void) { printf("HTTP/1.0 200 OK\n"); output_headers(2, "_top"); /* note "2" causes cookies to be unset */ - wprintf("
    "); + wprintf("
    "); 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("
    Log in again
    \n"); wDumpContent(2); serv_puts("QUIT"); exit(0); - } +} @@ -219,7 +216,8 @@ void do_logout(void) { /* * validate new users */ -void validate(void) { +void validate(void) +{ char cmd[256]; char user[256]; char buf[256]; @@ -228,59 +226,66 @@ void validate(void) { printf("HTTP/1.0 200 OK\n"); output_headers(1, "bottom"); - 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("%s
    \n", &buf[4]); + 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("%s
    \n", &buf[4]); } } - serv_puts("GNUR"); serv_gets(buf); - if (buf[0]!='3') { + if (buf[0] != '3') { wprintf("%s
    \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

    %s

    ", - buf,&cmd[4]); - if (a==2) wprintf("PW: %s
    \n",buf); - if (a==3) wprintf("%s
    \n",buf); - if (a==4) wprintf("%s
    \n",buf); - if (a==5) wprintf("%s, ",buf); - if (a==6) wprintf("%s ",buf); - if (a==7) wprintf("%s
    \n",buf); - if (a==8) wprintf("%s
    \n",buf); - if (a==9) wprintf("Current access level: %d (%s)\n", - atoi(buf),axdefs[atoi(buf)]); - } while(strcmp(buf,"000")); - } - else { - wprintf("

    %s

    %s
    \n",user,&cmd[4]); - } + if (a == 1) + wprintf("User #%s

    %s

    ", + buf, &cmd[4]); + if (a == 2) + wprintf("PW: %s
    \n", buf); + if (a == 3) + wprintf("%s
    \n", buf); + if (a == 4) + wprintf("%s
    \n", buf); + if (a == 5) + wprintf("%s, ", buf); + if (a == 6) + wprintf("%s ", buf); + if (a == 7) + wprintf("%s
    \n", buf); + if (a == 8) + wprintf("%s
    \n", buf); + if (a == 9) + wprintf("Current access level: %d (%s)\n", + atoi(buf), axdefs[atoi(buf)]); + } while (strcmp(buf, "000")); + } else { + wprintf("

    %s

    %s
    \n", user, &cmd[4]); + } wprintf("
    "); - for (a=0; a<=6; ++a) { + for (a = 0; a <= 6; ++a) { wprintf( - "\n", - urlesc(user), a, axdefs[a]); - } + "\n", + urlesc(user), a, axdefs[a]); + } wprintf("
    Select access level:"); wprintf("
    %s%s

    \n"); wDumpContent(1); - } +} @@ -292,81 +297,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"); - wprintf("
    "); - wprintf("Enter registration info\n"); - wprintf("
    \n"); + wprintf("
    "); + wprintf("Enter registration info\n"); + wprintf("
    \n"); wprintf("
    "); serv_puts("MESG register"); serv_gets(buf); - if (buf[0]=='1') fmout(NULL); + if (buf[0] == '1') + fmout(NULL); wprintf("
    \n"); wprintf("\n", during_login); serv_puts("GREG _SELF_"); serv_gets(buf); - if (buf[0]!='1') { - wprintf("%s
    \n",&buf[4]); - } - else { - - wprintf("

    %s

    \n",&buf[4]); + if (buf[0] != '1') { + wprintf("%s
    \n", &buf[4]); + } else { + + wprintf("

    %s

    \n", &buf[4]); a = 0; - while (serv_gets(buf), strcmp(buf,"000")) { + while (serv_gets(buf), strcmp(buf, "000")) { ++a; wprintf("\n"); + switch (a) { + case 3: + wprintf("Real Name:
    "); - switch(a) { - case 3: wprintf("Real Name:
    \n",buf); - break; - case 4: wprintf("Street Address:
    \n",buf); - break; - case 5: wprintf("City/town:
    \n",buf); - break; - case 6: wprintf("State/province:
    \n",buf); - break; - case 7: wprintf("ZIP code:
    \n",buf); - break; - case 8: wprintf("Telephone:
    \n",buf); - break; - case 9: wprintf("E-Mail:
    \n",buf); - break; - } - wprintf("

    \n", buf); + break; + case 4: + wprintf("Street Address:
    \n", buf); + break; + case 5: + wprintf("City/town:
    \n", buf); + break; + case 6: + wprintf("State/province:
    \n", buf); + break; + case 7: + wprintf("ZIP code:
    \n", buf); + break; + case 8: + wprintf("Telephone:
    \n", buf); + break; + case 9: + wprintf("E-Mail:
    \n", buf); + break; } - wprintf("

    "); + wprintf("\n"); } + wprintf("

    "); + } wprintf("\n"); wprintf("\n"); wprintf("

    \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")); @@ -375,14 +387,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."); - } } +} @@ -391,56 +402,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"); - wprintf("
    "); - wprintf("Change your password\n"); - wprintf("
    \n"); + wprintf("
    "); + wprintf("Change your password\n"); + wprintf("
    \n"); wprintf("
    "); serv_puts("MESG changepw"); serv_gets(buf); - if (buf[0]=='1') fmout(NULL); + if (buf[0] == '1') + fmout(NULL); wprintf("\n"); wprintf("
    \n"); wprintf("\n"); wprintf("\n"); wprintf("\n"); - wprintf("
    Enter new password:
    Enter it again to confirm:
    \n"); + wprintf("\n"); wprintf("\n"); wprintf("\n"); wprintf("
    \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]); +}