From: Art Cancro Date: Sat, 28 Oct 2017 04:48:09 +0000 (-0400) Subject: CDB_OPENID is now CDB_EXTAUTH X-Git-Tag: v939~514 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=220efd57cbdbf4fa2036380362dd1880c125c723 CDB_OPENID is now CDB_EXTAUTH --- diff --git a/citadel/config.c b/citadel/config.c index d9eee63e7..bcbfd143b 100644 --- a/citadel/config.c +++ b/citadel/config.c @@ -322,6 +322,9 @@ void initialize_config_system(void) { if (CtdlGetConfigLong("c_pop3_fastest") == 0) CtdlSetConfigLong("c_pop3_fastest", 3600); // once per hour default if (CtdlGetConfigLong("c_pop3_fastest") < 300) CtdlSetConfigLong("c_pop3_fastest", 300); // 5 minutes min + /* LDAP sync frequency */ + if (CtdlGetConfigLong("c_ldap_sync_freq") == 0) CtdlSetConfigLong("c_ldap_sync_freq", 300); // every 5 minutes default + /* "create new user" only works with native authentication mode */ if (CtdlGetConfigInt("c_auth_mode") != AUTHMODE_NATIVE) { CtdlSetConfigInt("c_disable_newu", 1); diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c index f3577c0cf..ea87c91bb 100644 --- a/citadel/housekeeping.c +++ b/citadel/housekeeping.c @@ -19,6 +19,7 @@ #include "serv_extensions.h" #include "room_ops.h" #include "internet_addressing.h" +#include "config.h" #include "journaling.h" #include "citadel_ldap.h" @@ -127,10 +128,16 @@ void do_housekeeping(void) { /* Then, do the "once per minute" stuff... */ if (do_perminute_housekeeping_now) { cdb_check_handles(); -#ifdef HAVE_LDAP - CtdlSynchronizeUsersFromLDAP(); // This one isn't from a module so we put it here -#endif PerformSessionHooks(EVT_TIMER); // Run all registered TIMER hooks + +#ifdef HAVE_LDAP // LDAP sync isn't in a module so we can put it here + static time_t last_ldap_sync = 0L; + if ( (now - last_ldap_sync) > (time_t)CtdlGetConfigLong("c_ldap_sync_freq") ) { + CtdlSynchronizeUsersFromLDAP(); + last_ldap_sync = time(NULL); + } +#endif + } /* diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c index e9d522647..a275ca8a4 100644 --- a/citadel/modules/expire/serv_expire.c +++ b/citadel/modules/expire/serv_expire.c @@ -786,9 +786,9 @@ int PurgeEuidIndexTable(void) { /* - * Purge OpenID assocations for missing users (theoretically this will never delete anything) + * Purge external auth assocations for missing users (theoretically this will never delete anything) */ -int PurgeStaleOpenIDassociations(void) { +int PurgeStaleExtAuthAssociations(void) { struct cdbdata *cdboi; struct ctdluser usbuf; HashList *keys = NULL; @@ -804,8 +804,8 @@ int PurgeStaleOpenIDassociations(void) { if (!keys) return(0); - cdb_rewind(CDB_OPENID); - while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) { + cdb_rewind(CDB_EXTAUTH); + while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) { if (cdboi->len > sizeof(long)) { memcpy(&usernum, cdboi->ptr, sizeof(long)); if (CtdlGetUserByNumber(&usbuf, usernum) != 0) { @@ -821,8 +821,8 @@ int PurgeStaleOpenIDassociations(void) { HashPos = GetNewHashPos(keys, 0); while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0) { - syslog(LOG_DEBUG, "Deleting associated OpenID <%s>", (char*)Value); - cdb_delete(CDB_OPENID, Value, strlen(Value)); + syslog(LOG_DEBUG, "Deleting associated external authenticator <%s>", (char*)Value); + cdb_delete(CDB_EXTAUTH, Value, strlen(Value)); /* note: don't free(Value) -- deleting the hash list will handle this for us */ ++num_deleted; } @@ -883,7 +883,6 @@ void purge_databases(void) ErrMsg = NewStrBuf (); retval = PurgeUseTable(ErrMsg); syslog(LOG_NOTICE, "Purged %d entries from the use table.", retval); -////TODO: fix errmsg FreeStrBuf(&ErrMsg); } @@ -895,8 +894,8 @@ void purge_databases(void) if (!server_shutting_down) { - retval = PurgeStaleOpenIDassociations(); - syslog(LOG_NOTICE, "Purged %d stale OpenID associations.", retval); + retval = PurgeStaleExtAuthAssociations(); + syslog(LOG_NOTICE, "Purged %d stale external auth associations.", retval); } if (!server_shutting_down) diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c index 9fc771ec0..aba5cdb23 100644 --- a/citadel/modules/migrate/serv_migrate.c +++ b/citadel/modules/migrate/serv_migrate.c @@ -1,7 +1,7 @@ /* * This module dumps and/or loads the Citadel database in XML format. * - * Copyright (c) 1987-2016 by the citadel.org team + * Copyright (c) 1987-2017 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 version 3. @@ -366,8 +366,8 @@ void migr_export_openids(void) { long usernum; char url[512]; - cdb_rewind(CDB_OPENID); - while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) { + cdb_rewind(CDB_EXTAUTH); + while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) { if (cdboi->len > sizeof(long)) { client_write(HKEY("\n")); memcpy(&usernum, cdboi->ptr, sizeof(long)); @@ -712,7 +712,7 @@ void migr_xml_end(void *data, const char *el) oid_data = malloc(oid_data_len); memcpy(oid_data, &openid_usernum, sizeof(long)); memcpy(&oid_data[sizeof(long)], openid_url, strlen(openid_url) + 1); - cdb_store(CDB_OPENID, openid_url, strlen(openid_url), oid_data, oid_data_len); + cdb_store(CDB_EXTAUTH, openid_url, strlen(openid_url), oid_data, oid_data_len); free(oid_data); syslog(LOG_INFO, "Imported OpenID: %s (%ld)", openid_url, openid_usernum); } diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c index 748da3bed..a2bc46083 100644 --- a/citadel/modules/openid/serv_openid_rp.c +++ b/citadel/modules/openid/serv_openid_rp.c @@ -1,7 +1,7 @@ /* * This is an implementation of OpenID 2.0 relying party support in stateless mode. * - * Copyright (c) 2007-2015 by the citadel.org team + * Copyright (c) 2007-2017 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 @@ -82,7 +82,7 @@ void openid_cleanup_function(void) { struct CitContext *CCC = CC; /* CachedCitContext - performance boost */ if (CCC->openid_data != NULL) { - syslog(LOG_DEBUG, "Clearing OpenID session state"); + syslog(LOG_DEBUG, "openid: Clearing OpenID session state"); Free_ctdl_openid((ctdl_openid **) &CCC->openid_data); } } @@ -127,17 +127,17 @@ int attach_openid(struct ctdluser *who, StrBuf *claimed_id) /* Check to see if this OpenID is already in the database */ - cdboi = cdb_fetch(CDB_OPENID, ChrPtr(claimed_id), StrLength(claimed_id)); + cdboi = cdb_fetch(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id)); if (cdboi != NULL) { memcpy(&fetched_usernum, cdboi->ptr, sizeof(long)); cdb_free(cdboi); if (fetched_usernum == who->usernum) { - syslog(LOG_INFO, "%s already associated; no action is taken", ChrPtr(claimed_id)); + syslog(LOG_INFO, "openid: %s already associated; no action is taken", ChrPtr(claimed_id)); return(0); } else { - syslog(LOG_INFO, "%s already belongs to another user", ChrPtr(claimed_id)); + syslog(LOG_INFO, "openid: %s already belongs to another user", ChrPtr(claimed_id)); return(3); } } @@ -150,13 +150,13 @@ int attach_openid(struct ctdluser *who, StrBuf *claimed_id) memcpy(data, &who->usernum, sizeof(long)); memcpy(&data[sizeof(long)], ChrPtr(claimed_id), StrLength(claimed_id) + 1); - cdb_store(CDB_OPENID, ChrPtr(claimed_id), StrLength(claimed_id), data, data_len); + cdb_store(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id), data, data_len); free(data); 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"); - syslog(LOG_INFO, "%s", buf); + syslog(LOG_INFO, "openid: %s", buf); return(0); } @@ -178,8 +178,8 @@ 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) { + cdb_rewind(CDB_EXTAUTH); + while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) { if (cdboi->len > sizeof(long)) { memcpy(&usernum, cdboi->ptr, sizeof(long)); if (usernum == usbuf->usernum) { @@ -195,8 +195,8 @@ void openid_purge(struct ctdluser *usbuf) { HashPos = GetNewHashPos(keys, 0); while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0) { - syslog(LOG_DEBUG, "Deleting associated OpenID <%s>", (char*)Value); - cdb_delete(CDB_OPENID, Value, strlen(Value)); + syslog(LOG_DEBUG, "openid: deleting associated OpenID <%s>", (char*)Value); + cdb_delete(CDB_EXTAUTH, Value, strlen(Value)); /* note: don't free(Value) -- deleting the hash list will handle this for us */ } DeleteHashPos(&HashPos); @@ -219,10 +219,10 @@ void cmd_oidl(char *argbuf) { } if (CtdlAccessCheck(ac_logged_in)) return; - cdb_rewind(CDB_OPENID); + cdb_rewind(CDB_EXTAUTH); cprintf("%d Associated OpenIDs:\n", LISTING_FOLLOWS); - while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) { + while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) { if (cdboi->len > sizeof(long)) { memcpy(&usernum, cdboi->ptr, sizeof(long)); if (usernum == CC->user.usernum) { @@ -250,10 +250,10 @@ void cmd_oida(char *argbuf) { return; } if (CtdlAccessCheck(ac_aide)) return; - cdb_rewind(CDB_OPENID); + cdb_rewind(CDB_EXTAUTH); cprintf("%d List of all OpenIDs in the database:\n", LISTING_FOLLOWS); - while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) { + while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) { if (cdboi->len > sizeof(long)) { memcpy(&usernum, cdboi->ptr, sizeof(long)); if (CtdlGetUserByNumber(&usbuf, usernum) != 0) { @@ -323,8 +323,8 @@ void cmd_oidd(char *argbuf) { cprintf("%d An empty OpenID URL is not allowed.\n", ERROR + ILLEGAL_VALUE); } - cdb_rewind(CDB_OPENID); - while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) { + cdb_rewind(CDB_EXTAUTH); + while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) { if (cdboi->len > sizeof(long)) { memcpy(&usernum, cdboi->ptr, sizeof(long)); if (usernum == CC->user.usernum) { @@ -340,7 +340,7 @@ void cmd_oidd(char *argbuf) { return; } - cdb_delete(CDB_OPENID, id_to_detach, strlen(id_to_detach)); + cdb_delete(CDB_EXTAUTH, id_to_detach, strlen(id_to_detach)); cprintf("%d %s detached from your account.\n", CIT_OK, id_to_detach); } @@ -364,7 +364,7 @@ int openid_create_user_via_ax(StrBuf *claimed_id, HashList *sreg_keys) HashPos *HashPos = GetNewHashPos(sreg_keys, 0); while (GetNextHashPos(sreg_keys, HashPos, &len, &Key, &Value) != 0) { - syslog(LOG_DEBUG, "%s = %s", Key, (char *)Value); + syslog(LOG_DEBUG, "openid: %s = %s", Key, (char *)Value); if (cbmstrcasestr(Key, "value.nickname") != NULL) { nickname = (char *)Value; @@ -395,11 +395,11 @@ int openid_create_user_via_ax(StrBuf *claimed_id, HashList *sreg_keys) if (nickname == NULL) { return(4); } - syslog(LOG_DEBUG, "The desired account name is <%s>", nickname); + syslog(LOG_DEBUG, "openid: 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); + syslog(LOG_DEBUG, "openid: <%s> is already taken by another user.", nickname); memset(&CC->user, 0, sizeof(struct ctdluser)); return(5); } @@ -429,7 +429,7 @@ int login_via_openid(StrBuf *claimed_id) struct cdbdata *cdboi; long usernum = 0; - cdboi = cdb_fetch(CDB_OPENID, ChrPtr(claimed_id), StrLength(claimed_id)); + cdboi = cdb_fetch(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id)); if (cdboi == NULL) { return(-1); } @@ -679,7 +679,7 @@ int parse_xrds_document(StrBuf *ReplyBuf) { XML_ParserFree(xp); } else { - syslog(LOG_ALERT, "Cannot create XML parser"); + syslog(LOG_ERR, "openid: cannot create XML parser"); } if (xrds.selected_service_priority < INT_MAX) { @@ -738,7 +738,7 @@ int perform_openid2_discovery(StrBuf *SuppliedURL) { StrBuf *x_xrds_location = NULL; if (!SuppliedURL) return(0); - syslog(LOG_DEBUG, "perform_openid2_discovery(%s)", ChrPtr(SuppliedURL)); + syslog(LOG_DEBUG, "openid: perform_openid2_discovery(%s)", ChrPtr(SuppliedURL)); if (StrLength(SuppliedURL) == 0) return(0); ReplyBuf = NewStrBuf(); @@ -760,7 +760,7 @@ int perform_openid2_discovery(StrBuf *SuppliedURL) { result = curl_easy_perform(curl); if (result) { - syslog(LOG_DEBUG, "libcurl error %d: %s", result, errmsg); + syslog(LOG_DEBUG, "openid: libcurl error %d: %s", result, errmsg); } curl_slist_free_all(my_headers); curl_easy_cleanup(curl); @@ -787,7 +787,7 @@ int perform_openid2_discovery(StrBuf *SuppliedURL) { if ( (x_xrds_location) && (strcmp(ChrPtr(x_xrds_location), ChrPtr(SuppliedURL))) ) { - syslog(LOG_DEBUG, "X-XRDS-Location: %s ... recursing!", ChrPtr(x_xrds_location)); + syslog(LOG_DEBUG, "openid: X-XRDS-Location: %s ... recursing!", ChrPtr(x_xrds_location)); return_value = perform_openid2_discovery(x_xrds_location); FreeStrBuf(&x_xrds_location); } @@ -842,7 +842,7 @@ void cmd_oids(char *argbuf) { CCC->openid_data = oiddata = malloc(sizeof(ctdl_openid)); if (oiddata == NULL) { - syslog(LOG_ALERT, "malloc() failed: %s", strerror(errno)); + syslog(LOG_ERR, "openid: malloc() failed: %s", strerror(errno)); cprintf("%d malloc failed\n", ERROR + INTERNAL_ERROR); return; } @@ -857,7 +857,7 @@ void cmd_oids(char *argbuf) { StrBufExtract_NextToken(oiddata->claimed_id, ArgBuf, &Pos, '|'); StrBufExtract_NextToken(return_to, ArgBuf, &Pos, '|'); - syslog(LOG_DEBUG, "User-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id)); + syslog(LOG_DEBUG, "openid: user-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id)); /********** OpenID 2.0 section 7.3 - Discovery **********/ @@ -878,7 +878,7 @@ void cmd_oids(char *argbuf) { /* * If we get to this point we are in possession of a valid OpenID Provider URL. */ - syslog(LOG_DEBUG, "OP URI '%s' discovered using method %d", + syslog(LOG_DEBUG, "openid: OP URI '%s' discovered using method %d", ChrPtr(oiddata->op_url), discovery_succeeded ); @@ -939,7 +939,7 @@ void cmd_oids(char *argbuf) { StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ax.type.nickname="), 0); StrBufUrlescAppend(RedirectUrl, NULL, "http://axschema.org/namePerson/nickname"); - syslog(LOG_DEBUG, "OpenID: redirecting client to %s", ChrPtr(RedirectUrl)); + syslog(LOG_DEBUG, "openid: redirecting client to %s", ChrPtr(RedirectUrl)); cprintf("%d %s\n", CIT_OK, ChrPtr(RedirectUrl)); } @@ -1002,7 +1002,7 @@ void cmd_oidf(char *argbuf) { if ( (!GetHash(keys, "ns", 2, (void *) &openid_ns)) || (strcasecmp(openid_ns, "http://specs.openid.net/auth/2.0")) ) { - syslog(LOG_DEBUG, "This is not an an OpenID assertion"); + syslog(LOG_DEBUG, "openid: this is not an an OpenID assertion"); oiddata->verified = 0; } @@ -1017,11 +1017,11 @@ void cmd_oidf(char *argbuf) { if (GetHash(keys, "claimed_id", 10, (void *) &openid_claimed_id)) { FreeStrBuf(&oiddata->claimed_id); oiddata->claimed_id = NewStrBufPlain(openid_claimed_id, -1); - syslog(LOG_DEBUG, "Provider is asserting the Claimed ID '%s'", ChrPtr(oiddata->claimed_id)); + syslog(LOG_DEBUG, "openid: provider is asserting the Claimed ID '%s'", ChrPtr(oiddata->claimed_id)); } /* Validate the assertion against the server */ - syslog(LOG_DEBUG, "Validating..."); + syslog(LOG_DEBUG, "openid: validating..."); CURL *curl; CURLcode res; @@ -1058,19 +1058,18 @@ void cmd_oidf(char *argbuf) { res = curl_easy_perform(curl); if (res) { - syslog(LOG_DEBUG, "cmd_oidf() libcurl error %d: %s", res, errmsg); + syslog(LOG_DEBUG, "openid: cmd_oidf() libcurl error %d: %s", res, errmsg); oiddata->verified = 0; } curl_easy_cleanup(curl); curl_formfree(formpost); - /* syslog(LOG_DEBUG, "Validation reply: \n%s", ChrPtr(ReplyBuf)); */ if (cbmstrcasestr(ChrPtr(ReplyBuf), "is_valid:true") == NULL) { oiddata->verified = 0; } FreeStrBuf(&ReplyBuf); - syslog(LOG_DEBUG, "OpenID authentication %s", (oiddata->verified ? "succeeded" : "failed") ); + syslog(LOG_DEBUG, "openid: authentication %s", (oiddata->verified ? "succeeded" : "failed") ); /* Respond to the client */ @@ -1080,11 +1079,11 @@ void cmd_oidf(char *argbuf) { if (CC->logged_in) { if (attach_openid(&CC->user, oiddata->claimed_id) == 0) { cprintf("attach\n"); - syslog(LOG_DEBUG, "OpenID attach succeeded"); + syslog(LOG_DEBUG, "openid: attach succeeded"); } else { cprintf("fail\n"); - syslog(LOG_DEBUG, "OpenID attach failed"); + syslog(LOG_DEBUG, "openid: attach failed"); } } @@ -1101,7 +1100,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(); - syslog(LOG_DEBUG, "Logged in using previously claimed OpenID"); + syslog(LOG_DEBUG, "openid: logged in using previously claimed OpenID"); } /* @@ -1110,7 +1109,7 @@ void cmd_oidf(char *argbuf) { */ else if (CtdlGetConfigInt("c_disable_newu")) { cprintf("fail\n"); - syslog(LOG_DEBUG, "Creating user failed due to local policy"); + syslog(LOG_DEBUG, "openid: creating user failed due to local policy"); } /* @@ -1119,7 +1118,7 @@ void cmd_oidf(char *argbuf) { else if (openid_create_user_via_ax(oiddata->claimed_id, keys) == 0) { cprintf("authenticate\n%s\n%s\n", CC->user.fullname, CC->user.password); logged_in_response(); - syslog(LOG_DEBUG, "Successfully auto-created new user"); + syslog(LOG_DEBUG, "openid: successfully auto-created new user"); } /* @@ -1136,7 +1135,7 @@ void cmd_oidf(char *argbuf) { else { cprintf("\n"); } - syslog(LOG_DEBUG, "The desired display name is already taken."); + syslog(LOG_DEBUG, "openid: the desired display name is already taken."); } } } diff --git a/citadel/server.h b/citadel/server.h index 4a6dbc1d2..bfb5a2954 100644 --- a/citadel/server.h +++ b/citadel/server.h @@ -1,7 +1,7 @@ /* * Main declarations file for the Citadel server * - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2017 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, version 3. @@ -210,7 +210,7 @@ enum { CDB_FULLTEXT, /* full text search index */ CDB_EUIDINDEX, /* locate msgs by EUID */ CDB_USERSBYNUMBER, /* index of users by number */ - CDB_OPENID, /* associates OpenIDs with users */ + CDB_EXTAUTH, /* associates OpenIDs with users */ CDB_CONFIG, /* system configuration database */ MAXCDB /* total number of CDB's defined */ };