* $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"
StrBuf *Buf = NULL;
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"login_screen\">\n");
+ w
c_printf("<div id=\"login_screen\">\n");
Buf = NewStrBufPlain(NULL, StrLength(claimed_id));
StrEscAppend(Buf, claimed_id, NULL, 0, 0);
if (StrLength(username) > 0) {
Buf = NewStrBufPlain(NULL, StrLength(username));
- StrEscAppend(Buf, claimed_id, NULL, 0, 0);
+ StrEscAppend(Buf, username, NULL, 0, 0);
svprintf(HKEY("REASON"), WCS_STRING,
_("However, the user name '%s' conflicts with an existing user."),
ChrPtr(Buf));
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)
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
/** Calling output_headers() this way causes the cookies to be un-set */
output_headers(1, 1, 0, 1, 0, 0);
- wprintf("<div id=\"logout_screen\">");
- wprintf("<div class=\"box\">");
- wprintf("<div class=\"boxlabel\">");
- wprintf(_("Log off"));
- wprintf("</div><div class=\"boxcontent\">");
+ w
c_printf("<div id=\"logout_screen\">");
+ w
c_printf("<div class=\"box\">");
+ w
c_printf("<div class=\"boxlabel\">");
+ wc_printf(_("Log off"));
+ wc_printf("</div><div class=\"boxcontent\">");
serv_puts("MESG goodbye");
serv_getln(buf, sizeof buf);
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("<a href=\"http://www.citadel.org/doku.php/"
+ w
c_printf("<a href=\"http://www.citadel.org/doku.php/"
"faq:mastering_your_os:net#netstat\">%s</a>",
_("Read More..."));
}
- wprintf("<hr /><div class=\"buttons\"> "
+ w
c_printf("<hr /><div class=\"buttons\"> "
"<span class=\"button_link\"><a href=\".\">");
- wprintf(_("Log in again"));
- wprintf("</a></span>");
+ wc_printf(_("Log in again"));
+ wc_printf("</a></span>");
/* The "close window" link is commented out because some browsers don't
* allow it to work.
*
- wprintf(" <span class=\"button_link\">"
+ wc_printf(" <span class=\"button_link\">"
"<a href=\"javascript:window.close();\">");
- wprintf(_("Close window"));
- wprintf("</a></span>");
+ wc_printf(_("Close window"));
+ wc_printf("</a></span>");
*/
- wprintf("</div></div></div></div>\n");
+ wc_printf("</div></div></div></div>\n");
wDumpContent(2);
end_webcit_session();
}
int a;
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n");
- wprintf("<h1>");
- wprintf(_("Validate new users"));
- wprintf("</h1>");
- wprintf("</div>\n");
+ w
c_printf("<div id=\"banner\">\n");
+ wc_printf("<h1>");
+ wc_printf(_("Validate new users"));
+ wc_printf("</h1>");
+ wc_printf("</div>\n");
- wprintf("<div id=\"content\" class=\"service\">\n");
+ w
c_printf("<div id=\"content\" class=\"service\">\n");
/* If the user just submitted a validation, process it... */
safestrncpy(buf, bstr("user"), sizeof buf);
serv_printf("VALI %s|%s", buf, bstr("axlevel"));
serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
- wprintf("<b>%s</b><br>\n", &buf[4]);
+ wc_printf("<b>%s</b><br>\n", &buf[4]);
}
}
}
serv_puts("GNUR");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("<b>");
- wprintf(_("No users require validation at this time."));
- wprintf("</b><br>\n");
+ wc_printf("<b>");
+ wc_printf(_("No users require validation at this time."));
+ wc_printf("</b><br>\n");
wDumpContent(1);
return;
}
if (buf[0] != '3') {
- wprintf("<b>%s</b><br>\n", &buf[4]);
+ wc_printf("<b>%s</b><br>\n", &buf[4]);
wDumpContent(1);
return;
}
- wprintf("<div class=\"fix_scrollbar_bug\">"
+ w
c_printf("<div class=\"fix_scrollbar_bug\">"
"<table class=\"auth_validate\"><tr><td>\n");
- wprintf("<div id=\"validate\">");
+ w
c_printf("<div id=\"validate\">");
safestrncpy(user, &buf[4], sizeof user);
serv_printf("GREG %s", user);
serv_getln(buf, sizeof buf);
++a;
if (a == 1)
- wprintf("#%s<br><H1>%s</H1>",
+ wc_printf("#%s<br><H1>%s</H1>",
buf, &cmd[4]);
if (a == 2) {
char *pch;
pch = _("strong");
}
- wprintf("PW: %s<br>\n", pch);
+ wc_printf("PW: %s<br>\n", pch);
}
if (a == 3)
- wprintf("%s<br>\n", buf);
+ wc_printf("%s<br>\n", buf);
if (a == 4)
- wprintf("%s<br>\n", buf);
+ wc_printf("%s<br>\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<br>\n", buf);
+ wc_printf("%s<br>\n", buf);
if (a == 8)
- wprintf("%s<br>\n", buf);
+ wc_printf("%s<br>\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("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
+ wc_printf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
}
- wprintf("<hr />");
- wprintf(_("Select access level for this user:"));
- wprintf("<br />\n");
+ wc_printf("<hr />");
+ wc_printf(_("Select access level for this user:"));
+ wc_printf("<br />\n");
for (a = 0; a <= 6; ++a) {
- wprintf("<a href=\"validate?nonce=%d?user=", WC->nonce);
+ w
c_printf("<a href=\"validate?nonce=%d?user=", WC->nonce);
urlescputs(user);
- wprintf("&axlevel=%d\">%s</A> \n",
+ wc_printf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
}
- wprintf("<br />\n");
+ wc_printf("<br />\n");
- wprintf("</div>\n");
- wprintf("</td></tr></table></div>\n");
+ wc_printf("</div>\n");
+ wc_printf("</td></tr></table></div>\n");
wDumpContent(1);
}
*/
void display_reg(int during_login)
{
+ folder Room;
StrBuf *Buf;
message_summary *VCMsg = NULL;
wc_mime_attachment *VCAtt = NULL;
long vcard_msgnum;
Buf = NewStrBuf();
- if (goto_config_room(Buf) != 0) {
+ 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();
display_main_menu();
}
FreeStrBuf(&Buf);
+ FlushFolder(&Room);
return;
}
+ FlushFolder(&Room);
FreeStrBuf(&Buf);
vcard_msgnum = locate_user_vcard_in_this_room(&VCMsg, &VCAtt);
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 ?? */
+ /* FIXME - don't we have to free VCMsg and VCAtt ?? */
}
FreeStrBuf(&Buf);
if (!IsEmptyStr(WC->ImportantMessage)) {
- wprintf("<span class=\"errormsg\">"
+ wc_printf("<span class=\"errormsg\">"
"%s</span><br />\n", WC->ImportantMessage);
safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
}
fmout("CENTER");
}
- wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
- wprintf("<table class=\"altern\" ");
- wprintf("<tr class=\"even\"><td>");
- wprintf(_("Enter new password:"));
- wprintf("</td><td>");
- wprintf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
- wprintf("<tr class=\"odd\"><td>");
- wprintf(_("Enter it again to confirm:"));
- wprintf("</td><td>");
- wprintf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
- wprintf("</table>\n");
-
- wprintf("<div class=\"buttons\">\n");
- wprintf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
- wprintf(" ");
- wprintf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
- wprintf("</div>\n");
- wprintf("</form>\n");
+ wc_printf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
+ wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+ w
c_printf("<table class=\"altern\" ");
+ wc_printf("<tr class=\"even\"><td>");
+ wc_printf(_("Enter new password:"));
+ wc_printf("</td><td>");
+ wc_printf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
+ wc_printf("<tr class=\"odd\"><td>");
+ wc_printf(_("Enter it again to confirm:"));
+ wc_printf("</td><td>");
+ wc_printf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
+ wc_printf("</table>\n");
+
+ w
c_printf("<div class=\"buttons\">\n");
+ wc_printf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
+ wc_printf(" ");
+ wc_printf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
+ wc_printf("</div>\n");
+ wc_printf("</form>\n");
do_template("endbox", NULL);
wDumpContent(1);
}
}
-int ConditionalAide(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalHaveAccessCreateRoom(StrBuf *Target, WCTemplputParams *TP)
{
- wcsession *WCC = WC;
- return (WCC != NULL)? (WC->is_aide == 0) : 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)
{
wcsession *WCC = WC;
- return (WCC != NULL)? (WCC->is_room_aide == 0) : 0;
+ return (WCC != NULL)? (WC->is_aide == 0) : 0;
}
-
int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
}
-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);
}
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)
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 ;
}
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);
}
projects / citadel.git / blobdiff