/*
- * $Id$
- *
* This is an implementation of OpenID 1.1 Relying Party support, in stateless mode.
*
- * Copyright (c) 2007-2009 by the citadel.org team
+ * Copyright (c) 2007-2011 by the citadel.org team
*
- * This program is free 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.
+ * 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.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * 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
+ * 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
*/
#include "sysdep.h"
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);
}
}
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);
}
}
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);
}
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)) {
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 */
}
}
-
/*
* List the OpenIDs associated with the currently logged in account
*/
}
-
-
/*
* Detach an OpenID from the currently logged in account
*/
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);
}
*/
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;
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))
curl = curl_easy_init();
if (!curl) {
- CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+ syslog(LOG_ALERT, "Unable to initialize libcurl.");
return(-1);
}
#endif
curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180); /* die after 180 seconds */
- if (!IsEmptyStr(config.c_ip_addr)) {
+ 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"))
+ ) {
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);
+ syslog(LOG_DEBUG, "fetch_http() libcurl error %d: %s", res, errmsg);
}
curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
StrBufPlain(url, effective_url, -1);
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));
+ syslog(LOG_DEBUG, "Normalized URL and Claimed ID is: %s", ChrPtr(oiddata->claimed_id));
if ((StrLength(ReplyBuf) > 0) && (i > 0)) {
openid_delegate = NewStrBuf();
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;
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)) {
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)) {
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; i<num_signed_values; ++i) {
CURLFORM_COPYNAME, k_o_keyname,
CURLFORM_COPYCONTENTS, k_value,
CURLFORM_END);
- CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", k_o_keyname, k_value);
+ syslog(LOG_DEBUG, "%25s : %s", k_o_keyname, k_value);
}
else {
- CtdlLogPrintf(CTDL_INFO, "OpenID: signed field '%s' is missing\n",
+ syslog(LOG_INFO, "OpenID: signed field '%s' is missing",
k_keyname);
}
}
#endif
curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180); /* die after 180 seconds */
- if (!IsEmptyStr(config.c_ip_addr)) {
+ 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"))
+ ) {
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);
+ syslog(LOG_DEBUG, "cmd_oidf() libcurl error %d: %s", res, errmsg);
}
curl_easy_cleanup(curl);
curl_formfree(formpost);
}
FreeStrBuf(&ReplyBuf);
- CtdlLogPrintf(CTDL_DEBUG, "Authentication %s.\n", (oiddata->verified ? "succeeded" : "failed") );
+ syslog(LOG_DEBUG, "Authentication %s.", (oiddata->verified ? "succeeded" : "failed") );
/* Respond to the client */
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");
}
}
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");
}
/*
*/
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");
}
/*
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");
}
/*
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.");
}
}
}
}
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";
}