X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=c21bf1374a646fdf70f844715517519387e7903c;hb=bb8396949b1fd2c8f96b3d4bc12fd4048b87c6cf;hp=656dfdc6f40a45a92e5ce953dcb8fe083487dce2;hpb=a15ba5c1ede7c86a85d62ed5b539dcfc9f415bc1;p=citadel.git
diff --git a/webcit/auth.c b/webcit/auth.c
index 656dfdc6f..c21bf1374 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -3,10 +3,10 @@
*
* Copyright (c) 1996-2011 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 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
@@ -14,8 +14,7 @@
* 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
+ * along with this program. If not, see .
*/
#include "webcit.h"
@@ -433,16 +432,10 @@ void do_welcome(void)
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() */
@@ -565,33 +557,20 @@ void do_logout(void)
*/
void monitor(void)
{
- wcsession *WCC = WC;
- char buf[SIZ];
+ output_headers(0, 0, 0, 0, 0, 0);
- FlushStrBuf(WCC->wc_username);
- FlushStrBuf(WCC->wc_password);
- FlushStrBuf(WCC->wc_fullname);
- FlushRoomlist();
-
- serv_puts("LOUT");
- serv_getln(buf, sizeof buf);
- WCC->logged_in = 0;
-
- FlushStrBuf(WCC->CurRoom.name);
-
- /* Calling output_headers() this way causes the cookies to be un-set */
- output_headers(1, 0, 0, 1, 1, 0);
+ hprintf("Content-type: text/plain\r\n"
+ "Server: " PACKAGE_STRING "\r\n"
+ "Connection: close\r\n"
+ );
+ begin_burst();
- wc_printf("");
- wc_printf("WebCit monitoring screen
\n");
- wc_printf("Connection to Citadel server at %s:%s : %s
\n",
+ wc_printf("Connection to Citadel server at %s:%s : %s\r\n",
ctdlhost, ctdlport,
(WC->connected ? "SUCCESS" : "FAIL")
);
- wc_printf("\n");
- wDumpContent(2);
- end_webcit_session();
+ wDumpContent(0);
}
@@ -793,6 +772,7 @@ void display_reg(int during_login)
*/
void display_changepw(void)
{
+ wcsession *WCC = WC;
WCTemplputParams SubTP;
char buf[SIZ];
StrBuf *Buf;
@@ -806,10 +786,10 @@ void display_changepw(void)
FreeStrBuf(&Buf);
- if (!IsEmptyStr(WC->ImportantMessage)) {
+ if (StrLength(WCC->ImportantMsg) > 0) {
wc_printf(""
- "%s
\n", WC->ImportantMessage);
- safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+ "%s
\n", ChrPtr(WCC->ImportantMsg));
+ FlushStrBuf(WCC->ImportantMsg);
}
serv_puts("MESG changepw");
@@ -848,13 +828,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;
}
@@ -863,36 +841,37 @@ 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);
}
@@ -969,11 +948,6 @@ 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);
-/*
- syslog(1, "CheckAuthBasic: calculated sessionkey %ld\n",
- hdr->HR.SessionKey);
-*/
}