X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fopenid%2Fserv_openid_rp.c;h=1e50af10bcf8fa2e756c50314ad703df75638f75;hb=51e10374ff0173063c78c750c264ea01570a21ab;hp=a802a6c58da19210e2fbe3d45d01d0d251305de9;hpb=e4df1d9e322acdd8dbfc57ff5d64a8d67b1eb76f;p=citadel.git
diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index a802a6c58..1e50af10b 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -1,11 +1,9 @@
/*
- * $Id$
+ * This is an implementation of OpenID 2.0 RELYING PARTY SUPPORT CURRENTLY B0RKEN AND BEING DEVEL0PZ0RED
*
- * This is an implementation of OpenID 1.1 Relying Party support, in stateless mode.
+ * Copyright (c) 2007-2011 by the citadel.org team
*
- * Copyright (c) 2007-2010 by the citadel.org team
- *
- * This program is free software; you can redistribute it and/or modify
+ * 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.
@@ -16,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 "sysdep.h"
@@ -76,7 +73,7 @@ void openid_cleanup_function(void) {
struct CitContext *CCC = CC; /* CachedCitContext - performance boost */
if (CCC->openid_data != NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "Clearing OpenID session state\n");
+ syslog(LOG_DEBUG, "Clearing OpenID session state");
Free_ctdl_openid((ctdl_openid **) &CCC->openid_data);
}
}
@@ -127,11 +124,11 @@ int attach_openid(struct ctdluser *who, StrBuf *claimed_id)
cdb_free(cdboi);
if (fetched_usernum == who->usernum) {
- CtdlLogPrintf(CTDL_INFO, "%s already associated; no action is taken\n", claimed_id);
+ syslog(LOG_INFO, "%s already associated; no action is taken", ChrPtr(claimed_id));
return(0);
}
else {
- CtdlLogPrintf(CTDL_INFO, "%s already belongs to another user\n", claimed_id);
+ syslog(LOG_INFO, "%s already belongs to another user", ChrPtr(claimed_id));
return(3);
}
}
@@ -150,7 +147,7 @@ int attach_openid(struct ctdluser *who, StrBuf *claimed_id)
snprintf(buf, sizeof buf, "User <%s> (#%ld) has claimed the OpenID URL %s\n",
who->fullname, who->usernum, ChrPtr(claimed_id));
CtdlAideMessage(buf, "OpenID claim");
- CtdlLogPrintf(CTDL_INFO, "%s", buf);
+ syslog(LOG_INFO, "%s", buf);
return(0);
}
@@ -172,7 +169,6 @@ void openid_purge(struct ctdluser *usbuf) {
keys = NewHash(1, NULL);
if (!keys) return;
-
cdb_rewind(CDB_OPENID);
while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
if (cdboi->len > sizeof(long)) {
@@ -190,7 +186,7 @@ void openid_purge(struct ctdluser *usbuf) {
HashPos = GetNewHashPos(keys, 0);
while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0)
{
- CtdlLogPrintf(CTDL_DEBUG, "Deleting associated OpenID <%s>\n", Value);
+ syslog(LOG_DEBUG, "Deleting associated OpenID <%s>", (char*)Value);
cdb_delete(CDB_OPENID, Value, strlen(Value));
/* note: don't free(Value) -- deleting the hash list will handle this for us */
}
@@ -199,7 +195,6 @@ void openid_purge(struct ctdluser *usbuf) {
}
-
/*
* List the OpenIDs associated with the currently logged in account
*/
@@ -369,8 +364,6 @@ void cmd_oidc(char *argbuf) {
}
-
-
/*
* Detach an OpenID from the currently logged in account
*/
@@ -423,11 +416,11 @@ int openid_create_user_via_sreg(StrBuf *claimed_id, HashList *sreg_keys)
if (CC->logged_in) return(3);
if (!GetHash(sreg_keys, "sreg.nickname", 13, (void *) &desired_name)) return(4);
- CtdlLogPrintf(CTDL_DEBUG, "The desired account name is <%s>\n", desired_name);
+ syslog(LOG_DEBUG, "The desired account name is <%s>", desired_name);
len = cutuserkey(desired_name);
if (!CtdlGetUser(&CC->user, desired_name)) {
- CtdlLogPrintf(CTDL_DEBUG, "<%s> is already taken by another user.\n", desired_name);
+ syslog(LOG_DEBUG, "<%s> is already taken by another user.", desired_name);
memset(&CC->user, 0, sizeof(struct ctdluser));
return(5);
}
@@ -487,7 +480,7 @@ int login_via_openid(StrBuf *claimed_id)
*/
void extract_link(StrBuf *target_buf, const char *rel, long repllen, StrBuf *source_buf)
{
- int len, i;
+ int i;
const char *ptr;
const char *href_start = NULL;
const char *href_end = NULL;
@@ -510,8 +503,6 @@ void extract_link(StrBuf *target_buf, const char *rel, long repllen, StrBuf *sou
if (link_tag_end == NULL)
break;
for (i=0; i < 1; i++ ){
- len = link_tag_end - link_tag_start;
-
rel_start = cbmstrcasestr(link_tag_start, "rel=");
if ((rel_start == NULL) ||
(rel_start > link_tag_end))
@@ -553,9 +544,6 @@ void extract_link(StrBuf *target_buf, const char *rel, long repllen, StrBuf *sou
/*
* Begin an HTTP fetch (returns number of bytes actually fetched, or -1 for error) using libcurl.
- *
- * If 'normalize_len' is nonzero, the caller is specifying the buffer size of 'url', and is
- * requesting that the effective (normalized) URL be copied back to it.
*/
int fetch_http(StrBuf *url, StrBuf **target_buf)
{
@@ -571,7 +559,7 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
curl = curl_easy_init();
if (!curl) {
- CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+ syslog(LOG_ALERT, "Unable to initialize libcurl.");
return(-1);
}
@@ -600,7 +588,7 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
}
res = curl_easy_perform(curl);
if (res) {
- CtdlLogPrintf(CTDL_DEBUG, "fetch_http() libcurl error %d: %s\n", res, errmsg);
+ syslog(LOG_DEBUG, "libcurl error %d: %s", res, errmsg);
}
curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
StrBufPlain(url, effective_url, -1);
@@ -610,6 +598,33 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
}
+/*
+ * Attempt to perform YADIS discovery.
+ * If successful, returns nonzero and fills the session's claimed ID blah FIXME this comment
+ * If YADIS fails, returns 0 and does nothing else.
+ */
+int perform_yadis_discovery(StrBuf *YadisURL) {
+ int docbytes = (-1);
+ StrBuf *ReplyBuf = NULL;
+
+ docbytes = fetch_http(YadisURL, &ReplyBuf);
+ if (docbytes < 0) {
+ return(0);
+ }
+ if (docbytes == 0) {
+ FreeStrBuf(&ReplyBuf);
+ return(0);
+ }
+
+ /* ok we have something here. is it an XRDS document? */
+
+ /* FIXME finish this */
+
+ FreeStrBuf(&ReplyBuf);
+ return(0);
+}
+
+
/*
* Setup an OpenID authentication
*/
@@ -621,7 +636,6 @@ void cmd_oids(char *argbuf) {
StrBuf *trust_root = NULL;
StrBuf *openid_delegate = NULL;
StrBuf *RedirectUrl = NULL;
- int i;
struct CitContext *CCC = CC; /* CachedCitContext - performance boost */
ctdl_openid *oiddata;
@@ -637,6 +651,7 @@ void cmd_oids(char *argbuf) {
ArgBuf = NewStrBufPlain(argbuf, -1);
+ oiddata->verified = 0;
oiddata->claimed_id = NewStrBufPlain(NULL, StrLength(ArgBuf));
trust_root = NewStrBufPlain(NULL, StrLength(ArgBuf));
return_to = NewStrBufPlain(NULL, StrLength(ArgBuf));
@@ -644,14 +659,22 @@ void cmd_oids(char *argbuf) {
StrBufExtract_NextToken(oiddata->claimed_id, ArgBuf, &Pos, '|');
StrBufExtract_NextToken(return_to, ArgBuf, &Pos, '|');
StrBufExtract_NextToken(trust_root, ArgBuf, &Pos, '|');
-
- oiddata->verified = 0;
- i = fetch_http(oiddata->claimed_id, &ReplyBuf);
- CtdlLogPrintf(CTDL_DEBUG, "Normalized URL and Claimed ID is: %s\n",
- ChrPtr(oiddata->claimed_id));
- if ((StrLength(ReplyBuf) > 0) && (i > 0)) {
+ syslog(LOG_DEBUG, "User-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id));
+
+
+ /********** OpenID 2.0 section 7.3 - Discovery **********/
+ /* First we're supposed to attempt XRI. What the fuck is XRI and why do I care about it? */
+
+ /* Second we attempt YADIS. Google uses this so we'd better do our best to implement it. */
+ int yadis_succeeded = perform_yadis_discovery(oiddata->claimed_id);
+
+ /* Third we attempt HTML-based discovery. Here we go! */
+ if ( (yadis_succeeded == 0)
+ && (fetch_http(oiddata->claimed_id, &ReplyBuf) > 0)
+ && (StrLength(ReplyBuf) > 0)
+ ) {
openid_delegate = NewStrBuf();
oiddata->server = NewStrBuf();
extract_link(oiddata->server, HKEY("openid.server"), ReplyBuf);
@@ -701,6 +724,7 @@ void cmd_oids(char *argbuf) {
return;
}
+
FreeStrBuf(&ArgBuf);
FreeStrBuf(&ReplyBuf);
FreeStrBuf(&return_to);
@@ -746,13 +770,13 @@ void cmd_oidf(char *argbuf) {
if (len < 0)
len = sizeof(thiskey) - 1;
extract_token(thisdata, buf, 1, '|', sizeof thisdata);
- CtdlLogPrintf(CTDL_DEBUG, "%s: [%d] %s\n", thiskey, strlen(thisdata), thisdata);
+ syslog(LOG_DEBUG, "%s: ["SIZE_T_FMT"] %s", thiskey, strlen(thisdata), thisdata);
Put(keys, thiskey, len, strdup(thisdata), NULL);
}
/* Now that we have all of the parameters, we have to validate the signature against the server */
- CtdlLogPrintf(CTDL_DEBUG, "About to validate the signature...\n");
+ syslog(LOG_DEBUG, "About to validate the signature...");
CURL *curl;
CURLcode res;
@@ -773,14 +797,14 @@ void cmd_oidf(char *argbuf) {
CURLFORM_COPYNAME, "openid.mode",
CURLFORM_COPYCONTENTS, "check_authentication",
CURLFORM_END);
- CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.mode", "check_authentication");
+ syslog(LOG_DEBUG, "%25s : %s", "openid.mode", "check_authentication");
if (GetHash(keys, "assoc_handle", 12, (void *) &o_assoc_handle)) {
curl_formadd(&formpost, &lastptr,
CURLFORM_COPYNAME, "openid.assoc_handle",
CURLFORM_COPYCONTENTS, o_assoc_handle,
CURLFORM_END);
- CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.assoc_handle", o_assoc_handle);
+ syslog(LOG_DEBUG, "%25s : %s", "openid.assoc_handle", o_assoc_handle);
}
if (GetHash(keys, "sig", 3, (void *) &o_sig)) {
@@ -788,7 +812,7 @@ void cmd_oidf(char *argbuf) {
CURLFORM_COPYNAME, "openid.sig",
CURLFORM_COPYCONTENTS, o_sig,
CURLFORM_END);
- CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.sig", o_sig);
+ syslog(LOG_DEBUG, "%25s : %s", "openid.sig", o_sig);
}
if (GetHash(keys, "signed", 6, (void *) &o_signed)) {
@@ -796,7 +820,7 @@ void cmd_oidf(char *argbuf) {
CURLFORM_COPYNAME, "openid.signed",
CURLFORM_COPYCONTENTS, o_signed,
CURLFORM_END);
- CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.signed", o_signed);
+ syslog(LOG_DEBUG, "%25s : %s", "openid.signed", o_signed);
num_signed_values = num_tokens(o_signed, ',');
for (i=0; iverified ? "succeeded" : "failed") );
+ syslog(LOG_DEBUG, "Authentication %s.", (oiddata->verified ? "succeeded" : "failed") );
/* Respond to the client */
@@ -867,11 +891,11 @@ void cmd_oidf(char *argbuf) {
if (CC->logged_in) {
if (attach_openid(&CC->user, oiddata->claimed_id) == 0) {
cprintf("attach\n");
- CtdlLogPrintf(CTDL_DEBUG, "OpenID attach succeeded\n");
+ syslog(LOG_DEBUG, "OpenID attach succeeded");
}
else {
cprintf("fail\n");
- CtdlLogPrintf(CTDL_DEBUG, "OpenID attach failed\n");
+ syslog(LOG_DEBUG, "OpenID attach failed");
}
}
@@ -888,7 +912,7 @@ void cmd_oidf(char *argbuf) {
if (login_via_openid(oiddata->claimed_id) == 0) {
cprintf("authenticate\n%s\n%s\n", CC->user.fullname, CC->user.password);
logged_in_response();
- CtdlLogPrintf(CTDL_DEBUG, "Logged in using previously claimed OpenID\n");
+ syslog(LOG_DEBUG, "Logged in using previously claimed OpenID");
}
/*
@@ -897,7 +921,7 @@ void cmd_oidf(char *argbuf) {
*/
else if (config.c_disable_newu) {
cprintf("fail\n");
- CtdlLogPrintf(CTDL_DEBUG, "Creating user failed due to local policy\n");
+ syslog(LOG_DEBUG, "Creating user failed due to local policy");
}
/*
@@ -906,7 +930,7 @@ void cmd_oidf(char *argbuf) {
else if (openid_create_user_via_sreg(oiddata->claimed_id, keys) == 0) {
cprintf("authenticate\n%s\n%s\n", CC->user.fullname, CC->user.password);
logged_in_response();
- CtdlLogPrintf(CTDL_DEBUG, "Successfully auto-created new user\n");
+ syslog(LOG_DEBUG, "Successfully auto-created new user");
}
/*
@@ -923,7 +947,7 @@ void cmd_oidf(char *argbuf) {
else {
cprintf("\n");
}
- CtdlLogPrintf(CTDL_DEBUG, "The desired Simple Registration name is already taken.\n");
+ syslog(LOG_DEBUG, "The desired Simple Registration name is already taken.");
}
}
}
@@ -966,8 +990,9 @@ CTDL_MODULE_INIT(openid_rp)
}
CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT);
CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
+ openid_level_supported = 1; /* This module supports OpenID 1.0 only */
}
- /* return our Subversion id for the Log */
- return "$Id$";
+ /* return our module name for the log */
+ return "openid_rp";
}