X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=fc0da9507a8253d1857fa0198e2e20c4c683b795;hb=8e165dd308679f195af8614d62dbdb4e43238495;hp=22b8eb200cd51861791392e81a60acb4a981cabe;hpb=078fd03c24d1778e1393b085c07ebcc6a3b07545;p=citadel.git diff --git a/webcit/auth.c b/webcit/auth.c index 22b8eb200..fc0da9507 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -8,6 +8,10 @@ #include "webserver.h" #include +extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); + +void display_reg(int during_login); + /* * Access level definitions. This is initialized from a function rather than a * static array so that the strings may be localized. @@ -26,77 +30,16 @@ void initialize_axdefs(void) { - /* * Display the login screen * mesg = the error message if last attempt failed. */ -void display_login(char *mesg) +void display_login(void) { - char buf[SIZ]; - - output_headers(1, 1, 2, 0, 0, 0); - wprintf("
\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, - _(""), - 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 Citadel"), - serv_info.serv_humannode); - svcallback("DO_LANGUAGE_BOX", offer_languages); - if (serv_info.serv_newuser_disabled) { - svput("NEWUSER_BUTTON_PRE", WCS_STRING, "
"); - svput("NEWUSER_BUTTON_POST", WCS_STRING, "
"); - } - else { - svput("NEWUSER_BUTTON_PRE", WCS_STRING, ""); - svput("NEWUSER_BUTTON_POST", WCS_STRING, ""); - } - - if (serv_info.serv_supports_openid) { - svprintf(HKEY("OFFER_OPENID_LOGIN"), WCS_STRING, - "
" - "" - "" - "%s" - "
" - , - "Log in using OpenID" - ); - } - else { - svput("OFFER_OPENID_LOGIN", WCS_STRING, ""); - } - - do_template("login"); - - wDumpContent(2); + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + do_template("login", NULL); + end_burst(); } @@ -108,69 +51,34 @@ void display_login(char *mesg) */ void display_openid_login(char *mesg) { - char buf[SIZ]; - - output_headers(1, 1, 2, 0, 0, 0); - wprintf("
\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, - _("
    " - "
  • Enter your OpenID URL and click "Login"." - "
  • " - "Click here to learn what OpenID is and how Citadel is using it." - "
  • Please log off properly when finished. " - "
  • You must use a browser that supports frames and " - "cookies. " - "
  • 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.
    " - "
") - ); - - 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 Citadel"), - serv_info.serv_humannode); - svcallback("DO_LANGUAGE_BOX", offer_languages); - - svprintf(HKEY("OFFER_CONVENTIONAL_LOGIN"), WCS_STRING, - "
" - "" - "%s" - "
" - , - "Log in using a user name and password" - ); - - do_template("openid_login"); - wDumpContent(2); + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + do_template("openid_login", NULL); + end_burst(); } -void display_openid_name_request(char *claimed_id, char *username) { - char buf[SIZ]; +void display_openid_name_request(const StrBuf *claimed_id, const StrBuf *username) +{ + StrBuf *Buf = NULL; output_headers(1, 1, 2, 0, 0, 0); - wprintf("
\n"); + wc_printf("
\n"); - stresc(buf, sizeof buf, claimed_id, 0, 0); + Buf = NewStrBufPlain(NULL, StrLength(claimed_id)); + StrEscAppend(Buf, claimed_id, NULL, 0, 0); svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID %s was successfully verified."), - claimed_id); - svput("CLAIMED_ID", WCS_STRING, claimed_id); + ChrPtr(Buf)); + SVPutBuf("CLAIMED_ID", Buf, 0); - if (!IsEmptyStr(username)) { - stresc(buf, sizeof buf, username, 0, 0); - svprintf(HKEY("REASON"), WCS_STRING, - _("However, the user name '%s' conflicts with an existing user."), username); + if (StrLength(username) > 0) { + Buf = NewStrBufPlain(NULL, StrLength(username)); + StrEscAppend(Buf, username, NULL, 0, 0); + svprintf(HKEY("REASON"), WCS_STRING, + _("However, the user name '%s' conflicts with an existing user."), + ChrPtr(Buf)); + FreeStrBuf(&Buf); } else { svput("REASON", WCS_STRING, ""); @@ -183,9 +91,9 @@ void display_openid_name_request(char *claimed_id, char *username) { svput("EXIT_BUTTON", WCS_STRING, _("Exit")); svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by Citadel"), - serv_info.serv_humannode); + ChrPtr(WC->serv_info->serv_humannode)); - do_template("openid_manual_create"); + do_template("openid_manual_create", NULL); wDumpContent(2); } @@ -203,34 +111,57 @@ void display_openid_name_request(char *claimed_id, char *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) +void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response) { - char buf[SIZ]; + wcsession *WCC = WC; + StrBuf *Buf; + StrBuf *FloorDiv; + + WCC->logged_in = 1; + + if (WCC->wc_fullname == NULL) + WCC->wc_fullname = NewStrBufPlain(NULL, StrLength(serv_response)); + StrBufExtract_token(WCC->wc_fullname, serv_response, 0, '|'); + StrBufCutLeft(WCC->wc_fullname, 4 ); + + if (WCC->wc_username == NULL) + WCC->wc_username = NewStrBufDup(user); + else { + FlushStrBuf(WCC->wc_username); + StrBufAppendBuf(WCC->wc_username, user, 0); + } - WC->logged_in = 1; - 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; + if (WCC->wc_password == NULL) + WCC->wc_password = NewStrBufDup(pass); + else { + FlushStrBuf(WCC->wc_password); + StrBufAppendBuf(WCC->wc_password, pass, 0); + } + + WCC->axlevel = StrBufExtract_int(serv_response, 1, '|'); + if (WCC->axlevel >= 6) { /* TODO: make this a define, else it might trick us later */ + WCC->is_aide = 1; } load_preferences(); + Buf = NewStrBuf(); serv_puts("CHEK"); - 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_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 2) { + const char *pch; + + pch = ChrPtr(Buf) + 4; + WCC->new_mail = StrBufExtractNext_long(Buf, &pch, '|'); + WCC->need_regi = StrBufExtractNext_long(Buf, &pch, '|'); + WCC->need_vali = StrBufExtractNext_long(Buf, &pch, '|'); + if (WCC->cs_inet_email == NULL) + WCC->cs_inet_email = NewStrBuf(); + StrBufExtract_NextToken(WCC->cs_inet_email, Buf, &pch, '|'); } - - get_preference("current_iconbar", buf, sizeof buf); - WC->current_iconbar = atoi(buf); - - get_preference("floordiv_expanded", WC->floordiv_expanded, sizeof WC->floordiv_expanded); + get_preference("floordiv_expanded", &FloorDiv); + WCC->floordiv_expanded = FloorDiv; + FreeStrBuf(&Buf); } @@ -239,7 +170,8 @@ void become_logged_in(char *user, char *pass, char *serv_response) */ void do_login(void) { - char buf[SIZ]; + wcsession *WCC = WC; + StrBuf *Buf; if (havebstr("language")) { set_selected_language(bstr("language")); @@ -250,51 +182,76 @@ void do_login(void) do_logout(); return; } + Buf = NewStrBuf(); if (havebstr("login_action")) { serv_printf("USER %s", bstr("name")); - serv_getln(buf, sizeof buf); - if (buf[0] == '3') { + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 3) { serv_printf("PASS %s", bstr("pass")); - serv_getln(buf, sizeof buf); - if (buf[0] == '2') { - become_logged_in(bstr("name"), bstr("pass"), buf); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 2) { + become_logged_in(sbstr("name"), sbstr("pass"), Buf); } else { - display_login(&buf[4]); + snprintf(WCC->ImportantMessage, + sizeof (WCC->ImportantMessage), + "%s", + &(ChrPtr(Buf))[4]); + display_login(); + FreeStrBuf(&Buf); return; } } else { - display_login(&buf[4]); + snprintf(WCC->ImportantMessage, + sizeof (WCC->ImportantMessage), + "%s", + &(ChrPtr(Buf))[4]); + display_login(); + FreeStrBuf(&Buf); return; } } if (havebstr("newuser_action")) { if (!havebstr("pass")) { - display_login(_("Blank passwords are not allowed.")); + snprintf(WCC->ImportantMessage, + sizeof (WCC->ImportantMessage), + "%s", + _("Blank passwords are not allowed.")); + display_login(); + FreeStrBuf(&Buf); return; } serv_printf("NEWU %s", bstr("name")); - serv_getln(buf, sizeof buf); - if (buf[0] == '2') { - become_logged_in(bstr("name"), bstr("pass"), buf); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 2) { + become_logged_in(sbstr("name"), sbstr("pass"), Buf); serv_printf("SETP %s", bstr("pass")); - serv_getln(buf, sizeof buf); + StrBuf_ServGetln(Buf); /* Don't care? */ } else { - display_login(&buf[4]); + snprintf(WCC->ImportantMessage, + sizeof (WCC->ImportantMessage), + "%s", + &(ChrPtr(Buf))[4]); + display_login(); + FreeStrBuf(&Buf); return; } } - if (WC->logged_in) { - if (WC->need_regi) { + if (WCC->logged_in) { + if (WCC->need_regi) { display_reg(1); - } else if (WC->need_vali) { + } else if (WCC->need_vali) { validate(); } else { do_welcome(); } } else { - display_login(_("Your password was not accepted.")); + snprintf(WCC->ImportantMessage, + sizeof (WCC->ImportantMessage), + "%s", + _("Your password was not accepted.")); + display_login(); } - + FreeStrBuf(&Buf); } /* @@ -302,21 +259,28 @@ void do_login(void) */ void openid_manual_create(void) { + StrBuf *Buf; + if (havebstr("exit_action")) { do_logout(); return; } - char buf[1024]; if (havebstr("newuser_action")) { + Buf = NewStrBuf(); serv_printf("OIDC %s", bstr("name")); - serv_getln(buf, sizeof buf); - if (buf[0] == '2') { - char gpass[1024] = ""; + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 2) { + StrBuf *gpass; + + gpass = NewStrBuf(); serv_puts("SETP GENERATE_RANDOM_PASSWORD"); - serv_getln(gpass, sizeof gpass); - become_logged_in(bstr("name"), &gpass[4], buf); + StrBuf_ServGetln(gpass); + StrBufCutLeft(gpass, 4); + become_logged_in(sbstr("name"), gpass, Buf); + FreeStrBuf(&gpass); } + FreeStrBuf(&Buf); } if (WC->logged_in) { @@ -328,7 +292,7 @@ void openid_manual_create(void) do_welcome(); } } else { - display_openid_name_request(bstr("openid_url"), bstr("name")); + display_openid_name_request(sbstr("openid_url"), sbstr("name")); } } @@ -340,6 +304,7 @@ void openid_manual_create(void) */ void do_openid_login(void) { + wcsession *WCC = WC; char buf[4096]; if (havebstr("language")) { @@ -355,8 +320,8 @@ void do_openid_login(void) snprintf(buf, sizeof buf, "OIDS %s|%s://%s/finalize_openid_login|%s://%s", bstr("openid_url"), - (is_https ? "https" : "http"), WC->http_host, - (is_https ? "https" : "http"), WC->http_host + (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->HR.http_host), + (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->HR.http_host) ); serv_puts(buf); @@ -382,78 +347,83 @@ void do_openid_login(void) */ void finalize_openid_login(void) { - char buf[1024]; - struct wcsession *WCC = WC; + StrBuf *Buf; + wcsession *WCC = WC; int already_logged_in = (WCC->logged_in) ; int linecount = 0; - char result[128] = ""; - char username[128] = ""; - char password[128] = ""; - char logged_in_response[1024] = ""; - char claimed_id[1024] = ""; + StrBuf *result = NULL; + StrBuf *username = NULL; + StrBuf *password = NULL; + StrBuf *logged_in_response = NULL; + StrBuf *claimed_id = NULL; if (havebstr("openid.mode")) { if (!strcasecmp(bstr("openid.mode"), "id_res")) { - + Buf = NewStrBuf(); serv_puts("OIDF"); - serv_getln(buf, sizeof buf); - - if (buf[0] == '8') { + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 8) { urlcontent *u; void *U; long HKLen; - char *HKey; + const char *HKey; HashPos *Cursor; - Cursor = GetNewHashPos (); - while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) { + Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0); + while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) { u = (urlcontent*) U; if (!strncasecmp(u->url_key, "openid.", 7)) { - serv_printf("%s|%s", &u->url_key[7], u->url_data); + serv_printf("%s|%s", &u->url_key[7], ChrPtr(u->url_data)); } } serv_puts("000"); linecount = 0; - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - if (linecount == 0) safestrncpy(result, buf, sizeof result); - if (!strcasecmp(result, "authenticate")) { + while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) + { + if (linecount == 0) result = NewStrBufDup(Buf); + if (!strcasecmp(ChrPtr(result), "authenticate")) { if (linecount == 1) { - safestrncpy(username, buf, sizeof username); + username = NewStrBufDup(Buf); } else if (linecount == 2) { - safestrncpy(password, buf, sizeof password); + password = NewStrBufDup(Buf); } else if (linecount == 3) { - safestrncpy(logged_in_response, buf, - sizeof logged_in_response); + logged_in_response = NewStrBufDup(Buf); } } - else if (!strcasecmp(result, "verify_only")) { + else if (!strcasecmp(ChrPtr(result), "verify_only")) { if (linecount == 1) { - safestrncpy(claimed_id, buf, sizeof claimed_id); + claimed_id = NewStrBufDup(Buf); } if (linecount == 2) { - safestrncpy(username, buf, sizeof username); + username = NewStrBufDup(Buf); } } ++linecount; } } + FreeStrBuf(&Buf); } } /* If we were already logged in, this was an attempt to associate an OpenID account */ if (already_logged_in) { display_openids(); + FreeStrBuf(&result); + FreeStrBuf(&username); + FreeStrBuf(&password); + FreeStrBuf(&claimed_id); + FreeStrBuf(&logged_in_response); return; } /* If this operation logged us in, either by connecting with an existing account or by * auto-creating one using Simple Registration Extension, we're already on our way. */ - if (!strcasecmp(result, "authenticate")) { + if (!strcasecmp(ChrPtr(result), "authenticate")) { become_logged_in(username, password, logged_in_response); } @@ -461,7 +431,7 @@ void finalize_openid_login(void) * or conflicts with an existing user. Either way the user will need to specify a new name. */ - else if (!strcasecmp(result, "verify_only")) { + else if (!strcasecmp(ChrPtr(result), "verify_only")) { display_openid_name_request(claimed_id, username); } @@ -476,6 +446,11 @@ void finalize_openid_login(void) display_openid_login(_("Your password was not accepted.")); } + FreeStrBuf(&result); + FreeStrBuf(&username); + FreeStrBuf(&password); + FreeStrBuf(&claimed_id); + FreeStrBuf(&logged_in_response); } @@ -487,7 +462,7 @@ void finalize_openid_login(void) */ void do_welcome(void) { - char buf[SIZ]; + StrBuf *Buf; #ifdef XXX_NOT_FINISHED_YET_XXX FILE *fp; int i; @@ -529,15 +504,19 @@ void do_welcome(void) /* * 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 (!get_preference("startpage", &Buf)) { + Buf = NewStrBuf (); + StrBufPrintf(Buf, "dotskip?room=_BASEROOM_"); + set_preference("startpage", Buf, 1); + } + if (ChrPtr(Buf)[0] == '/') { + StrBufCutLeft(Buf, 1); } - if (buf[0] == '/') { - strcpy(buf, &buf[1]); + if (StrLength(Buf) == 0) { + StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0); } - http_redirect(buf); + lprintf(9, "Redirecting to user's start page: %s\n", ChrPtr(Buf)); + http_redirect(ChrPtr(Buf)); } @@ -545,14 +524,7 @@ void do_welcome(void) * 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() */ @@ -563,48 +535,61 @@ void end_webcit_session(void) { */ void do_logout(void) { + wcsession *WCC = WC; char buf[SIZ]; - 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); + FlushStrBuf(WCC->wc_username); + FlushStrBuf(WCC->wc_password); + FlushStrBuf(WCC->wc_roomname); + FlushStrBuf(WCC->wc_fullname); + /* FIXME: this is to suppress the iconbar displaying, because we aren't + actually logged out yet */ + WCC->logged_in = 0; + /** Calling output_headers() this way causes the cookies to be un-set */ output_headers(1, 1, 0, 1, 0, 0); - wprintf("
"); - wprintf("
"); - wprintf("
"); - wprintf(_("Log off")); - wprintf("
"); + wc_printf("
"); + wc_printf("
"); + wc_printf("
"); + wc_printf(_("Log off")); + wc_printf("
"); serv_puts("MESG goodbye"); serv_getln(buf, sizeof buf); - if (WC->serv_sock >= 0) { + if (WCC->serv_sock >= 0) { if (buf[0] == '1') { fmout("CENTER"); } else { - wprintf("Goodbye\n"); + wc_printf("Goodbye\n"); } } else { - wprintf(_("This program was unable to connect or stay " + wc_printf(_("This program was unable to connect or stay " "connected to the Citadel server. Please report " "this problem to your system administrator.") ); - wprintf("%s", _("Read More...")); } - wprintf("
" + wc_printf("
" ""); - wprintf(_("Log in again")); - wprintf("   " + wc_printf(_("Log in again")); + wc_printf(""); + + /* The "close window" link is commented out because some browsers don't + * allow it to work. + * + wc_printf("   " ""); - wprintf(_("Close window")); - wprintf("
\n"); + wc_printf(_("Close window")); + wc_printf(""); + */ + + wc_printf("
\n"); wDumpContent(2); end_webcit_session(); } @@ -621,13 +606,13 @@ void validate(void) int a; output_headers(1, 1, 2, 0, 0, 0); - wprintf("
\n"); - wprintf("

"); - wprintf(_("Validate new users")); - wprintf("

"); - wprintf("
\n"); + wc_printf("
\n"); + wc_printf("

"); + wc_printf(_("Validate new users")); + wc_printf("

"); + wc_printf("
\n"); - wprintf("
\n"); + wc_printf("
\n"); /* If the user just submitted a validation, process it... */ safestrncpy(buf, bstr("user"), sizeof buf); @@ -636,7 +621,7 @@ void validate(void) serv_printf("VALI %s|%s", buf, bstr("axlevel")); serv_getln(buf, sizeof buf); if (buf[0] != '2') { - wprintf("%s
\n", &buf[4]); + wc_printf("%s
\n", &buf[4]); } } } @@ -645,21 +630,21 @@ void validate(void) serv_puts("GNUR"); serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wprintf(""); - wprintf(_("No users require validation at this time.")); - wprintf("
\n"); + wc_printf(""); + wc_printf(_("No users require validation at this time.")); + wc_printf("
\n"); wDumpContent(1); return; } if (buf[0] != '3') { - wprintf("%s
\n", &buf[4]); + wc_printf("%s
\n", &buf[4]); wDumpContent(1); return; } - wprintf("
" + wc_printf("
" "
\n"); - wprintf("
"); + wc_printf("
"); safestrncpy(user, &buf[4], sizeof user); serv_printf("GREG %s", user); @@ -670,7 +655,7 @@ void validate(void) serv_getln(buf, sizeof buf); ++a; if (a == 1) - wprintf("#%s

%s

", + wc_printf("#%s

%s

", buf, &cmd[4]); if (a == 2) { char *pch; @@ -694,7 +679,7 @@ void validate(void) count = 0; switch (count){ case 0: - pch = _("verry weak"); + pch = _("very weak"); break; case 1: pch = _("weak"); @@ -707,41 +692,41 @@ void validate(void) pch = _("strong"); } - wprintf("PW: %s
\n", pch); + wc_printf("PW: %s
\n", pch); } if (a == 3) - wprintf("%s
\n", buf); + wc_printf("%s
\n", buf); if (a == 4) - wprintf("%s
\n", buf); + wc_printf("%s
\n", buf); if (a == 5) - wprintf("%s, ", buf); + wc_printf("%s, ", buf); if (a == 6) - wprintf("%s ", buf); + wc_printf("%s ", buf); if (a == 7) - wprintf("%s
\n", buf); + wc_printf("%s
\n", buf); if (a == 8) - wprintf("%s
\n", buf); + wc_printf("%s
\n", buf); if (a == 9) - wprintf(_("Current access level: %d (%s)\n"), + wc_printf(_("Current access level: %d (%s)\n"), atoi(buf), axdefs[atoi(buf)]); } while (strcmp(buf, "000")); } else { - wprintf("

%s

%s
\n", user, &cmd[4]); + wc_printf("

%s

%s
\n", user, &cmd[4]); } - wprintf("
"); - wprintf(_("Select access level for this user:")); - wprintf("
\n"); + wc_printf("
"); + wc_printf(_("Select access level for this user:")); + wc_printf("
\n"); for (a = 0; a <= 6; ++a) { - wprintf("nonce); + wc_printf("nonce); urlescputs(user); - wprintf("&axlevel=%d\">%s   \n", + wc_printf("&axlevel=%d\">%s   \n", a, axdefs[a]); } - wprintf("
\n"); + wc_printf("
\n"); - wprintf("
\n"); - wprintf("
\n"); + wc_printf("
\n"); + wc_printf("
\n"); wDumpContent(1); } @@ -755,28 +740,49 @@ void validate(void) */ void display_reg(int during_login) { + StrBuf *Buf; + message_summary *VCMsg = NULL; + wc_mime_attachment *VCAtt = NULL; long vcard_msgnum; - if (goto_config_room() != 0) { - if (during_login) do_welcome(); - else display_main_menu(); + Buf = NewStrBuf(); + if (goto_config_room(Buf) != 0) { + lprintf(9, "display_reg() exiting because goto_config_room() failed\n"); + if (during_login) { + do_welcome(); + } + else { + display_main_menu(); + } + FreeStrBuf(&Buf); return; } - vcard_msgnum = locate_user_vcard(WC->wc_fullname, -1); + FreeStrBuf(&Buf); + vcard_msgnum = locate_user_vcard_in_this_room(&VCMsg, &VCAtt); if (vcard_msgnum < 0L) { - if (during_login) do_welcome(); - else display_main_menu(); + lprintf(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n"); + if (during_login) { + do_welcome(); + } + else { + display_main_menu(); + } return; } if (during_login) { - do_edit_vcard(vcard_msgnum, "1", "do_welcome", USERCONFIGROOM); + do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM); } else { - do_edit_vcard(vcard_msgnum, "1", "display_main_menu", USERCONFIGROOM); + StrBuf *ReturnTo; + ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst=")); + StrBufAppendBuf(ReturnTo, WC->wc_roomname, 0); + do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM); + FreeStrBuf(&ReturnTo); } + /* FIXME - don't we have to free VCMsg and VCAtt ?? */ } @@ -787,15 +793,21 @@ void display_reg(int during_login) */ void display_changepw(void) { + WCTemplputParams SubTP; char buf[SIZ]; - + StrBuf *Buf; output_headers(1, 1, 1, 0, 0, 0); - svput("BOXTITLE", WCS_STRING, _("Change your password")); - do_template("beginbox"); + Buf = NewStrBufPlain(_("Change your password"), -1); + memset(&SubTP, 0, sizeof(WCTemplputParams)); + SubTP.Filter.ContextType = CTX_STRBUF; + SubTP.Context = Buf; + DoTemplate(HKEY("beginbox"), NULL, &SubTP); + + FreeStrBuf(&Buf); if (!IsEmptyStr(WC->ImportantMessage)) { - wprintf("" + wc_printf("" "%s
\n", WC->ImportantMessage); safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage); } @@ -806,27 +818,27 @@ void display_changepw(void) fmout("CENTER"); } - wprintf("
\n"); - wprintf("\n", WC->nonce); - wprintf("\n"); - wprintf("\n"); - wprintf("
"); - wprintf(_("Enter new password:")); - wprintf(""); - wprintf("
"); - wprintf(_("Enter it again to confirm:")); - wprintf(""); - wprintf("
\n"); - - wprintf("
\n"); - wprintf("", _("Change password")); - wprintf(" "); - wprintf("\n", _("Cancel")); - wprintf("
\n"); - wprintf("
\n"); - - do_template("endbox"); + wc_printf("
\n"); + wc_printf("\n", WC->nonce); + wc_printf("\n"); + wc_printf("\n"); + wc_printf("
"); + wc_printf(_("Enter new password:")); + wc_printf(""); + wc_printf("
"); + wc_printf(_("Enter it again to confirm:")); + wc_printf(""); + wc_printf("
\n"); + + wc_printf("
\n"); + wc_printf("", _("Change password")); + wc_printf(" "); + wc_printf("\n", _("Cancel")); + wc_printf("
\n"); + wc_printf("
\n"); + + do_template("endbox", NULL); wDumpContent(1); } @@ -870,7 +882,12 @@ void changepw(void) serv_getln(buf, sizeof buf); sprintf(WC->ImportantMessage, "%s", &buf[4]); if (buf[0] == '2') { - safestrncpy(WC->wc_password, buf, sizeof WC->wc_password); + if (WC->wc_password == NULL) + WC->wc_password = NewStrBufPlain(buf, -1); + else { + FlushStrBuf(WC->wc_password); + StrBufAppendBufPlain(WC->wc_password, buf, -1, 0); + } display_main_menu(); } else { @@ -878,10 +895,178 @@ void changepw(void) } } +int ConditionalAide(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + return (WCC != NULL)? (WC->is_aide == 0) : 0; +} + +int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + return (WCC != NULL)? (WCC->is_room_aide == 0) : 0; +} + + +int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + return (WCC != NULL)? (WCC->logged_in == 0) : 0; +} + + +int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + return (WCC != NULL)? ( (WCC->is_room_aide) || (WCC->is_mailbox) || (WCC->room_flags2 & QR2_COLLABDEL) ) : 0; +} + +void _display_openid_login(void) { + display_openid_login(NULL); +} -void InitModule_AUTH(void) + +void _display_reg(void) { + display_reg(0); +} + + +void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr) { - WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, 0); + if (hdr->HR.got_auth == NO_AUTH) /* don't override cookie auth... */ + { + if (strncasecmp(ChrPtr(Line), "Basic", 5) == 0) { + StrBufCutLeft(Line, 6); + StrBufDecodeBase64(Line); + hdr->HR.plainauth = Line; + hdr->HR.got_auth = AUTH_BASIC; + } + else + lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line)); + } +} + +void CheckAuthBasic(ParsedHttpHdrs *hdr) +{ +/* + todo: enable this if we can have other sessions than authenticated ones. + if (hdr->DontNeedAuth) + return; +*/ + StrBufAppendBufPlain(hdr->HR.plainauth, HKEY(":"), 0); + StrBufAppendBuf(hdr->HR.plainauth, hdr->HR.user_agent, 0); + hdr->HR.SessionKey = hashlittle(SKEY(hdr->HR.plainauth), 89479832); +/* + lprintf(1, "CheckAuthBasic: calculated sessionkey %ld\n", + hdr->HR.SessionKey); +*/ +} + +void GetAuthBasic(ParsedHttpHdrs *hdr) +{ + const char *Pos = NULL; + if (hdr->c_username == NULL) + hdr->c_username = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER)); + if (hdr->c_password == NULL) + hdr->c_password = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS)); + StrBufExtract_NextToken(hdr->c_username, hdr->HR.plainauth, &Pos, ':'); + StrBufExtract_NextToken(hdr->c_password, hdr->HR.plainauth, &Pos, ':'); +} + +void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr) +{ + const char *pch; +/* + todo: enable this if we can have other sessions than authenticated ones. + if (hdr->DontNeedAuth) + return; +*/ + pch = strstr(ChrPtr(Line), "webcit="); + if (pch == NULL) { + return; + } + + hdr->HR.RawCookie = Line; + StrBufCutLeft(hdr->HR.RawCookie, (pch - ChrPtr(hdr->HR.RawCookie)) + 7); + StrBufDecodeHex(hdr->HR.RawCookie); + + cookie_to_stuff(Line, &hdr->HR.desired_session, + hdr->c_username, + hdr->c_password, + hdr->c_roomname, + hdr->c_language + ); + hdr->HR.got_auth = AUTH_COOKIE; +} + +void +HttpNewModule_AUTH +(ParsedHttpHdrs *httpreq) +{ + httpreq->c_username = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER)); + httpreq->c_password = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS)); + httpreq->c_roomname = NewStrBuf(); + httpreq->c_language = NewStrBuf(); +} +void +HttpDetachModule_AUTH +(ParsedHttpHdrs *httpreq) +{ + FLUSHStrBuf(httpreq->c_username); + FLUSHStrBuf(httpreq->c_password); + FLUSHStrBuf(httpreq->c_roomname); + FLUSHStrBuf(httpreq->c_language); +} + +void +HttpDestroyModule_AUTH +(ParsedHttpHdrs *httpreq) +{ + FreeStrBuf(&httpreq->c_username); + FreeStrBuf(&httpreq->c_password); + FreeStrBuf(&httpreq->c_roomname); + FreeStrBuf(&httpreq->c_language); +} + +void +InitModule_AUTH +(void) +{ + RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie); + RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth); + + WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */ + WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); + WebcitAddUrlHandler(HKEY("login"), "", 0, do_login, ANONYMOUS|COOKIEUNNEEDED); + WebcitAddUrlHandler(HKEY("display_openid_login"), "", 0, _display_openid_login, ANONYMOUS); + WebcitAddUrlHandler(HKEY("openid_login"), "", 0, do_openid_login, ANONYMOUS); + WebcitAddUrlHandler(HKEY("finalize_openid_login"), "", 0, finalize_openid_login, ANONYMOUS); + WebcitAddUrlHandler(HKEY("openid_manual_create"), "", 0, openid_manual_create, ANONYMOUS); + WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); + WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0); + WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0); + WebcitAddUrlHandler(HKEY("display_changepw"), "", 0, display_changepw, 0); + WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0); + WebcitAddUrlHandler(HKEY("termquit"), "", 0, do_logout, 0); + + RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE); + RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE); + RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE); + RegisterConditional(HKEY("COND:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE); + return ; } + + +void +SessionDestroyModule_AUTH +(wcsession *sess) +{ + FreeStrBuf(&sess->wc_username); + FreeStrBuf(&sess->wc_fullname); + FreeStrBuf(&sess->wc_password); + FreeStrBuf(&sess->wc_roomname); + FreeStrBuf(&sess->httpauth_pass); + FreeStrBuf(&sess->cs_inet_email); +}