X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=c6ee328e43a785c842d0243eaa4fa94c7c169f1a;hb=HEAD;hp=6bf872dbb8f06f79c69fcd715793522c16e7af26;hpb=6c58cbcb77ad9488643cf233580071f8787b0356;p=citadel.git diff --git a/webcit/auth.c b/webcit/auth.c index 6bf872dbb..0628d223d 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -1,30 +1,21 @@ /* * These functions handle authentication of users to a Citadel server. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2021 by the citadel.org team * - * This program is open source software. You can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. + * This program is open source software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" -#include "webserver.h" -#include -extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); +#include -void display_reg(int during_login); /* * Access level definitions. This is initialized from a function rather than a @@ -53,7 +44,7 @@ void initialize_axdefs(void) { axdefs[5] = _("Preferred User"); /* chief */ - axdefs[6] = _("Aide"); + axdefs[6] = _("Admin"); } @@ -66,27 +57,13 @@ void display_login(void) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - do_template("login", NULL); + do_template("login"); end_burst(); } -/* - * Display the openid-enabled login screen - * mesg = the error message if last attempt failed. - */ -void display_openid_login(char *mesg) -{ - begin_burst(); - output_headers(1, 0, 0, 0, 1, 0); - do_template("openid_login", NULL); - end_burst(); -} - - - /* Initialize the session * @@ -128,7 +105,7 @@ void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_respo } WCC->axlevel = StrBufExtract_int(serv_response, 1, '|'); - if (WCC->axlevel >= 6) { /* TODO: make this a define, else it might trick us later */ + if (WCC->axlevel >= 6) { WCC->is_aide = 1; } @@ -151,104 +128,15 @@ void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_respo get_preference("floordiv_expanded", &FloorDiv); WCC->floordiv_expanded = FloorDiv; FreeStrBuf(&Buf); + FlushRoomlist(); } -/* - * Perform authentication using a user name and password - */ -void do_login(void) -{ - wcsession *WCC = WC; - StrBuf *Buf; - long ret, rc; - - if (havebstr("language")) { - set_selected_language(bstr("language")); - go_selected_language(); - } - - if (havebstr("exit_action")) { - do_logout(); - return; - } - Buf = NewStrBuf(); - if (havebstr("login_action")) { - serv_printf("USER %s", bstr("name")); - StrBuf_ServGetln(Buf); - rc = GetServerStatus(Buf, &ret); - StrBufCutLeft(Buf, 4); - switch (rc) { - case 3: - serv_printf("PASS %s", bstr("pass")); - StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) == 2) { - become_logged_in(sbstr("name"), sbstr("pass"), Buf); - } else { - StrBufCutLeft(Buf, 4); - AppendImportantMessage(SKEY(Buf)); - display_login(); - FreeStrBuf(&Buf); - return; - } - break; - case 5: - if (ret == 541) - { - AppendImportantMessage(SKEY(Buf)); - display_main_menu(); - return; - } - default: - AppendImportantMessage(SKEY(Buf)); - display_login(); - FreeStrBuf(&Buf); - return; - } - } - if (havebstr("newuser_action")) { - if (!havebstr("pass")) { - AppendImportantMessage(_("Blank passwords are not allowed."), -1); - display_login(); - FreeStrBuf(&Buf); - return; - } - serv_printf("NEWU %s", bstr("name")); - StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) == 2) { - become_logged_in(sbstr("name"), sbstr("pass"), Buf); - serv_printf("SETP %s", bstr("pass")); - StrBuf_ServGetln(Buf); /* Don't care? */ - } else { - StrBufCutLeft(Buf, 4); - AppendImportantMessage(SKEY(Buf)); - display_login(); - FreeStrBuf(&Buf); - return; - } - } - if (WCC->logged_in) { - if (WCC->need_regi) { - display_reg(1); - } else if (WCC->need_vali) { - validate(); - } else { - do_welcome(); - } - } else { - AppendImportantMessage(_("Your password was not accepted."), -1); - display_login(); - } - FreeStrBuf(&Buf); -} - - - /* * modal/ajax version of 'login' (username and password) */ void ajax_login_username_password(void) { - StrBuf *Buf; + StrBuf *Buf = NewStrBuf(); serv_printf("USER %s", bstr("name")); StrBuf_ServGetln(Buf); @@ -257,17 +145,39 @@ void ajax_login_username_password(void) { StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) == 2) { become_logged_in(sbstr("name"), sbstr("pass"), Buf); - wc_printf("FIXME success"); } } - wc_printf("FIXME %s", ChrPtr(Buf)); - + /* The client is expecting to read back a citadel protocol response */ + wc_printf("%s", ChrPtr(Buf)); FreeStrBuf(&Buf); } +/* + * modal/ajax version of 'new user' (username and password) + */ +void ajax_login_newuser(void) { + StrBuf *NBuf = NewStrBuf(); + StrBuf *SBuf = NewStrBuf(); + + serv_printf("NEWU %s", bstr("name")); + StrBuf_ServGetln(NBuf); + if (GetServerStatus(NBuf, NULL) == 2) { + become_logged_in(sbstr("name"), sbstr("pass"), NBuf); + serv_printf("SETP %s", bstr("pass")); + StrBuf_ServGetln(SBuf); + } + + /* The client is expecting to read back a citadel protocol response */ + wc_printf("%s", ChrPtr(NBuf)); + FreeStrBuf(&NBuf); + FreeStrBuf(&SBuf); +} + + + /* * Try to create an account manually after an OpenID was verified */ @@ -275,45 +185,53 @@ void openid_manual_create(void) { StrBuf *Buf; + /* Did the user change his mind? Pack up and go home. */ if (havebstr("exit_action")) { - do_logout(); + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + do_template("authpopup_finished"); + end_burst(); return; } - if (havebstr("newuser_action")) { - Buf = NewStrBuf(); - serv_printf("OIDC %s", bstr("name")); - StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) == 2) { - StrBuf *gpass; - - gpass = NewStrBuf(); - serv_puts("SETP GENERATE_RANDOM_PASSWORD"); - StrBuf_ServGetln(gpass); - StrBufCutLeft(gpass, 4); - become_logged_in(sbstr("name"), gpass, Buf); - FreeStrBuf(&gpass); - } - FreeStrBuf(&Buf); + + /* Ok, let's give this a try. Can we create the new user? */ + + Buf = NewStrBuf(); + serv_printf("OIDC %s", bstr("name")); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 2) { + StrBuf *gpass; + + gpass = NewStrBuf(); + serv_puts("SETP GENERATE_RANDOM_PASSWORD"); + StrBuf_ServGetln(gpass); + StrBufCutLeft(gpass, 4); + become_logged_in(sbstr("name"), gpass, Buf); + FreeStrBuf(&gpass); } + FreeStrBuf(&Buf); + /* Did we manage to log in? If so, continue with the normal flow... */ if (WC->logged_in) { - if (WC->need_regi) { - display_reg(1); - } else if (WC->need_vali) { - validate(); - } else { - do_welcome(); + if (WC->logged_in) { + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + do_template("authpopup_finished"); + end_burst(); } } else { + /* Still no good! Go back to teh dialog to select a username */ const StrBuf *Buf; - putbstr("__claimed_id", NewStrBufDup(sbstr("openid_url"))); Buf = sbstr("name"); if (StrLength(Buf) > 0) putbstr("__username", NewStrBufDup(Buf)); begin_burst(); - do_template("openid_manual_create", NULL); + output_headers(1, 0, 0, 0, 1, 0); + wc_printf(""); + do_template("openid_manual_create"); + wc_printf(""); end_burst(); } @@ -328,40 +246,30 @@ void do_openid_login(void) { char buf[4096]; - if (havebstr("language")) { - set_selected_language(bstr("language")); - go_selected_language(); - } + snprintf(buf, sizeof buf, + "OIDS %s|%s/finalize_openid_login|%s", + bstr("openid_url"), + ChrPtr(site_prefix), + ChrPtr(site_prefix) + ); - if (havebstr("exit_action")) { - do_logout(); + serv_puts(buf); + serv_getln(buf, sizeof buf); + if (buf[0] == '2') { + syslog(LOG_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]); + http_redirect(&buf[4]); return; } - if (havebstr("login_action")) { - snprintf(buf, sizeof buf, - "OIDS %s|%s/finalize_openid_login|%s", - bstr("openid_url"), - ChrPtr(site_prefix), - ChrPtr(site_prefix) - ); - - serv_puts(buf); - serv_getln(buf, sizeof buf); - if (buf[0] == '2') { - syslog(LOG_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.")); + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + wc_printf(""); + escputs(&buf[4]); + wc_printf(""); + end_burst(); } + /* * Complete the authentication using OpenID * This function handles the positive or negative assertion from the user's Identity Provider @@ -370,7 +278,6 @@ void finalize_openid_login(void) { StrBuf *Buf; wcsession *WCC = WC; - int already_logged_in = (WCC->logged_in) ; int linecount = 0; StrBuf *result = NULL; StrBuf *username = NULL; @@ -389,6 +296,7 @@ void finalize_openid_login(void) long HKLen; const char *HKey; HashPos *Cursor; + int len; Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0); while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) { @@ -401,7 +309,9 @@ void finalize_openid_login(void) serv_puts("000"); linecount = 0; - while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) + while (len = StrBuf_ServGetln(Buf), + ((len >= 0) && + ((len != 3) || strcmp(ChrPtr(Buf), "000") ))) { if (linecount == 0) result = NewStrBufDup(Buf); if (!strcasecmp(ChrPtr(result), "authenticate")) { @@ -430,28 +340,38 @@ void finalize_openid_login(void) } } - /* If we were already logged in, this was an attempt to associate an OpenID account */ - if (already_logged_in) { + /* + * Is this an attempt to associate a new OpenID with an account that is already logged in? + */ + if ( (WCC->logged_in) && (havebstr("attach_existing")) ) { 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(ChrPtr(result), "authenticate")) { + else if (!strcasecmp(ChrPtr(result), "authenticate")) { become_logged_in(username, password, logged_in_response); + + /* Did we manage to log in? If so, continue with the normal flow... */ + if (WC->logged_in) { + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + do_template("authpopup_finished"); + end_burst(); + } else { + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + wc_printf(""); + wc_printf(_("An error has occurred.")); + wc_printf(""); + end_burst(); + } } - /* The specified OpenID was verified but the desired user name was either not specified via SRI + /* The specified OpenID was verified but the desired user name was either not specified via SRE * or conflicts with an existing user. Either way the user will need to specify a new name. */ - else if (!strcasecmp(ChrPtr(result), "verify_only")) { putbstr("__claimed_id", claimed_id); claimed_id = NULL; @@ -460,19 +380,22 @@ void finalize_openid_login(void) username = NULL; } begin_burst(); - do_template("openid_manual_create", NULL); + output_headers(1, 0, 0, 0, 1, 0); + wc_printf(""); + do_template("openid_manual_create"); + wc_printf(""); end_burst(); } - /* Did we manage to log in? If so, continue with the normal flow... */ - else if (WC->logged_in) { - if (WC->need_regi) { - display_reg(1); - } else { - do_welcome(); - } - } else { - display_openid_login(_("Your password was not accepted.")); + /* Something went VERY wrong if we get to this point */ + else { + syslog(LOG_DEBUG, "finalize_openid_login() failed to do anything. This is a code problem.\n"); + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + wc_printf(""); + wc_printf(_("An error has occurred.")); + wc_printf(""); + end_burst(); } FreeStrBuf(&result); @@ -485,51 +408,9 @@ void finalize_openid_login(void) /* * Display a welcome screen to the user. - * - * 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) -{ +void do_welcome(void) { StrBuf *Buf; -#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; ikillthis = 1; /* close() of citadel socket will be done by do_housekeeping() */ } + /* - * execute the logout + * Log out the session with the Citadel server */ void do_logout(void) { @@ -569,61 +450,49 @@ void do_logout(void) FlushStrBuf(WCC->wc_username); FlushStrBuf(WCC->wc_password); - FlushStrBuf(WCC->CurRoom.name); FlushStrBuf(WCC->wc_fullname); + FlushRoomlist(); - /* FIXME: this is to suppress the iconbar displaying, because we aren't - actually logged out yet */ + serv_puts("LOUT"); + serv_getln(buf, sizeof buf); WCC->logged_in = 0; - /** Calling output_headers() this way causes the cookies to be un-set */ - output_headers(1, 1, 0, 1, 0, 0); - - wc_printf("
"); - wc_printf("
"); - wc_printf("
"); - wc_printf(_("Log off")); - wc_printf("
"); - serv_puts("MESG goodbye"); - serv_getln(buf, sizeof buf); + FlushStrBuf(WCC->CurRoom.name); - if (WCC->serv_sock >= 0) { - if (buf[0] == '1') { - fmout("'CENTER'"); - } else { - wc_printf("Goodbye\n"); - } - } - else { - wc_printf(_("This program was unable to connect or stay " - "connected to the Citadel server. Please report " - "this problem to your system administrator.") - ); - wc_printf("%s", - _("Read More...")); + /* Calling output_headers() this way causes the cookies to be un-set */ + output_headers(1, 1, 0, 1, 0, 0); + do_template("logout"); + if ((WCC->serv_info != NULL) && WCC->serv_info->serv_supports_guest) { + display_default_landing_page(); + return; } - wc_printf("
" - ""); - 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("   " - ""); - wc_printf(_("Close window")); - wc_printf(""); - */ - - wc_printf("
\n"); wDumpContent(2); end_webcit_session(); } +/* + * Special page for monitoring scripts etc + */ +void monitor(void) +{ + output_headers(0, 0, 0, 0, 0, 0); + + hprintf("Content-type: text/plain\r\n" + "Server: " PACKAGE_STRING "\r\n" + "Connection: close\r\n" + ); + begin_burst(); + + wc_printf("Connection to Citadel server in %s : %s\r\n", ctdl_dir, + (WC->connected ? "SUCCESS" : "FAIL") + ); + + wDumpContent(0); +} + + /* * validate new users */ @@ -634,14 +503,11 @@ void validate(void) char buf[SIZ]; int a; - output_headers(1, 1, 2, 0, 0, 0); - wc_printf("
\n"); - wc_printf("

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

"); - wc_printf("
\n"); + output_headers(1, 1, 1, 0, 0, 0); - wc_printf("
\n"); + do_template("box_begin_1"); + StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0); + do_template("box_begin_2"); /* If the user just submitted a validation, process it... */ safestrncpy(buf, bstr("user"), sizeof buf); @@ -690,7 +556,7 @@ void validate(void) int haveChar = 0; int haveNum = 0; int haveOther = 0; - int count = 0; + int haveLong = 0; pch = buf; while (!IsEmptyStr(pch)) { @@ -702,10 +568,13 @@ void validate(void) haveOther = 1; pch ++; } - count = pch - buf; - if (count > 7) - count = 0; - switch (count){ + if (pch - buf > 7) + haveLong = 1; + switch (haveLong + + haveChar + + haveNum + + haveOther) + { case 0: pch = _("very weak"); break; @@ -739,27 +608,27 @@ void validate(void) atoi(buf), axdefs[atoi(buf)]); } while (strcmp(buf, "000")); } else { - wc_printf("

%s

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

%s

%s
\n", user, &cmd[4]); } wc_printf("
"); wc_printf(_("Select access level for this user:")); - wc_printf("
\n"); + wc_printf("
\n"); for (a = 0; a <= 6; ++a) { wc_printf("nonce); urlescputs(user); wc_printf("&axlevel=%d\">%s   \n", a, axdefs[a]); } - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("
\n"); wc_printf("\n"); + do_template("box_end"); wDumpContent(1); } - /* * Display form for registration. * @@ -777,9 +646,9 @@ void display_reg(int during_login) Buf = NewStrBuf(); memset(&Room, 0, sizeof(folder)); if (goto_config_room(Buf, &Room) != 0) { - lprintf(9, "display_reg() exiting because goto_config_room() failed\n"); + syslog(LOG_WARNING, "display_reg() exiting because goto_config_room() failed\n"); if (during_login) { - do_welcome(); + pop_destination(); } else { display_main_menu(); @@ -793,9 +662,9 @@ void display_reg(int during_login) FreeStrBuf(&Buf); vcard_msgnum = locate_user_vcard_in_this_room(&VCMsg, &VCAtt); if (vcard_msgnum < 0L) { - lprintf(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n"); + syslog(LOG_WARNING, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n"); if (during_login) { - do_welcome(); + pop_destination(); } else { display_main_menu(); @@ -804,74 +673,16 @@ void display_reg(int during_login) } if (during_login) { - do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM); + do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "pop", USERCONFIGROOM); } else { StrBuf *ReturnTo; - ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst=")); + ReturnTo = NewStrBufPlain(HKEY("display_main_menu?go=")); StrBufAppendBuf(ReturnTo, WC->CurRoom.name, 0); do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM); FreeStrBuf(&ReturnTo); } - /* FIXME - don't we have to free VCMsg and VCAtt ?? */ -} - - - - -/* - * display form for changing your password - */ -void display_changepw(void) -{ - WCTemplputParams SubTP; - char buf[SIZ]; - StrBuf *Buf; - output_headers(1, 1, 1, 0, 0, 0); - - 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)) { - wc_printf("" - "%s
\n", WC->ImportantMessage); - safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage); - } - - serv_puts("MESG changepw"); - serv_getln(buf, sizeof buf); - if (buf[0] == '1') { - fmout("CENTER"); - } - - 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); } /* @@ -880,13 +691,11 @@ void display_changepw(void) */ void changepw(void) { - char buf[SIZ]; + StrBuf *Line; char newpass1[32], newpass2[32]; if (!havebstr("change_action")) { - safestrncpy(WC->ImportantMessage, - _("Cancelled. Password was not changed."), - sizeof WC->ImportantMessage); + AppendImportantMessage(_("Cancelled. Password was not changed."), -1); display_main_menu(); return; } @@ -895,38 +704,40 @@ void changepw(void) safestrncpy(newpass2, bstr("newpass2"), sizeof newpass2); if (strcasecmp(newpass1, newpass2)) { - safestrncpy(WC->ImportantMessage, - _("They don't match. Password was not changed."), - sizeof WC->ImportantMessage); - display_changepw(); + AppendImportantMessage(_("They don't match. Password was not changed."), -1); + do_template("menu_change_pw"); return; } if (IsEmptyStr(newpass1)) { - safestrncpy(WC->ImportantMessage, - _("Blank passwords are not allowed."), - sizeof WC->ImportantMessage); - display_changepw(); + AppendImportantMessage(_("Blank passwords are not allowed."), -1); + do_template("menu_change_pw"); return; } + Line = NewStrBuf(); serv_printf("SETP %s", newpass1); - serv_getln(buf, sizeof buf); - sprintf(WC->ImportantMessage, "%s", &buf[4]); - if (buf[0] == '2') { + StrBuf_ServGetln(Line); + if (GetServerStatusMsg(Line, NULL, 1, 0) == 2) { if (WC->wc_password == NULL) - WC->wc_password = NewStrBufPlain(buf, -1); + WC->wc_password = NewStrBufPlain( + ChrPtr(Line) + 4, + StrLength(Line) - 4); else { FlushStrBuf(WC->wc_password); - StrBufAppendBufPlain(WC->wc_password, buf, -1, 0); + StrBufAppendBufPlain(WC->wc_password, + ChrPtr(Line) + 4, + StrLength(Line) - 4, 0); } display_main_menu(); } else { - display_changepw(); + do_template("menu_change_pw"); } + FreeStrBuf(&Line); } + int ConditionalHaveAccessCreateRoom(StrBuf *Target, WCTemplputParams *TP) { StrBuf *Buf; @@ -945,21 +756,28 @@ int ConditionalHaveAccessCreateRoom(StrBuf *Target, WCTemplputParams *TP) return 1; } + int ConditionalAide(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; - return (WCC != NULL)? (WC->is_aide == 0) : 0; + return (WCC != NULL) ? ((WCC->logged_in == 0)||(WC->is_aide == 0)) : 0; } + int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; - return (WCC != NULL)? (WCC->logged_in == 0) : 0; + return (WCC != NULL) ? (WCC->logged_in == 0) : 0; + } -void _display_openid_login(void) { - display_openid_login(NULL); +/* + * toggle the session over to a different language + */ +void switch_language(void) { + set_selected_language(bstr("lang")); + pop_destination(); } @@ -979,10 +797,11 @@ void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr) hdr->HR.got_auth = AUTH_BASIC; } else - lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line)); + syslog(LOG_WARNING, "Authentication scheme not supported! [%s]\n", ChrPtr(Line)); } } + void CheckAuthBasic(ParsedHttpHdrs *hdr) { /* @@ -992,13 +811,9 @@ void CheckAuthBasic(ParsedHttpHdrs *hdr) */ 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; @@ -1010,6 +825,7 @@ void GetAuthBasic(ParsedHttpHdrs *hdr) StrBufExtract_NextToken(hdr->c_password, hdr->HR.plainauth, &Pos, ':'); } + void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr) { const char *pch; @@ -1036,6 +852,7 @@ void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr) hdr->HR.got_auth = AUTH_COOKIE; } + void HttpNewModule_AUTH (ParsedHttpHdrs *httpreq) @@ -1045,6 +862,8 @@ HttpNewModule_AUTH httpreq->c_roomname = NewStrBuf(); httpreq->c_language = NewStrBuf(); } + + void HttpDetachModule_AUTH (ParsedHttpHdrs *httpreq) @@ -1055,6 +874,7 @@ HttpDetachModule_AUTH FLUSHStrBuf(httpreq->c_language); } + void HttpDestroyModule_AUTH (ParsedHttpHdrs *httpreq) @@ -1065,6 +885,7 @@ HttpDestroyModule_AUTH FreeStrBuf(&httpreq->c_language); } + void InitModule_AUTH (void) @@ -1073,26 +894,27 @@ InitModule_AUTH RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie); RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth); - WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */ + /* no url pattern at all? Show login. */ + WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); + 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("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX); WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0); + WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, 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:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE); - RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2, ConditionalHaveAccessCreateRoom, CTX_NONE); - return ; + WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); + WebcitAddUrlHandler(HKEY("monitor"), "", 0, monitor, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); + WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX|ANONYMOUS); + WebcitAddUrlHandler(HKEY("ajax_login_newuser"), "", 0, ajax_login_newuser, AJAX|ANONYMOUS); + WebcitAddUrlHandler(HKEY("switch_language"), "", 0, switch_language, ANONYMOUS); + RegisterConditional("COND:AIDE", 2, ConditionalAide, CTX_NONE); + RegisterConditional("COND:LOGGEDIN", 2, ConditionalIsLoggedIn, CTX_NONE); + RegisterConditional("COND:MAY_CREATE_ROOM", 2, ConditionalHaveAccessCreateRoom, CTX_NONE); + return; }