X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=2e58a710a0d053d5d5d249f26d90d69ee41c3b4c;hb=b4ad306de9560ec731db113ed509a1172209c444;hp=16bd49d804525b35c7ad628059ae6ff0f6ef0ba8;hpb=0250352434c498910e3faac249ac01bcbdd4b98d;p=citadel.git

diff --git a/webcit/auth.c b/webcit/auth.c
index 16bd49d80..2e58a710a 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -6,6 +6,10 @@
 
 #include "webcit.h"
 #include "webserver.h"
+#include <ctype.h>
+
+
+void display_reg(int during_login);
 
 /*
  * Access level definitions.  This is initialized from a function rather than a
@@ -78,7 +82,7 @@ void display_login(char *mesg)
 		svput("NEWUSER_BUTTON_POST", WCS_STRING, "");
 	}
 
-#ifdef TECH_PREVIEW
+	if (serv_info.serv_supports_openid) {
 		svprintf(HKEY("OFFER_OPENID_LOGIN"), WCS_STRING,
 			"<div align=center>"
 			"<a href=\"display_openid_login\">"
@@ -88,11 +92,12 @@ void display_login(char *mesg)
 			,
 			"Log in using OpenID"
 		);
-#else
+	}
+	else {
 		svput("OFFER_OPENID_LOGIN", WCS_STRING, "");
-#endif
+	}
 
-	do_template("login");
+	do_template("login", NULL);
 
 	wDumpContent(2);
 }
@@ -119,6 +124,8 @@ void display_openid_login(char *mesg)
 	svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
 		_("<ul>"
 		"<li>Enter your OpenID URL and click &quot;Login&quot;."
+		"<li><a href=\"http://www.citadel.org/doku.php/documentation:openid\">"
+		"Click here to learn what OpenID is and how Citadel is using it.</a>"
 		"<li>Please log off properly when finished. "
 		"<li>You must use a browser that supports <i>frames</i> and "
 		"<i>cookies</i>. "
@@ -146,11 +153,45 @@ void display_openid_login(char *mesg)
 		"Log in using a user name and password"
 	);
 
-	do_template("openid_login");
+	do_template("openid_login", NULL);
 	wDumpContent(2);
 }
 
 
+void display_openid_name_request(char *claimed_id, char *username) {
+	char buf[SIZ];
+
+	output_headers(1, 1, 2, 0, 0, 0);
+	wprintf("<div id=\"login_screen\">\n");
+
+	stresc(buf, sizeof buf, claimed_id, 0, 0);
+	svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID <tt>%s</tt> was successfully verified."),
+		claimed_id);
+	svput("CLAIMED_ID", WCS_STRING, claimed_id);
+
+
+	if (!IsEmptyStr(username)) {
+		stresc(buf, sizeof buf, username, 0, 0);
+		svprintf(HKEY("REASON"), WCS_STRING,
+			_("However, the user name '%s' conflicts with an existing user."), username);
+	}
+	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 <a href=\"http://www.citadel.org\">Citadel</a>"),
+		serv_info.serv_humannode);
+
+	do_template("openid_manual_create", NULL);
+	wDumpContent(2);
+}
+
 
 
 /* Initialize the session
@@ -168,6 +209,7 @@ void display_openid_login(char *mesg)
 void become_logged_in(char *user, char *pass, char *serv_response)
 {
 	char buf[SIZ];
+	StrBuf *FloorDiv;
 
 	WC->logged_in = 1;
 	extract_token(WC->wc_fullname, &serv_response[4], 0, '|', sizeof WC->wc_fullname);
@@ -189,10 +231,10 @@ void become_logged_in(char *user, char *pass, char *serv_response)
 		extract_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email);
 	}
 
-	get_preference("current_iconbar", buf, sizeof buf);
-	WC->current_iconbar = atoi(buf);
+	get_pref_long("current_iconbar", &WC->current_iconbar, current_iconbar_menu);
 
-	get_preference("floordiv_expanded", WC->floordiv_expanded, sizeof WC->floordiv_expanded);
+	get_preference("floordiv_expanded", &FloorDiv);
+	WC->floordiv_expanded = FloorDiv;
 }
 
 
@@ -219,8 +261,7 @@ void do_login(void)
 			serv_printf("PASS %s", bstr("pass"));
 			serv_getln(buf, sizeof buf);
 			if (buf[0] == '2') {
-				become_logged_in(bstr("name"),
-						 bstr("pass"), buf);
+				become_logged_in(bstr("name"), bstr("pass"), buf);
 			} else {
 				display_login(&buf[4]);
 				return;
@@ -247,6 +288,7 @@ void do_login(void)
 		}
 	}
 	if (WC->logged_in) {
+		set_preference("language", NewStrBufPlain(bstr("language"), -1), 1);
 		if (WC->need_regi) {
 			display_reg(1);
 		} else if (WC->need_vali) {
@@ -260,6 +302,42 @@ void do_login(void)
 
 }
 
+/* 
+ * Try to create an account manually after an OpenID was verified
+ */
+void openid_manual_create(void)
+{
+	if (havebstr("exit_action")) {
+		do_logout();
+		return;
+	}
+
+	char buf[1024];
+	if (havebstr("newuser_action")) {
+		serv_printf("OIDC %s", bstr("name"));
+		serv_getln(buf, sizeof buf);
+		if (buf[0] == '2') {
+			char gpass[1024] = "";
+			serv_puts("SETP GENERATE_RANDOM_PASSWORD");
+			serv_getln(gpass, sizeof gpass);
+			become_logged_in(bstr("name"), &gpass[4], buf);
+		}
+	}
+
+	if (WC->logged_in) {
+		if (WC->need_regi) {
+			display_reg(1);
+		} else if (WC->need_vali) {
+			validate();
+		} else {
+			do_welcome();
+		}
+	} else {
+		display_openid_name_request(bstr("openid_url"), bstr("name"));
+	}
+
+}
+
 
 /* 
  * Perform authentication using OpenID
@@ -311,11 +389,17 @@ void finalize_openid_login(void)
 {
 	char buf[1024];
 	struct wcsession *WCC = WC;
+	int already_logged_in = (WCC->logged_in) ;
+	int linecount = 0;
+	char result[128] = "";
+	char username[128] = "";
+	char password[128] = "";
+	char logged_in_response[1024] = "";
+	char claimed_id[1024] = "";
 
 	if (havebstr("openid.mode")) {
 		if (!strcasecmp(bstr("openid.mode"), "id_res")) {
 
-			// FIXME id accepted but the code isn't finished
 			serv_puts("OIDF");
 			serv_getln(buf, sizeof buf);
 
@@ -323,31 +407,70 @@ void finalize_openid_login(void)
 				urlcontent *u;
 				void *U;
 				long HKLen;
-				char *HKey;
+				const char *HKey;
 				HashPos *Cursor;
 				
 				Cursor = GetNewHashPos ();
 				while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
 					u = (urlcontent*) U;
 					if (!strncasecmp(u->url_key, "openid.", 7)) {
-						serv_printf("%s|%s", &u->url_key[7], u->url_data);
+						serv_printf("%s|%s", &u->url_key[7], ChrPtr(u->url_data));
 					}
 				}
 
 				serv_puts("000");
 
+				linecount = 0;
 				while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-					// FIXME
+					if (linecount == 0) safestrncpy(result, buf, sizeof result);
+					if (!strcasecmp(result, "authenticate")) {
+						if (linecount == 1) {
+							safestrncpy(username, buf, sizeof username);
+						}
+						else if (linecount == 2) {
+							safestrncpy(password, buf, sizeof password);
+						}
+						else if (linecount == 3) {
+							safestrncpy(logged_in_response, buf,
+								sizeof logged_in_response);
+						}
+					}
+					else if (!strcasecmp(result, "verify_only")) {
+						if (linecount == 1) {
+							safestrncpy(claimed_id, buf, sizeof claimed_id);
+						}
+						if (linecount == 2) {
+							safestrncpy(username, buf, sizeof username);
+						}
+					}
+					++linecount;
 				}
 			}
-			else {
-				display_openid_login(&buf[4]);
-				return;
-			}
-
 		}
 	}
 
+	/* If we were already logged in, this was an attempt to associate an OpenID account */
+	if (already_logged_in) {
+		display_openids();
+		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(result, "authenticate")) {
+		become_logged_in(username, password, logged_in_response);
+	}
+
+	/* The specified OpenID was verified but the desired user name was either not specified via SRI
+	 * or conflicts with an existing user.  Either way the user will need to specify a new name.
+	 */
+
+	else if (!strcasecmp(result, "verify_only")) {
+		display_openid_name_request(claimed_id, username);
+	}
+
+	/* Did we manage to log in?  If so, continue with the normal flow... */
 	if (WC->logged_in) {
 		if (WC->need_regi) {
 			display_reg(1);
@@ -369,7 +492,7 @@ void finalize_openid_login(void)
  */
 void do_welcome(void)
 {
-	char buf[SIZ];
+	StrBuf *Buf;
 #ifdef XXX_NOT_FINISHED_YET_XXX
 	FILE *fp;
 	int i;
@@ -411,15 +534,17 @@ void do_welcome(void)
 	/*
 	 * Go to the user's preferred start page
 	 */
-	get_preference("startpage", buf, sizeof buf);
-	if (IsEmptyStr(buf)) {
-		safestrncpy(buf, "dotskip&room=_BASEROOM_", sizeof buf);
-		set_preference("startpage", buf, 1);
+	if (!get_preference("startpage", &Buf)) {
+		Buf = NewStrBuf ();
+		StrBufPrintf(Buf, "dotskip&room=_BASEROOM_");
+		set_preference("startpage", Buf, 1);
 	}
-	if (buf[0] == '/') {
-		strcpy(buf, &buf[1]);
+	if (ChrPtr(Buf)[0] == '/') {
+		StrBufCutLeft(Buf, 1);
 	}
-	http_redirect(buf);
+	if (StrLength(Buf) == 0)
+		StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
+	http_redirect(ChrPtr(Buf));
 }
 
 
@@ -427,12 +552,9 @@ void do_welcome(void)
  * Disconnect from the Citadel server, and end this WebCit session
  */
 void end_webcit_session(void) {
-	char buf[256];
-
+	
 	if (WC->logged_in) {
-		sprintf(buf, "%d", WC->current_iconbar);
-		set_preference("current_iconbar", buf, 0);
-		set_preference("floordiv_expanded", WC->floordiv_expanded, 1);
+		set_pref_long("current_iconbar", WC->current_iconbar, 0);
 	}
 
 	serv_puts("QUIT");
@@ -554,8 +676,43 @@ void validate(void)
 			if (a == 1)
 				wprintf("#%s<br /><H1>%s</H1>",
 					buf, &cmd[4]);
-			if (a == 2)
-				wprintf("PW: %s<br />\n", buf);
+			if (a == 2) {
+				char *pch;
+				int haveChar = 0;
+				int haveNum = 0;
+				int haveOther = 0;
+				int count = 0;
+				pch = buf;
+				while (!IsEmptyStr(pch))
+				{
+					if (isdigit(*pch))
+						haveNum = 1;
+					else if (isalpha(*pch))
+						haveChar = 1;
+					else
+						haveOther = 1;
+					pch ++;
+				}
+				count = pch - buf;
+				if (count > 7)
+					count = 0;
+				switch (count){
+				case 0:
+					pch = _("very weak");
+					break;
+				case 1:
+					pch = _("weak");
+					break;
+				case 2:
+					pch = _("ok");
+					break;
+				case 3:
+				default:
+					pch = _("strong");
+				}
+
+				wprintf("PW: %s<br />\n", pch);
+			}
 			if (a == 3)
 				wprintf("%s<br />\n", buf);
 			if (a == 4)
@@ -580,7 +737,7 @@ void validate(void)
 	wprintf(_("Select access level for this user:"));
 	wprintf("<br />\n");
 	for (a = 0; a <= 6; ++a) {
-		wprintf("<a href=\"validate?nonce=%ld?user=", WC->nonce);
+		wprintf("<a href=\"validate?nonce=%d?user=", WC->nonce);
 		urlescputs(user);
 		wprintf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
 			a, axdefs[a]);
@@ -639,7 +796,7 @@ void display_changepw(void)
 	output_headers(1, 1, 1, 0, 0, 0);
 
 	svput("BOXTITLE", WCS_STRING, _("Change your password"));
-	do_template("beginbox");
+	do_template("beginbox", NULL);
 
 	if (!IsEmptyStr(WC->ImportantMessage)) {
 		wprintf("<span class=\"errormsg\">"
@@ -654,7 +811,7 @@ void display_changepw(void)
 	}
 
 	wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 	wprintf("<table class=\"altern\" ");
 	wprintf("<tr class=\"even\"><td>");
 	wprintf(_("Enter new password:"));
@@ -673,7 +830,7 @@ void display_changepw(void)
 	wprintf("</div>\n");
 	wprintf("</form>\n");
 
-	do_template("endbox");
+	do_template("endbox", NULL);
 	wDumpContent(1);
 }
 
@@ -725,10 +882,41 @@ void changepw(void)
 	}
 }
 
+int ConditionalAide(WCTemplateToken *Token, void *Context, int ContextType)
+{
+	return (WC->is_aide == 0);
+}
+
+int ConditionalRoomAide(WCTemplateToken *Token, void *Context, int ContextType)
+{
+	return (WC->is_room_aide == 0);
+}
+
+
 
+void _display_openid_login(void) {display_openid_login(NULL);}
+void _display_reg(void) {display_reg(0);}
 
-void InitModule_AUTH(void)
+
+void 
+InitModule_AUTH
+(void)
 {
-	WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, 0);
+	WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS);
+	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, 0);
+	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);
+
+	RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
+	RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
+
 	return ;
 }