X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=cb2917b673572a0e4aa45b532cbb4328608a0b0f;hb=80f0f2b99774b570d998109d565aecf46df5c06c;hp=2e317b20dd2dec1a8ab55f6d9c2f6d208df99592;hpb=3e65cb70a115c1e1197c9a806cd81a7a5cdaa74c;p=citadel.git diff --git a/webcit/auth.c b/webcit/auth.c index 2e317b20d..cb2917b67 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -1,7 +1,21 @@ /* - * $Id$ - * * WebcitAuth; Handles authentication of users to a Citadel server. + * + * Copyright (c) 1996-2010 by the citadel.org team + * + * This program is free 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 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" @@ -19,13 +33,27 @@ void display_reg(int during_login); char *axdefs[7]; void initialize_axdefs(void) { - axdefs[0] = _("Deleted"); /* an erased user */ - axdefs[1] = _("New User"); /* a new user */ - axdefs[2] = _("Problem User"); /* a trouble maker */ - axdefs[3] = _("Local User"); /* user with normal privileges */ - axdefs[4] = _("Network User"); /* a user that may access network resources */ - axdefs[5] = _("Preferred User");/* a moderator */ - axdefs[6] = _("Aide"); /* chief */ + + /* an erased user */ + axdefs[0] = _("Deleted"); + + /* a new user */ + axdefs[1] = _("New User"); + + /* a trouble maker */ + axdefs[2] = _("Problem User"); + + /* user with normal privileges */ + axdefs[3] = _("Local User"); + + /* a user that may access network resources */ + axdefs[4] = _("Network User"); + + /* a moderator */ + axdefs[5] = _("Preferred User"); + + /* chief */ + axdefs[6] = _("Aide"); } @@ -58,45 +86,6 @@ void display_openid_login(char *mesg) } -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"); - - Buf = NewStrBufPlain(NULL, StrLength(claimed_id)); - StrEscAppend(Buf, claimed_id, NULL, 0, 0); - svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID %s was successfully verified."), - ChrPtr(Buf)); - SVPutBuf("CLAIMED_ID", Buf, 0); - - - if (StrLength(username) > 0) { - Buf = NewStrBufPlain(NULL, StrLength(username)); - StrEscAppend(Buf, claimed_id, 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, ""); - } - - svput("ACTION_REQUESTED", WCS_STRING, _("Please specify the user name you would like to use.")); - - svput("USERNAME_BOX", WCS_STRING, _("User name:")); - svput("NEWUSER_BUTTON", WCS_STRING, _("New User")); - svput("EXIT_BUTTON", WCS_STRING, _("Exit")); - - svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by Citadel"), - ChrPtr(WC->serv_info->serv_humannode)); - - do_template("openid_manual_create", NULL); - wDumpContent(2); -} - /* Initialize the session @@ -152,7 +141,7 @@ void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_respo const char *pch; pch = ChrPtr(Buf) + 4; - WCC->new_mail = StrBufExtractNext_long(Buf, &pch, '|'); + /*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) @@ -172,8 +161,7 @@ void do_login(void) { wcsession *WCC = WC; StrBuf *Buf; - - lprintf(9, "SELECTED LANGUAGE: '%s'\n", bstr("language")); + long ret, rc; if (havebstr("language")) { set_selected_language(bstr("language")); @@ -188,25 +176,31 @@ void do_login(void) if (havebstr("login_action")) { serv_printf("USER %s", bstr("name")); StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) == 3) { + 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 { - snprintf(WCC->ImportantMessage, - sizeof (WCC->ImportantMessage), - "%s", - &(ChrPtr(Buf))[4]); + StrBufCutLeft(Buf, 4); + AppendImportantMessage(SKEY(Buf)); display_login(); FreeStrBuf(&Buf); return; } - } else { - snprintf(WCC->ImportantMessage, - sizeof (WCC->ImportantMessage), - "%s", - &(ChrPtr(Buf))[4]); + break; + case 5: + if (ret == 541) + { + AppendImportantMessage(SKEY(Buf)); + display_main_menu(); + return; + } + default: + AppendImportantMessage(SKEY(Buf)); display_login(); FreeStrBuf(&Buf); return; @@ -214,10 +208,7 @@ void do_login(void) } if (havebstr("newuser_action")) { if (!havebstr("pass")) { - snprintf(WCC->ImportantMessage, - sizeof (WCC->ImportantMessage), - "%s", - _("Blank passwords are not allowed.")); + AppendImportantMessage(_("Blank passwords are not allowed."), -1); display_login(); FreeStrBuf(&Buf); return; @@ -229,10 +220,8 @@ void do_login(void) serv_printf("SETP %s", bstr("pass")); StrBuf_ServGetln(Buf); /* Don't care? */ } else { - snprintf(WCC->ImportantMessage, - sizeof (WCC->ImportantMessage), - "%s", - &(ChrPtr(Buf))[4]); + StrBufCutLeft(Buf, 4); + AppendImportantMessage(SKEY(Buf)); display_login(); FreeStrBuf(&Buf); return; @@ -247,10 +236,7 @@ void do_login(void) do_welcome(); } } else { - snprintf(WCC->ImportantMessage, - sizeof (WCC->ImportantMessage), - "%s", - _("Your password was not accepted.")); + AppendImportantMessage(_("Your password was not accepted."), -1); display_login(); } FreeStrBuf(&Buf); @@ -294,7 +280,15 @@ void openid_manual_create(void) do_welcome(); } } else { - display_openid_name_request(sbstr("openid_url"), sbstr("name")); + 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); + end_burst(); } } @@ -306,7 +300,6 @@ void openid_manual_create(void) */ void do_openid_login(void) { - wcsession *WCC = WC; char buf[4096]; if (havebstr("language")) { @@ -320,10 +313,10 @@ void do_openid_login(void) } if (havebstr("login_action")) { snprintf(buf, sizeof buf, - "OIDS %s|%s://%s/finalize_openid_login|%s://%s", + "OIDS %s|%s/finalize_openid_login|%s", bstr("openid_url"), - (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->http_host), - (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->http_host) + ChrPtr(site_prefix), + ChrPtr(site_prefix) ); serv_puts(buf); @@ -434,11 +427,19 @@ void finalize_openid_login(void) */ else if (!strcasecmp(ChrPtr(result), "verify_only")) { - display_openid_name_request(claimed_id, username); + putbstr("__claimed_id", claimed_id); + claimed_id = NULL; + if (StrLength(username) > 0) { + putbstr("__username", username); + username = NULL; + } + begin_burst(); + do_template("openid_manual_create", NULL); + end_burst(); } /* Did we manage to log in? If so, continue with the normal flow... */ - if (WC->logged_in) { + else if (WC->logged_in) { if (WC->need_regi) { display_reg(1); } else { @@ -508,14 +509,16 @@ void do_welcome(void) */ if (!get_preference("startpage", &Buf)) { Buf = NewStrBuf (); - StrBufPrintf(Buf, "dotskip&room=_BASEROOM_"); + StrBufPrintf(Buf, "dotskip?room=_BASEROOM_"); set_preference("startpage", Buf, 1); } if (ChrPtr(Buf)[0] == '/') { StrBufCutLeft(Buf, 1); } - if (StrLength(Buf) == 0) + if (StrLength(Buf) == 0) { StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0); + } + lprintf(9, "Redirecting to user's start page: %s\n", ChrPtr(Buf)); http_redirect(ChrPtr(Buf)); } @@ -540,56 +543,56 @@ void do_logout(void) FlushStrBuf(WCC->wc_username); FlushStrBuf(WCC->wc_password); - FlushStrBuf(WCC->wc_roomname); + FlushStrBuf(WCC->CurRoom.name); 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 (WCC->serv_sock >= 0) { if (buf[0] == '1') { - fmout("CENTER"); + 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", + wc_printf("%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. * - wprintf("   " + wc_printf("   " ""); - wprintf(_("Close window")); - wprintf(""); + wc_printf(_("Close window")); + wc_printf(""); */ - wprintf("
\n"); + wc_printf("
\n"); wDumpContent(2); end_webcit_session(); } @@ -606,13 +609,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); @@ -621,7 +624,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]); } } } @@ -630,21 +633,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); @@ -655,7 +658,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; @@ -692,41 +695,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); } @@ -740,24 +743,38 @@ void validate(void) */ void display_reg(int during_login) { + folder Room; StrBuf *Buf; - message_summary *VCMsg; - wc_mime_attachment *VCAtt; + message_summary *VCMsg = NULL; + wc_mime_attachment *VCAtt = NULL; long vcard_msgnum; Buf = NewStrBuf(); - if (goto_config_room(Buf) != 0) { - if (during_login) do_welcome(); - else display_main_menu(); + memset(&Room, 0, sizeof(folder)); + if (goto_config_room(Buf, &Room) != 0) { + lprintf(9, "display_reg() exiting because goto_config_room() failed\n"); + if (during_login) { + do_welcome(); + } + else { + display_main_menu(); + } FreeStrBuf(&Buf); + FlushFolder(&Room); return; } + FlushFolder(&Room); 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; } @@ -765,9 +782,14 @@ void display_reg(int during_login) do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM); } else { - do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "display_main_menu", USERCONFIGROOM); + StrBuf *ReturnTo; + ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst=")); + 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 ?? */ } @@ -792,7 +814,7 @@ void display_changepw(void) FreeStrBuf(&Buf); if (!IsEmptyStr(WC->ImportantMessage)) { - wprintf("" + wc_printf("" "%s
\n", WC->ImportantMessage); safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage); } @@ -803,25 +825,25 @@ 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"); + 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,39 +902,56 @@ void changepw(void) } } -int ConditionalAide(StrBuf *Target, WCTemplputParams *TP) +int ConditionalHaveAccessCreateRoom(StrBuf *Target, WCTemplputParams *TP) { - return (WC->is_aide == 0); + StrBuf *Buf; + + Buf = NewStrBuf(); + serv_puts("CRE8 0"); + StrBuf_ServGetln(Buf); + + if (GetServerStatus(Buf, NULL) == 2) { + StrBufCutLeft(Buf, 4); + AppendImportantMessage(SKEY(Buf)); + FreeStrBuf(&Buf); + return 0; + } + FreeStrBuf(&Buf); + return 1; } -int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP) +int ConditionalAide(StrBuf *Target, WCTemplputParams *TP) { - return (WC->is_room_aide == 0); + wcsession *WCC = WC; + return (WCC != NULL)? (WC->is_aide == 0) : 0; } -int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP) { - return (WC->logged_in == 0); -} -int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP) +int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; - return ( (WCC->is_room_aide) || (WCC->is_mailbox) || (WCC->room_flags2 & QR2_COLLABDEL) ); + return (WCC != NULL)? (WCC->logged_in == 0) : 0; +} + + +void _display_openid_login(void) { + display_openid_login(NULL); } +void _display_reg(void) { + display_reg(0); +} -void _display_openid_login(void) {display_openid_login(NULL);} -void _display_reg(void) {display_reg(0);} void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr) { - if (hdr->got_auth == NO_AUTH) /* don't override cookie auth... */ + 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->plainauth = Line; - hdr->got_auth = AUTH_BASIC; + hdr->HR.plainauth = Line; + hdr->HR.got_auth = AUTH_BASIC; } else lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line)); @@ -926,10 +965,13 @@ void CheckAuthBasic(ParsedHttpHdrs *hdr) if (hdr->DontNeedAuth) return; */ - StrBufAppendBufPlain(hdr->plainauth, HKEY(":"), 0); - StrBufAppendBuf(hdr->plainauth, hdr->user_agent, 0); - hdr->SessionKey = hashlittle(SKEY(hdr->plainauth), 89479832); - + 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) @@ -939,8 +981,8 @@ void GetAuthBasic(ParsedHttpHdrs *hdr) 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->plainauth, &Pos, ':'); - StrBufExtract_NextToken(hdr->c_password, hdr->plainauth, &Pos, ':'); + 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) @@ -956,25 +998,36 @@ void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr) return; } - hdr->RawCookie = Line; - StrBufCutLeft(hdr->RawCookie, (pch - ChrPtr(hdr->RawCookie)) + 7); - StrBufDecodeHex(hdr->RawCookie); + hdr->HR.RawCookie = Line; + StrBufCutLeft(hdr->HR.RawCookie, (pch - ChrPtr(hdr->HR.RawCookie)) + 7); + StrBufDecodeHex(hdr->HR.RawCookie); - 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)); - if (hdr->c_roomname == NULL) - hdr->c_roomname = NewStrBuf(); - if (hdr->c_language == NULL) - hdr->c_language = NewStrBuf(); - cookie_to_stuff(Line, &hdr->desired_session, + cookie_to_stuff(Line, &hdr->HR.desired_session, hdr->c_username, hdr->c_password, hdr->c_roomname, hdr->c_language ); - hdr->got_auth = AUTH_COOKIE; + 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 @@ -991,28 +1044,27 @@ void InitModule_AUTH (void) { + initialize_axdefs(); RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie); RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth); - WebcitAddUrlHandler(HKEY(""), do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */ - WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS|COOKIEUNNEEDED); - WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS|COOKIEUNNEEDED); - WebcitAddUrlHandler(HKEY("display_openid_login"), _display_openid_login, ANONYMOUS); - WebcitAddUrlHandler(HKEY("openid_login"), do_openid_login, ANONYMOUS); - WebcitAddUrlHandler(HKEY("finalize_openid_login"), finalize_openid_login, ANONYMOUS); - WebcitAddUrlHandler(HKEY("openid_manual_create"), openid_manual_create, ANONYMOUS); - WebcitAddUrlHandler(HKEY("do_logout"), do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); - WebcitAddUrlHandler(HKEY("validate"), validate, 0); - WebcitAddUrlHandler(HKEY("display_reg"), _display_reg, 0); - WebcitAddUrlHandler(HKEY("display_changepw"), display_changepw, 0); - WebcitAddUrlHandler(HKEY("changepw"), changepw, 0); - WebcitAddUrlHandler(HKEY("termquit"), do_logout, 0); + 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); - + RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2, ConditionalHaveAccessCreateRoom, CTX_NONE); return ; } @@ -1024,7 +1076,6 @@ SessionDestroyModule_AUTH 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); }