* These functions implement the portions of AUTHMODE_LDAP and AUTHMODE_LDAP_AD which
* actually speak to the LDAP server.
*
- * Copyright (c) 2011-2014 by the citadel.org development team.
+ * Copyright (c) 2011-2017 by the citadel.org development 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.
#include "citadel_ldap.h"
#include "ctdl_module.h"
#include "user_ops.h"
+#include "config.h"
#ifdef HAVE_LDAP
-#define LDAP_DEPRECATED 1 /* Suppress libldap's warning that we are using deprecated API calls */
+#define LDAP_DEPRECATED 1 // Suppress libldap's warning that we are using deprecated API calls
#include <ldap.h>
-
/*
- * This function is a replacement for all calls to ldap_init() in this file.
- * It fills in the required fields with those from the server's global config.
+ * Wrapper function for ldap_initialize() that consistently fills in the correct fields
*/
-LDAP *ctdl_ldap_init(void) {
- return ldap_init(config.c_ldap_host, config.c_ldap_port);
-}
+int ctdl_ldap_initialize(LDAP **ld) {
+ char server_url[256];
+ int ret;
+
+ snprintf(server_url, sizeof server_url, "ldap://%s:%d", CtdlGetConfigStr("c_ldap_host"), CtdlGetConfigInt("c_ldap_port"));
+ ret = ldap_initialize(ld, server_url);
+ if (ret != LDAP_SUCCESS) {
+ syslog(LOG_ALERT, "LDAP: Could not connect to %s : %s", server_url, strerror(errno));
+ *ld = NULL;
+ return(errno);
+ }
+
+ return(ret);
+}
-/*
- * Look up a username in the LDAP directory to see if it's valid for logging in.
+/*
+ * Look up a user in the directory to see if this is an account that can be authenticated
*/
int CtdlTryUserLDAP(char *username,
char *found_dn, int found_dn_size,
char *fullname, int fullname_size,
- uid_t *uid)
+ uid_t *uid, int lookup_based_on_username)
{
LDAP *ldserver = NULL;
int i;
if (fullname) safestrncpy(fullname, username, fullname_size);
- ldserver = ctdl_ldap_init();
- if (ldserver == NULL) {
- syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
- config.c_ldap_host, config.c_ldap_port,
- strerror(errno)
- );
+ if (ctdl_ldap_initialize(&ldserver) != LDAP_SUCCESS) {
return(errno);
}
ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
ldap_set_option(ldserver, LDAP_OPT_REFERRALS, (void *)LDAP_OPT_OFF);
- striplt(config.c_ldap_bind_dn);
- striplt(config.c_ldap_bind_pw);
- syslog(LOG_DEBUG, "LDAP bind DN: %s", config.c_ldap_bind_dn);
+ striplt(CtdlGetConfigStr("c_ldap_bind_dn"));
+ striplt(CtdlGetConfigStr("c_ldap_bind_pw"));
+ syslog(LOG_DEBUG, "LDAP bind DN: %s", CtdlGetConfigStr("c_ldap_bind_dn"));
i = ldap_simple_bind_s(ldserver,
- (!IsEmptyStr(config.c_ldap_bind_dn) ? config.c_ldap_bind_dn : NULL),
- (!IsEmptyStr(config.c_ldap_bind_pw) ? config.c_ldap_bind_pw : NULL)
+ (!IsEmptyStr(CtdlGetConfigStr("c_ldap_bind_dn")) ? CtdlGetConfigStr("c_ldap_bind_dn") : NULL),
+ (!IsEmptyStr(CtdlGetConfigStr("c_ldap_bind_pw")) ? CtdlGetConfigStr("c_ldap_bind_pw") : NULL)
);
if (i != LDAP_SUCCESS) {
syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
tv.tv_sec = 10;
tv.tv_usec = 0;
- if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
- snprintf(searchstring, sizeof(searchstring), "(sAMAccountName=%s)", username);
+ if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD) {
+ if (lookup_based_on_username != 0)
+ snprintf(searchstring, sizeof(searchstring), "(displayName=%s)",username);
+ else
+ snprintf(searchstring, sizeof(searchstring), "(sAMAccountName=%s)", username);
}
else {
- snprintf(searchstring, sizeof(searchstring), "(&(objectclass=posixAccount)(uid=%s))", username);
+ if (lookup_based_on_username != 0) {
+ snprintf(searchstring, sizeof(searchstring), "(cn=%s)",username);
+ }
+ else {
+ snprintf(searchstring, sizeof(searchstring), "(&(objectclass=posixAccount)(uid=%s))", username);
+ }
}
syslog(LOG_DEBUG, "LDAP search: %s", searchstring);
(void) ldap_search_ext_s(
ldserver, /* ld */
- config.c_ldap_base_dn, /* base */
+ CtdlGetConfigStr("c_ldap_base_dn"), /* base */
LDAP_SCOPE_SUBTREE, /* scope */
searchstring, /* filter */
NULL, /* attrs (all attributes) */
syslog(LOG_DEBUG, "dn = %s", user_dn);
}
- if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
+ if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD) {
values = ldap_get_values(ldserver, search_result, "displayName");
if (values) {
if (values[0]) {
ldap_value_free(values);
}
}
-
- if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
- values = ldap_get_values(ldserver, search_result, "objectGUID");
- if (values) {
- if (values[0]) {
- if (uid != NULL) {
- *uid = abs(HashLittle(values[0], strlen(values[0])));
- syslog(LOG_DEBUG, "uid hashed from objectGUID = %d", *uid);
+ /* If we know the username is the CN/displayName, we already set the uid*/
+ if (lookup_based_on_username==0) {
+ if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD) {
+ values = ldap_get_values(ldserver, search_result, "objectGUID");
+ if (values) {
+ if (values[0]) {
+ if (uid != NULL) {
+ *uid = abs(HashLittle(values[0], strlen(values[0])));
+ syslog(LOG_DEBUG, "uid hashed from objectGUID = %d", *uid);
+ }
}
+ ldap_value_free(values);
}
- ldap_value_free(values);
}
- }
- else {
- values = ldap_get_values(ldserver, search_result, "uidNumber");
- if (values) {
- if (values[0]) {
- syslog(LOG_DEBUG, "uidNumber = %s", values[0]);
- if (uid != NULL) {
- *uid = atoi(values[0]);
+ else {
+ values = ldap_get_values(ldserver, search_result, "uidNumber");
+ if (values) {
+ if (values[0]) {
+ syslog(LOG_DEBUG, "uidNumber = %s", values[0]);
+ if (uid != NULL) {
+ *uid = atoi(values[0]);
+ }
}
+ ldap_value_free(values);
}
- ldap_value_free(values);
}
}
}
syslog(LOG_DEBUG, "LDAP: trying to bind as %s", user_dn);
- ldserver = ctdl_ldap_init();
- if (ldserver) {
+ i = ctdl_ldap_initialize(&ldserver);
+ if (i == LDAP_SUCCESS) {
ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
i = ldap_simple_bind_s(ldserver, user_dn, password);
if (i == LDAP_SUCCESS) {
return(1);
}
+
//return !0 iff property changed.
int vcard_set_props_iff_different(struct vCard *v,char *propname,int numvals, char **vals) {
int i;
- char *oldval;
+ char *oldval = "";
for(i=0;i<numvals;i++) {
oldval = vcard_get_prop(v,propname,0,i,0);
if (oldval == NULL) break;
if (strcmp(vals[i],oldval)) break;
}
if (i!=numvals) {
+ syslog(LOG_DEBUG, "LDAP: vcard property %s, element %d of %d changed from %s to %s\n", propname, i, numvals, oldval, vals[i]);
for(i=0;i<numvals;i++) vcard_set_prop(v,propname,vals[i],(i==0) ? 0 : 1);
return 1;
}
return changed_something;
}
+
/*
* Learn LDAP attributes and stuff them into the vCard.
* Returns nonzero if we changed anything.
if (!ldap_dn) return(0);
if (!v) return(0);
- ldserver = ctdl_ldap_init();
- if (ldserver == NULL) {
- syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
- config.c_ldap_host, config.c_ldap_port,
- strerror(errno)
- );
+
+ if (ctdl_ldap_initialize(&ldserver) != LDAP_SUCCESS) {
return(0);
}
ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
ldap_set_option(ldserver, LDAP_OPT_REFERRALS, (void *)LDAP_OPT_OFF);
- striplt(config.c_ldap_bind_dn);
- striplt(config.c_ldap_bind_pw);
- syslog(LOG_DEBUG, "LDAP bind DN: %s", config.c_ldap_bind_dn);
+ striplt(CtdlGetConfigStr("c_ldap_bind_dn"));
+ striplt(CtdlGetConfigStr("c_ldap_bind_pw"));
+ syslog(LOG_DEBUG, "LDAP bind DN: %s", CtdlGetConfigStr("c_ldap_bind_dn"));
i = ldap_simple_bind_s(ldserver,
- (!IsEmptyStr(config.c_ldap_bind_dn) ? config.c_ldap_bind_dn : NULL),
- (!IsEmptyStr(config.c_ldap_bind_pw) ? config.c_ldap_bind_pw : NULL)
+ (!IsEmptyStr(CtdlGetConfigStr("c_ldap_bind_dn")) ? CtdlGetConfigStr("c_ldap_bind_dn") : NULL),
+ (!IsEmptyStr(CtdlGetConfigStr("c_ldap_bind_pw")) ? CtdlGetConfigStr("c_ldap_bind_pw") : NULL)
);
if (i != LDAP_SUCCESS) {
syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
syslog(LOG_DEBUG, "LDAP search: %s", ldap_dn);
(void) ldap_search_ext_s(
- ldserver, /* ld */
- ldap_dn, /* base */
- LDAP_SCOPE_SUBTREE, /* scope */
- NULL, /* filter */
- attrs, /* attrs (all attributes) */
- 0, /* attrsonly (attrs + values) */
- NULL, /* serverctrls (none) */
- NULL, /* clientctrls (none) */
- &tv, /* timeout */
- 1, /* sizelimit (1 result max) */
- &search_result /* res */
+ ldserver, // ld
+ ldap_dn, // base
+ LDAP_SCOPE_SUBTREE, // scope
+ NULL, // filter
+ attrs, // attrs (all attributes)
+ 0, // attrsonly (attrs + values)
+ NULL, // serverctrls (none)
+ NULL, // clientctrls (none)
+ &tv, // timeout
+ 1, // sizelimit (1 result max)
+ &search_result // res
);
/* Ignore the return value of ldap_search_ext_s(). Sometimes it returns an error even when
* the search succeeds. Instead, we check to see whether search_result is still NULL.
*/
-
if (search_result == NULL) {
syslog(LOG_DEBUG, "LDAP search: zero results were returned");
ldap_unbind(ldserver);
/* At this point we've got at least one result from our query. If there are multiple
* results, we still only look at the first one.
*/
-
entry = ldap_first_entry(ldserver, search_result);
if (entry) {
syslog(LOG_DEBUG, "LDAP search, got user details for vcard.");
if (mail) {
changed_something |= vcard_set_props_iff_different(v,"email;internet",ldap_count_values(mail),mail);
}
- if (uuid) changed_something |= vcard_set_one_prop_iff_different(v,"uid","%s",uuid[0]);
+ if (uuid) changed_something |= vcard_set_one_prop_iff_different(v,"X-uuid","%s",uuid[0]);
if (o) changed_something |= vcard_set_one_prop_iff_different(v,"org","%s",o[0]);
if (cn) changed_something |= vcard_set_one_prop_iff_different(v,"fn","%s",cn[0]);
if (title) changed_something |= vcard_set_one_prop_iff_different(v,"title","%s",title[0]);
projects / citadel.git / blobdiff