\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);
@@ -629,7 +599,7 @@ void validate(void)
serv_printf("VALI %s|%s", buf, bstr("axlevel"));
serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
- wprintf("
\n", &buf[4]);
}
}
}
@@ -638,21 +608,20 @@ void validate(void)
serv_puts("GNUR");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("
"
- "
\n");
- wprintf("");
+ wc_printf(" \n");
+ wc_printf("");
safestrncpy(user, &buf[4], sizeof user);
serv_printf("GREG %s", user);
@@ -663,14 +632,14 @@ 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;
int haveChar = 0;
int haveNum = 0;
int haveOther = 0;
- int count = 0;
+ int haveLong = 0;
pch = buf;
while (!IsEmptyStr(pch))
{
@@ -682,10 +651,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;
@@ -700,46 +672,46 @@ 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");
+ do_template("box_end");
wDumpContent(1);
}
-
/*
* Display form for registration.
*
@@ -748,44 +720,61 @@ 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) {
+ syslog(9, "display_reg() exiting because goto_config_room() failed\n");
+ if (during_login) {
+ pop_destination();
+ }
+ 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();
+ syslog(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
+ if (during_login) {
+ pop_destination();
+ }
+ else {
+ display_main_menu();
+ }
return;
}
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 {
- do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "display_main_menu", USERCONFIGROOM);
+ StrBuf *ReturnTo;
+ 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);
}
}
-
-
/*
* display form for changing your password
*/
void display_changepw(void)
{
+ wcsession *WCC = WC;
WCTemplputParams SubTP;
char buf[SIZ];
StrBuf *Buf;
@@ -795,14 +784,14 @@ void display_changepw(void)
memset(&SubTP, 0, sizeof(WCTemplputParams));
SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = Buf;
- DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+ DoTemplate(HKEY("box_begin"), NULL, &SubTP);
FreeStrBuf(&Buf);
- if (!IsEmptyStr(WC->ImportantMessage)) {
- wprintf("
"
- "%s\n", WC->ImportantMessage);
- safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+ if (StrLength(WCC->ImportantMsg) > 0) {
+ wc_printf("
"
+ "%s\n", ChrPtr(WCC->ImportantMsg));
+ FlushStrBuf(WCC->ImportantMsg);
}
serv_puts("MESG changepw");
@@ -811,27 +800,27 @@ void display_changepw(void)
fmout("CENTER");
}
- wprintf("
\n");
-
- do_template("endbox", NULL);
+ wc_printf("
\n");
+
+ do_template("box_end");
wDumpContent(1);
}
@@ -841,13 +830,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;
}
@@ -856,77 +843,104 @@ 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);
+ AppendImportantMessage(_("They don't match. Password was not changed."), -1);
display_changepw();
return;
}
if (IsEmptyStr(newpass1)) {
- safestrncpy(WC->ImportantMessage,
- _("Blank passwords are not allowed."),
- sizeof WC->ImportantMessage);
+ AppendImportantMessage(_("Blank passwords are not allowed."), -1);
display_changepw();
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();
}
+ FreeStrBuf(&Line);
}
-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) ? ((WCC->logged_in == 0)||(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;
+
}
+/*
+ * toggle the session over to a different language
+ */
+void switch_language(void) {
+ set_selected_language(bstr("lang"));
+ pop_destination();
+}
+
+
+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));
+ syslog(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
}
}
+
void CheckAuthBasic(ParsedHttpHdrs *hdr)
{
/*
@@ -934,12 +948,16 @@ 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);
+/*
+ syslog(1, "CheckAuthBasic: calculated sessionkey %ld\n",
+ hdr->HR.SessionKey);
+*/
}
+
void GetAuthBasic(ParsedHttpHdrs *hdr)
{
const char *Pos = NULL;
@@ -947,10 +965,11 @@ 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)
{
const char *pch;
@@ -964,52 +983,83 @@ 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();
- 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->got_auth = AUTH_COOKIE;
+ 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)
{
+ 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);
-
+ /* 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("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("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);
+ 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(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 ;
+ RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2, ConditionalHaveAccessCreateRoom, CTX_NONE);
+ return;
}
@@ -1020,7 +1070,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);
}