#include <limits.h>
#include <curl/curl.h>
#include "ctdl_module.h"
+#include "config.h"
struct ctdl_openid {
char claimed_id[1024];
char server[1024];
+ int validated;
};
+
+
+
+/**************************************************************************/
+/* */
+/* Functions in this section handle Citadel internal OpenID mapping stuff */
+/* */
+/**************************************************************************/
+
+
+/*
+ * Attach or detach an OpenID to a Citadel account
+ */
+
+enum {
+ moa_detach,
+ moa_attach
+};
+
+int modify_openid_associations(struct ctdluser *who, char *claimed_id, int operation)
+{
+ if (!who) return(1);
+ if (!claimed_id) return(1);
+ if (IsEmptyStr(claimed_id)) return(1);
+
+ return(2); // error because we are not done yet FIXME
+}
+
+
+/*
+ * When a user is being deleted, we have to delete any OpenID associations
+ */
+void openid_purge(struct ctdluser *usbuf) {
+ /* FIXME finish this */
+}
+
+
+
+
+
+
+
+/**************************************************************************/
+/* */
+/* Functions in this section handle OpenID protocol */
+/* */
+/**************************************************************************/
+
+
/*
* Locate a <link> tag and, given its 'rel=' parameter, return its 'href' parameter
*/
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fh_callback);
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
+ if (!IsEmptyStr(config.c_ip_addr)) {
+ curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
+ }
res = curl_easy_perform(curl);
if (res) {
CtdlLogPrintf(CTDL_DEBUG, "fetch_http() libcurl error %d: %s\n", res, errmsg);
struct CitContext *CCC = CC; /* CachedCitContext - performance boost */
struct ctdl_openid *oiddata;
+ /* commented out because we may be attempting to attach an OpenID to
+ * an existing account that is logged in
+ *
if (CCC->logged_in) {
cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN);
return;
}
+ */
if (CCC->openid_data != NULL) {
free(CCC->openid_data);
extract_token(oiddata->claimed_id, argbuf, 0, '|', sizeof oiddata->claimed_id);
extract_token(return_to, argbuf, 1, '|', sizeof return_to);
extract_token(trust_root, argbuf, 2, '|', sizeof trust_root);
+ oiddata->validated = 0;
i = fetch_http(oiddata->claimed_id, buf, sizeof buf - 1, sizeof oiddata->claimed_id);
CtdlLogPrintf(CTDL_DEBUG, "Normalized URL and Claimed ID is: %s\n", oiddata->claimed_id);
char k_keyname[128];
char k_o_keyname[128];
char *k_value = NULL;
+ char valbuf[1024];
+
+ struct fh_data fh = {
+ valbuf,
+ 0,
+ sizeof valbuf
+ };
curl_formadd(&formpost, &lastptr,
CURLFORM_COPYNAME, "openid.mode",
CURLFORM_COPYCONTENTS, "check_authentication",
CURLFORM_END);
+ CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "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);
}
if (GetHash(keys, "sig", 3, (void *) &o_sig)) {
CURLFORM_COPYNAME, "openid.sig",
CURLFORM_COPYCONTENTS, o_sig,
CURLFORM_END);
+ CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.sig", o_sig);
}
if (GetHash(keys, "signed", 6, (void *) &o_signed)) {
CURLFORM_COPYNAME, "openid.signed",
CURLFORM_COPYCONTENTS, o_signed,
CURLFORM_END);
+ CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.signed", o_signed);
num_signed_values = num_tokens(o_signed, ',');
for (i=0; i<num_signed_values; ++i) {
extract_token(k_keyname, o_signed, i, ',', sizeof k_keyname);
- if (GetHash(keys, k_keyname, strlen(k_keyname), (void *) &k_value)) {
- snprintf(k_o_keyname, sizeof k_o_keyname, "openid.%s", k_keyname);
- curl_formadd(&formpost, &lastptr,
- CURLFORM_COPYNAME, k_o_keyname,
- CURLFORM_COPYCONTENTS, k_value,
- CURLFORM_END);
+ if (strcasecmp(k_keyname, "mode")) { // work around phpMyID bug
+ if (GetHash(keys, k_keyname, strlen(k_keyname), (void *) &k_value)) {
+ snprintf(k_o_keyname, sizeof k_o_keyname, "openid.%s", k_keyname);
+ curl_formadd(&formpost, &lastptr,
+ CURLFORM_COPYNAME, k_o_keyname,
+ CURLFORM_COPYCONTENTS, k_value,
+ CURLFORM_END);
+ CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", k_o_keyname, k_value);
+ }
+ else {
+ CtdlLogPrintf(CTDL_INFO, "OpenID: signed field '%s' is missing\n",
+ k_keyname);
+ }
}
}
}
curl_easy_setopt(curl, CURLOPT_URL, oiddata->server);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
- // curl_easy_setopt(curl, CURLOPT_WRITEDATA, &fh);
- // curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fh_callback);
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, &fh);
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fh_callback);
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
+ if (!IsEmptyStr(config.c_ip_addr)) {
+ curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
+ }
+
res = curl_easy_perform(curl);
if (res) {
CtdlLogPrintf(CTDL_DEBUG, "cmd_oidf() libcurl error %d: %s\n", res, errmsg);
curl_easy_cleanup(curl);
curl_formfree(formpost);
- /* FIXME do something with the results */
+ valbuf[fh.total_bytes_received] = 0;
+
+ if (bmstrcasestr(valbuf, "is_valid:true")) {
+ oiddata->validated = 1;
+ }
+
+ CtdlLogPrintf(CTDL_DEBUG, "Authentication %s.\n", (oiddata->validated ? "succeeded" : "failed") );
/* Respond to the client */
- cprintf("message|FIXME finish this\n");
+
+ if (oiddata->validated) {
+
+ /* If we were already logged in, attach the OpenID to the user's account */
+ if (CC->logged_in) {
+ if (modify_openid_associations(&CC->user, oiddata->claimed_id, moa_attach) == 0) {
+ cprintf("attach\n");
+ }
+ else {
+ cprintf("fail\n");
+ }
+ }
+
+ /* Otherwise, a user is attempting to log in using the validated OpenID */
+ else {
+ cprintf("fail\n"); // FIXME do the login here!!
+ }
+
+ }
+ else {
+ cprintf("fail\n");
+ }
cprintf("000\n");
/* Free the hash list */
// sig = [28] vixxxU4MAqWfxxxxCfrHv3TxxxhEw=
+
+
+/**************************************************************************/
+/* */
+/* Functions in this section handle module initialization and shutdown */
+/* */
+/**************************************************************************/
+
+
/*
* This cleanup function blows away the temporary memory used by this module.
*/
}
-
CTDL_MODULE_INIT(openid_rp)
{
if (!threading)
CtdlRegisterProtoHook(cmd_oids, "OIDS", "Setup OpenID authentication");
CtdlRegisterProtoHook(cmd_oidf, "OIDF", "Finalize OpenID authentication");
CtdlRegisterSessionHook(openid_cleanup_function, EVT_STOP);
+ CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
}
/* return our Subversion id for the Log */
projects / citadel.git / blobdiff