#include "user_ops.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>
+
+
+/*
+ * Wrapper function for ldap_initialize() that consistently fills in the correct fields
+ */
+int ctdl_ldap_initialize(LDAP **ld) {
+
+ char server_url[256];
+ int ret;
+
+ snprintf(server_url, sizeof server_url, "ldap://%s:%d", config.c_ldap_host, config.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 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;
char **values;
char *user_dn = NULL;
-#ifndef LDAP_INITIALIZE
if (fullname) safestrncpy(fullname, username, fullname_size);
- ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
- 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);
}
syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
return(i);
}
-#else
- if (ldap_initialize(&ldserver, config.c_ldap_host))
- {
- syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
- config.c_ldap_host, config.c_ldap_port,
- strerror(errno)
- );
- return(errno);
- }
-
- striplt(config.c_ldap_bind_dn);
- striplt(config.c_ldap_bind_pw);
-
- syslog(LOG_DEBUG, "LDAP bind DN: %s", config.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)
- );
-
- if (i != LDAP_SUCCESS) {
- syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
- return(i);
- }
-#endif
-
tv.tv_sec = 10;
tv.tv_usec = 0;
if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
- sprintf(searchstring, "(sAMAccountName=%s)", username);
+ if (lookup_based_on_username != 0)
+ snprintf(searchstring, sizeof(searchstring), "(displayName=%s)",username);
+ else
+ snprintf(searchstring, sizeof(searchstring), "(sAMAccountName=%s)", username);
}
else {
- sprintf(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);
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 (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);
+ }
}
+ 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 = ldap_init(config.c_ldap_host, config.c_ldap_port);
- 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.
-//
+//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 !0 iff property changed.
-//
+//return !0 iff property changed.
int vcard_set_one_prop_iff_different(struct vCard *v,char *propname, char *newfmt, ...) {
va_list args;
char *newvalue;
int changed_something;
va_start(args,newfmt);
if (-1==vasprintf(&newvalue,newfmt,args)) {
- syslog(LOG_ALERT, "Out of memory!");
+ syslog(LOG_ALERT, "Out of memory!\n");
return 0;
}
changed_something = vcard_set_props_iff_different(v,propname,1,&newvalue);
return changed_something;
}
-
-// Learn LDAP attributes and stuff them into the vCard.
-// Returns nonzero if we changed anything.
-//
+/*
+ * Learn LDAP attributes and stuff them into the vCard.
+ * Returns nonzero if we changed anything.
+ */
int Ctdl_LDAP_to_vCard(char *ldap_dn, struct vCard *v)
{
int changed_something = 0;
if (!ldap_dn) return(0);
if (!v) return(0);
- ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
- 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);
}
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.
+ /* 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");
return(0);
}
- // 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.
+ /* 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) {
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]);
+
if (givenName) ldap_value_free(givenName);
if (initials) ldap_value_free(initials);
if (sn) ldap_value_free(sn);
if (title) ldap_value_free(title);
if (uuid) ldap_value_free(uuid);
}
+ /* free the results */
+ ldap_msgfree(search_result);
- ldap_msgfree(search_result); // free the results
- ldap_unbind(ldserver); // unbind so we can go back in as the authenticating user
- return(changed_something); // tell the caller whether we made any changes
+ /* unbind so we can go back in as the authenticating user */
+ ldap_unbind(ldserver);
+
+ return(changed_something); /* tell the caller whether we made any changes */
}
#endif /* HAVE_LDAP */
projects / citadel.git / blobdiff