X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fldap.c;h=864ab4807230af05da9e63e6871f781defc19383;hb=8904d5e7123ba2f4588f48deed392b1a2d9faa39;hp=45051120bbcc27bb8eb11d5b8d447b3a1f052fad;hpb=38b3aec67e67dfaff67670494e6e570bff2246aa;p=citadel.git diff --git a/citadel/ldap.c b/citadel/ldap.c index 45051120b..864ab4807 100644 --- a/citadel/ldap.c +++ b/citadel/ldap.c @@ -1,71 +1,31 @@ /* - * $Id$ - * * These functions implement the portions of AUTHMODE_LDAP and AUTHMODE_LDAP_AD which * actually speak to the LDAP server. * - * Copyright (c) 2009 by Art Cancro and the citadel.org development team. - * This program is released under the terms of the GNU General Public License v3 + * Copyright (c) 2011 by Art Cancro and 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. + * + * 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. */ - int ctdl_require_ldap_version = 3; - -#include "sysdep.h" -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_SYS_STAT_H -#include -#endif - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include #include -#include "auth.h" -#include "citadel.h" -#include "server.h" -#include "database.h" -#include "user_ops.h" -#include "sysdep_decls.h" -#include "support.h" -#include "room_ops.h" -#include "file_ops.h" -#include "control.h" -#include "msgbase.h" -#include "config.h" + #include "citserver.h" -#include "citadel_dirs.h" -#include "genstamp.h" -#include "threads.h" #include "citadel_ldap.h" - #include "ctdl_module.h" +#include "user_ops.h" #ifdef HAVE_LDAP - -#define LDAP_DEPRECATED 1 /* Needed to suppress misleading warnings */ - +#define LDAP_DEPRECATED 1 /* Suppress libldap's warning that we are using deprecated API calls */ #include int CtdlTryUserLDAP(char *username, @@ -82,28 +42,57 @@ int CtdlTryUserLDAP(char *username, 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) { - CtdlLogPrintf(CTDL_ALERT, "LDAP: Could not connect to %s:%d : %s\n", + syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s\n", config.c_ldap_host, config.c_ldap_port, - strerror(errno)); + strerror(errno) + ); 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\n", 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)\n", 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\n", + 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\n", 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) { - CtdlLogPrintf(CTDL_ALERT, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i); + syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i); return(i); } +#endif + tv.tv_sec = 10; tv.tv_usec = 0; @@ -115,24 +104,26 @@ int CtdlTryUserLDAP(char *username, sprintf(searchstring, "(&(objectclass=posixAccount)(uid=%s))", username); } - i = ldap_search_st(ldserver, - config.c_ldap_base_dn, - LDAP_SCOPE_SUBTREE, - searchstring, - NULL, // return all attributes - 0, // attributes + values - &tv, // timeout - &search_result + syslog(LOG_DEBUG, "LDAP search: %s\n", searchstring); + (void) ldap_search_ext_s( + ldserver, /* ld */ + config.c_ldap_base_dn, /* base */ + LDAP_SCOPE_SUBTREE, /* scope */ + searchstring, /* filter */ + NULL, /* attrs (all attributes) */ + 0, /* attrsonly (attrs + values) */ + NULL, /* serverctrls (none) */ + NULL, /* clientctrls (none) */ + &tv, /* timeout */ + 1, /* sizelimit (1 result max) */ + &search_result /* res */ ); - if (i != LDAP_SUCCESS) { - CtdlLogPrintf(CTDL_DEBUG, - "Couldn't find what I was looking for: %s (%d)\n", ldap_err2string(i), i); - ldap_unbind(ldserver); - return(i); - } + /* 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) { - CtdlLogPrintf(CTDL_DEBUG, "No results were returned\n"); + syslog(LOG_DEBUG, "LDAP search: zero results were returned\n"); ldap_unbind(ldserver); return(2); } @@ -145,7 +136,7 @@ int CtdlTryUserLDAP(char *username, user_dn = ldap_get_dn(ldserver, entry); if (user_dn) { - CtdlLogPrintf(CTDL_DEBUG, "dn = %s\n", user_dn); + syslog(LOG_DEBUG, "dn = %s\n", user_dn); } if (config.c_auth_mode == AUTHMODE_LDAP_AD) { @@ -153,7 +144,7 @@ int CtdlTryUserLDAP(char *username, if (values) { if (values[0]) { if (fullname) safestrncpy(fullname, values[0], fullname_size); - CtdlLogPrintf(CTDL_DEBUG, "displayName = %s\n", values[0]); + syslog(LOG_DEBUG, "displayName = %s\n", values[0]); } ldap_value_free(values); } @@ -163,7 +154,7 @@ int CtdlTryUserLDAP(char *username, if (values) { if (values[0]) { if (fullname) safestrncpy(fullname, values[0], fullname_size); - CtdlLogPrintf(CTDL_DEBUG, "cn = %s\n", values[0]); + syslog(LOG_DEBUG, "cn = %s\n", values[0]); } ldap_value_free(values); } @@ -175,7 +166,7 @@ int CtdlTryUserLDAP(char *username, if (values[0]) { if (uid != NULL) { *uid = abs(HashLittle(values[0], strlen(values[0]))); - CtdlLogPrintf(CTDL_DEBUG, "uid hashed from objectGUID = %d\n", *uid); + syslog(LOG_DEBUG, "uid hashed from objectGUID = %d\n", *uid); } } ldap_value_free(values); @@ -185,7 +176,7 @@ int CtdlTryUserLDAP(char *username, values = ldap_get_values(ldserver, search_result, "uidNumber"); if (values) { if (values[0]) { - CtdlLogPrintf(CTDL_DEBUG, "uidNumber = %s\n", values[0]); + syslog(LOG_DEBUG, "uidNumber = %s\n", values[0]); if (uid != NULL) { *uid = atoi(values[0]); } @@ -203,7 +194,7 @@ int CtdlTryUserLDAP(char *username, ldap_unbind(ldserver); if (!user_dn) { - CtdlLogPrintf(CTDL_DEBUG, "No such user was found.\n"); + syslog(LOG_DEBUG, "No such user was found.\n"); return(4); } @@ -213,21 +204,28 @@ int CtdlTryUserLDAP(char *username, } -int CtdlTryPasswordLDAP(char *user_dn, char *password) +int CtdlTryPasswordLDAP(char *user_dn, const char *password) { LDAP *ldserver = NULL; int i = (-1); + if (IsEmptyStr(password)) { + syslog(LOG_DEBUG, "LDAP: empty passwords are not permitted\n"); + return(1); + } + + syslog(LOG_DEBUG, "LDAP: trying to bind as %s\n", user_dn); ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port); if (ldserver) { 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) { - CtdlLogPrintf(CTDL_DEBUG, "LDAP: bind succeeded\n"); + syslog(LOG_DEBUG, "LDAP: bind succeeded\n"); } else { - CtdlLogPrintf(CTDL_DEBUG, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i); + syslog(LOG_DEBUG, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i); } + ldap_set_option(ldserver, LDAP_OPT_REFERRALS, (void *)LDAP_OPT_OFF); ldap_unbind(ldserver); } @@ -245,21 +243,25 @@ int CtdlTryPasswordLDAP(char *user_dn, char *password) */ int Ctdl_LDAP_to_vCard(char *ldap_dn, struct vCard *v) { + int changed_something = 0; + if (!ldap_dn) return(0); if (!v) return(0); /* - * FIXME LDAPSTUB this is a stub function + * FIXME this is a stub function * * ldap_dn will contain the DN of the user, and v will contain a pointer to * the vCard that needs to be (re-)populated. Put the requisite LDAP code here. * vcard_set_prop(v, "email;internet", xxx, 0); - return(1); * return nonzero to tell the caller that we made changes that need to be saved * + * + * return nonzero to tell the caller that we made changes that need to be saved + changed_something = 1; * */ - return(0); /* return zero to tell the caller that we didn't make any changes */ + return(changed_something); /* tell the caller whether we made any changes */ } #endif /* HAVE_LDAP */