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\">"
,
"Log in using OpenID"
);
-#else
+ }
+ else {
svput("OFFER_OPENID_LOGIN", WCS_STRING, "");
-#endif
+ }
do_template("login");
if (WC->logged_in) {
if (WC->need_regi) {
display_reg(1);
+ } else if (WC->need_vali) {
+ validate();
} else {
do_welcome();
}
}
-/*
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
- <link rel="openid.server" href="http://uncensored.citadel.org/~ajc/MyID.config.php">
- <link rel="openid.delegate" href="http://uncensored.citadel.org/~ajc/MyID.config.php">
- <title>IGnatius T Foobar</title>
-</head>
-<body text="#00ff00" bgcolor="#000000" link="#ffff00">
-
-*/
-
-
-
/*
- * Locate a <link> tag and, given its 'rel=' parameter, return its 'href' parameter
+ * Perform authentication using OpenID
+ * assemble the checkid_setup request and then redirect to the user's identity provider
*/
-void extract_link(char *target_buf, int target_size, char *rel, char *source_buf)
+void do_openid_login(void)
{
- char *ptr = source_buf;
-
- while (ptr = bmstrcasestr(ptr, "<link"), ptr != NULL) {
+ char buf[4096];
- lprintf(9, "Got something\n", ptr); // FIXME
+ if (havebstr("language")) {
+ set_selected_language(bstr("language"));
+ go_selected_language();
+ }
- ++ptr;
+ if (havebstr("exit_action")) {
+ do_logout();
+ return;
}
+ if (havebstr("login_action")) {
+ snprintf(buf, sizeof buf,
+ "OIDS %s|%s://%s/finalize_openid_login|%s://%s",
+ bstr("openid_url"),
+ (is_https ? "https" : "http"), WC->http_host,
+ (is_https ? "https" : "http"), WC->http_host
+ );
+ serv_puts(buf);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '2') {
+ lprintf(CTDL_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
+ http_redirect(&buf[4]);
+ return;
+ }
+ else {
+ display_openid_login(&buf[4]);
+ return;
+ }
+ }
+ /* If we get to this point then something failed. */
+ display_openid_login(_("Your password was not accepted."));
}
-
/*
- * Perform authentication using OpenID
+ * Complete the authentication using OpenID
+ * This function handles the positive or negative assertion from the user's Identity Provider
*/
-void do_openid_login(void)
+void finalize_openid_login(void)
{
- int i;
- char buf[4096];
+ 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] = "";
+
+ if (havebstr("openid.mode")) {
+ if (!strcasecmp(bstr("openid.mode"), "id_res")) {
+
+ serv_puts("OIDF");
+ serv_getln(buf, sizeof buf);
- if (havebstr("language")) {
- set_selected_language(bstr("language"));
- go_selected_language();
+ if (buf[0] == '8') {
+ urlcontent *u;
+ void *U;
+ long HKLen;
+ 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_puts("000");
+
+ linecount = 0;
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ 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);
+ }
+ }
+ ++linecount;
+ }
+ }
+ }
}
- if (havebstr("exit_action")) {
- do_logout();
+ /* If we were already logged in, this was an attempt to associate an OpenID account */
+ if (already_logged_in) {
+ display_openids();
return;
}
- if (havebstr("login_action")) {
- i = fetch_http(bstr("openid_url"), buf, sizeof buf - 1);
- buf[sizeof buf - 1] = 0;
- if (i > 0) {
- char openid_server[1024];
- char openid_delegate[1024];
-
- extract_link(openid_server, sizeof openid_server, "openid.server", buf);
- extract_link(openid_delegate, sizeof openid_delegate, "openid.delegate", buf);
-
- lprintf(9, " Server: %s\n", openid_server);
- lprintf(9, "Delegate: %s\n", openid_delegate);
- // FIXME finish this
+
+ /* Was the claimed ID associated with an existing account? Then log in that account now. */
+ if (!strcasecmp(result, "authenticate")) {
+ serv_printf("USER %s", username);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '3') {
+ serv_printf("PASS %s", password);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '2') {
+ become_logged_in(username, password, buf);
+ }
}
}
+
+ /* FIXME -- right here we have to put the code to log in a new user */
+
+ /* Did we manage to log in? If so, continue with the normal flow... */
if (WC->logged_in) {
if (WC->need_regi) {
display_reg(1);
}
-
-
-
-
-
-
/*
- * display the user a welcome screen.
+ * Display a welcome screen to the user.
*
- * if this is the first time login, and the web based setup is enabled,
+ * If this is the first time login, and the web based setup is enabled,
* lead the user through the setup routines
*/
void do_welcome(void)
projects / citadel.git / blobdiff