#include <curl/curl.h>
#include "ctdl_module.h"
#include "config.h"
+#include "citserver.h"
struct ctdl_openid {
char claimed_id[1024];
char server[1024];
+ int validated;
};
+
+
+
+/**************************************************************************/
+/* */
+/* Functions in this section handle Citadel internal OpenID mapping stuff */
+/* */
+/**************************************************************************/
+
+
+/*
+ * The structure of an openid record *key* is:
+ *
+ * |--------------claimed_id-------------|
+ * (auctual length of claimed id)
+ *
+ *
+ * The structure of an openid record *value* is:
+ *
+ * |-----user_number----|------------claimed_id---------------|
+ * (sizeof long) (actual length of claimed id)
+ *
+ */
+
+
+/*
+ * Attach an OpenID to a Citadel account
+ */
+int attach_openid(struct ctdluser *who, char *claimed_id)
+{
+ struct cdbdata *cdboi;
+ long fetched_usernum;
+ char *data;
+ int data_len;
+
+ if (!who) return(1);
+ if (!claimed_id) return(1);
+ if (IsEmptyStr(claimed_id)) return(1);
+
+ /* Check to see if this OpenID is already in the database */
+
+ cdboi = cdb_fetch(CDB_OPENID, claimed_id, strlen(claimed_id));
+ if (cdboi != NULL) {
+ memcpy(&fetched_usernum, cdboi->ptr, sizeof(long));
+ cdb_free(cdboi);
+
+ if (fetched_usernum == who->usernum) {
+ CtdlLogPrintf(CTDL_INFO, "%s already associated; no action is taken\n", claimed_id);
+ return(0);
+ }
+ else {
+ CtdlLogPrintf(CTDL_INFO, "%s already belongs to another user\n", claimed_id);
+ return(3);
+ }
+ }
+
+ /* Not already in the database, so attach it now */
+
+ data_len = sizeof(long) + strlen(claimed_id) + 1;
+ data = malloc(data_len);
+
+ memcpy(data, &who->usernum, sizeof(long));
+ memcpy(&data[sizeof(long)], claimed_id, strlen(claimed_id) + 1);
+
+ cdb_store(CDB_OPENID, claimed_id, strlen(claimed_id), data, data_len);
+ free(data);
+
+ CtdlLogPrintf(CTDL_INFO, "%s has been associated with %s (%ld)\n",
+ claimed_id, who->fullname, who->usernum);
+ return(0);
+}
+
+
+/*
+ * When a user is being deleted, we have to delete any OpenID associations
+ */
+void openid_purge(struct ctdluser *usbuf) {
+ /* FIXME finish this */
+}
+
+
+
+/*
+ * List the OpenIDs associated with the currently logged in account
+ */
+void cmd_oidl(char *argbuf) {
+ struct cdbdata *cdboi;
+
+ if (CtdlAccessCheck(ac_logged_in)) return;
+ cdb_rewind(CDB_OPENID);
+ cprintf("%d Associated OpenIDs:\n", LISTING_FOLLOWS);
+
+ while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
+ if (cdboi->len > sizeof(long)) {
+ cprintf("%s\n", cdboi->ptr + sizeof(long));
+ }
+ }
+ cprintf("000\n");
+}
+
+
+
+
+/**************************************************************************/
+/* */
+/* Functions in this section handle OpenID protocol */
+/* */
+/**************************************************************************/
+
+
/*
* Locate a <link> tag and, given its 'rel=' parameter, return its 'href' parameter
*/
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,
curl_formfree(formpost);
valbuf[fh.total_bytes_received] = 0;
+
if (bmstrcasestr(valbuf, "is_valid:true")) {
- CtdlLogPrintf(CTDL_DEBUG, "\e[32mAUTHENTICATION SUCCEEDED\e[0m\n", valbuf);
- }
- else {
- CtdlLogPrintf(CTDL_DEBUG, "\e[31mAUTHENTICATION FAILED\e[0m\n", valbuf);
+ oiddata->validated = 1;
}
- /* FIXME do something with the results */
+ 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 (attach_openid(&CC->user, oiddata->claimed_id) == 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)
curl_global_init(CURL_GLOBAL_ALL);
CtdlRegisterProtoHook(cmd_oids, "OIDS", "Setup OpenID authentication");
CtdlRegisterProtoHook(cmd_oidf, "OIDF", "Finalize OpenID authentication");
+ CtdlRegisterProtoHook(cmd_oidl, "OIDL", "List OpenIDs associated with an account");
CtdlRegisterSessionHook(openid_cleanup_function, EVT_STOP);
+ CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
}
/* return our Subversion id for the Log */
return "$Id$";
}
+
+
+/* FIXME ... we have to add the new openid database to serv_vandelay.c */
projects / citadel.git / blobdiff