/*
* This is an implementation of OpenID 2.0 relying party support in stateless mode.
*
- * Copyright (c) 2007-2011 by the citadel.org team
+ * Copyright (c) 2007-2015 by the citadel.org team
*
* 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
struct cdbdata *cdboi;
long usernum = 0L;
+ if (CtdlGetConfigInt("c_disable_newu"))
+ {
+ cprintf("%d this system does not support openid.\n",
+ ERROR + CMD_NOT_SUPPORTED);
+ return;
+ }
if (CtdlAccessCheck(ac_logged_in)) return;
+
cdb_rewind(CDB_OPENID);
cprintf("%d Associated OpenIDs:\n", LISTING_FOLLOWS);
long usernum;
struct ctdluser usbuf;
+ if (CtdlGetConfigInt("c_disable_newu"))
+ {
+ cprintf("%d this system does not support openid.\n",
+ ERROR + CMD_NOT_SUPPORTED);
+ return;
+ }
if (CtdlAccessCheck(ac_aide)) return;
cdb_rewind(CDB_OPENID);
cprintf("%d List of all OpenIDs in the database:\n", LISTING_FOLLOWS);
void cmd_oidc(char *argbuf) {
ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
+ if (CtdlGetConfigInt("c_disable_newu"))
+ {
+ cprintf("%d this system does not support openid.\n",
+ ERROR + CMD_NOT_SUPPORTED);
+ return;
+ }
if ( (!oiddata) || (!oiddata->verified) ) {
cprintf("%d You have not verified an OpenID yet.\n", ERROR);
return;
int this_is_mine = 0;
long usernum = 0L;
+ if (CtdlGetConfigInt("c_disable_newu"))
+ {
+ cprintf("%d this system does not support openid.\n",
+ ERROR + CMD_NOT_SUPPORTED);
+ return;
+ }
if (CtdlAccessCheck(ac_logged_in)) return;
extract_token(id_to_detach, argbuf, 0, '|', sizeof id_to_detach);
if (IsEmptyStr(id_to_detach)) {
*/
int openid_create_user_via_ax(StrBuf *claimed_id, HashList *sreg_keys)
{
- char *desired_name = NULL;
+ char *nickname = NULL;
+ char *firstname = NULL;
+ char *lastname = NULL;
char new_password[32];
long len;
+ const char *Key;
+ void *Value;
- if (config.c_auth_mode != AUTHMODE_NATIVE) return(1);
- if (config.c_disable_newu) return(2);
+ if (CtdlGetConfigInt("c_auth_mode") != AUTHMODE_NATIVE) return(1);
+ if (CtdlGetConfigInt("c_disable_newu")) return(2);
if (CC->logged_in) return(3);
- if (!GetHash(sreg_keys, "sreg.nickname", 13, (void *) &desired_name)) return(4);
- syslog(LOG_DEBUG, "The desired account name is <%s>", desired_name);
+ HashPos *HashPos = GetNewHashPos(sreg_keys, 0);
+ while (GetNextHashPos(sreg_keys, HashPos, &len, &Key, &Value) != 0) {
+ syslog(LOG_DEBUG, "%s = %s", Key, (char *)Value);
- len = cutuserkey(desired_name);
- if (!CtdlGetUser(&CC->user, desired_name)) {
- syslog(LOG_DEBUG, "<%s> is already taken by another user.", desired_name);
+ if (cbmstrcasestr(Key, "value.nickname") != NULL) {
+ nickname = (char *)Value;
+ }
+ else if ( (nickname == NULL) && (cbmstrcasestr(Key, "value.nickname") != NULL)) {
+ nickname = (char *)Value;
+ }
+ else if (cbmstrcasestr(Key, "value.firstname") != NULL) {
+ firstname = (char *)Value;
+ }
+ else if (cbmstrcasestr(Key, "value.lastname") != NULL) {
+ lastname = (char *)Value;
+ }
+
+ }
+ DeleteHashPos(&HashPos);
+
+ if (nickname == NULL) {
+ if ((firstname != NULL) || (lastname != NULL)) {
+ char fullname[1024] = "";
+ if (firstname) strcpy(fullname, firstname);
+ if (firstname && lastname) strcat(fullname, " ");
+ if (lastname) strcat(fullname, lastname);
+ nickname = fullname;
+ }
+ }
+
+ if (nickname == NULL) {
+ return(4);
+ }
+ syslog(LOG_DEBUG, "The desired account name is <%s>", nickname);
+
+ len = cutuserkey(nickname);
+ if (!CtdlGetUser(&CC->user, nickname)) {
+ syslog(LOG_DEBUG, "<%s> is already taken by another user.", nickname);
memset(&CC->user, 0, sizeof(struct ctdluser));
return(5);
}
/* The desired account name is available. Create the account and log it in! */
- if (create_user(desired_name, len, 1)) return(6);
+ if (create_user(nickname, len, 1)) return(6);
/* Generate a random password.
- * The user doesn't care what the password is since he's using OpenID.
+ * The user doesn't care what the password is since he is using OpenID.
*/
snprintf(new_password, sizeof new_password, "%08lx%08lx", random(), random());
CtdlSetPassword(new_password);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30); /* die after 30 seconds */
if (
- (!IsEmptyStr(config.c_ip_addr))
- && (strcmp(config.c_ip_addr, "*"))
- && (strcmp(config.c_ip_addr, "::"))
- && (strcmp(config.c_ip_addr, "0.0.0.0"))
+ (!IsEmptyStr(CtdlGetConfigStr("c_ip_addr")))
+ && (strcmp(CtdlGetConfigStr("c_ip_addr"), "*"))
+ && (strcmp(CtdlGetConfigStr("c_ip_addr"), "::"))
+ && (strcmp(CtdlGetConfigStr("c_ip_addr"), "0.0.0.0"))
) {
- curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
+ curl_easy_setopt(curl, CURLOPT_INTERFACE, CtdlGetConfigStr("c_ip_addr"));
}
return(curl);
ctdl_openid *oiddata;
int discovery_succeeded = 0;
+ if (CtdlGetConfigInt("c_disable_newu"))
+ {
+ cprintf("%d this system does not support openid.\n",
+ ERROR + CMD_NOT_SUPPORTED);
+ return;
+ }
Free_ctdl_openid ((ctdl_openid**)&CCC->openid_data);
CCC->openid_data = oiddata = malloc(sizeof(ctdl_openid));
return;
}
memset(oiddata, 0, sizeof(ctdl_openid));
- CCC->openid_data = (void *) oiddata;
ArgBuf = NewStrBufPlain(argbuf, -1);
void *Value;
ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
+ if (CtdlGetConfigInt("c_disable_newu"))
+ {
+ cprintf("%d this system does not support openid.\n",
+ ERROR + CMD_NOT_SUPPORTED);
+ return;
+ }
if (oiddata == NULL) {
cprintf("%d run OIDS first.\n", ERROR + INTERNAL_ERROR);
return;
HashPos *HashPos = GetNewHashPos(keys, 0);
while (GetNextHashPos(keys, HashPos, &len, &Key, &Value) != 0) {
- syslog(LOG_DEBUG, "%s = %s", Key, (char *)Value);
if (strcasecmp(Key, "mode")) {
char k_o_keyname[1024];
snprintf(k_o_keyname, sizeof k_o_keyname, "openid.%s", (const char *)Key);
);
}
}
+ DeleteHashPos(&HashPos);
curl = ctdl_openid_curl_easy_init(errmsg);
curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(oiddata->op_url));
* If this system does not allow self-service new user registration, the
* remaining modes do not apply, so fail here and now.
*/
- else if (config.c_disable_newu) {
+ else if (CtdlGetConfigInt("c_disable_newu")) {
cprintf("fail\n");
syslog(LOG_DEBUG, "Creating user failed due to local policy");
}
CTDL_MODULE_INIT(openid_rp)
{
if (!threading) {
- curl_global_init(CURL_GLOBAL_ALL);
+// evcurl call this for us. curl_global_init(CURL_GLOBAL_ALL);
/* Only enable the OpenID command set when native mode authentication is in use. */
- if (config.c_auth_mode == AUTHMODE_NATIVE) {
+ if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_NATIVE) {
CtdlRegisterProtoHook(cmd_oids, "OIDS", "Setup OpenID authentication");
CtdlRegisterProtoHook(cmd_oidf, "OIDF", "Finalize OpenID authentication");
CtdlRegisterProtoHook(cmd_oidl, "OIDL", "List OpenIDs associated with an account");
CtdlRegisterProtoHook(cmd_oidc, "OIDC", "Create new user after validating OpenID");
CtdlRegisterProtoHook(cmd_oida, "OIDA", "List all OpenIDs in the database");
}
- CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT);
+ CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT, PRIO_LOGOUT + 10);
CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
openid_level_supported = 1; /* This module supports OpenID 1.0 only */
}
projects / citadel.git / blobdiff