#include "channels.h"
#include "modules.h"
-/* FIXME */
-#define LDAP_DEPRECATED 1
#include <ldap.h>
/* $ModDesc: Allow/Deny connections based upon answer from LDAP server */
std::string ldapserver;
std::string allowpattern;
std::string killreason;
+ std::string username;
+ std::string password;
int searchscope;
bool verbose;
LDAP *conn;
virtual ~ModuleLDAPAuth()
{
if (conn)
- ldap_unbind_s(conn);
+ ldap_unbind_ext(conn, NULL, NULL);
}
virtual void OnRehash(User* user, const std::string ¶meter)
{
ConfigReader Conf(ServerInstance);
- base = Conf.ReadValue("ldapauth", "baserdn", 0);
- attribute = Conf.ReadValue("ldapauth", "attribute", 0);
- ldapserver = Conf.ReadValue("ldapauth", "server", 0);
- allowpattern = Conf.ReadValue("ldapauth", "allowpattern", 0);
- killreason = Conf.ReadValue("ldapauth", "killreason", 0);
+ base = Conf.ReadValue("ldapauth", "baserdn", 0);
+ attribute = Conf.ReadValue("ldapauth", "attribute", 0);
+ ldapserver = Conf.ReadValue("ldapauth", "server", 0);
+ allowpattern = Conf.ReadValue("ldapauth", "allowpattern", 0);
+ killreason = Conf.ReadValue("ldapauth", "killreason", 0);
std::string scope = Conf.ReadValue("ldapauth", "searchscope", 0);
- verbose = Conf.ReadFlag("ldapauth", "verbose", 0); /* Set to true if failed connects should be reported to operators */
+ username = Conf.ReadValue("ldapauth", "binddn", 0);
+ password = Conf.ReadValue("ldapauth", "bindauth", 0);
+ verbose = Conf.ReadFlag("ldapauth", "verbose", 0); /* Set to true if failed connects should be reported to operators */
if (scope == "base")
searchscope = LDAP_SCOPE_BASE;
bool Connect()
{
if (conn != NULL)
- ldap_unbind_s(conn);
+ ldap_unbind_ext(conn, NULL, NULL);
int res, v = LDAP_VERSION3;
res = ldap_initialize(&conn, ldapserver.c_str());
if (res != LDAP_SUCCESS)
{
if (verbose)
ServerInstance->SNO->WriteToSnoMask('A', "LDAP set protocol to v3 failed: %s", ldap_err2string(res));
- ldap_unbind_s(conn);
+ ldap_unbind_ext(conn, NULL, NULL);
conn = NULL;
return false;
}
return false;
int res;
- // bind anonymously
- if ((res = ldap_simple_bind_s(conn, "", "")) != LDAP_SUCCESS)
- {
+ char* authpass = strdup(password.c_str());
+ // bind anonymously if no bind DN and authentication are given in the config
+ struct berval cred;
+ cred.bv_val = authpass;
+ cred.bv_len = password.length();
+
+ if ((res = ldap_sasl_bind_s(conn, username.c_str(), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) != LDAP_SUCCESS)
+ {
+ free(authpass);
if (verbose)
- ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP bind anonymously failed: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
- ldap_unbind_s(conn);
+ ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP bind failed: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
+ ldap_unbind_ext(conn, NULL, NULL);
conn = NULL;
return false;
}
+ free(authpass);
+
LDAPMessage *msg, *entry;
std::string what = (attribute + "=" + user->nick);
- if ((res = ldap_search_s(conn, base.c_str(), searchscope, what.c_str(), NULL, 0, &msg)) != LDAP_SUCCESS)
+ if ((res = ldap_search_ext_s(conn, base.c_str(), searchscope, what.c_str(), NULL, 0, NULL, NULL, NULL, 0, &msg)) != LDAP_SUCCESS)
{
if (verbose)
ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search failed: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
ldap_msgfree(msg);
return false;
}
- if ((res = ldap_simple_bind_s(conn, ldap_get_dn(conn, entry), user->password)) == LDAP_SUCCESS)
+ cred.bv_val = user->password;
+ cred.bv_len = strlen(user->password);
+ if ((res = ldap_sasl_bind_s(conn, ldap_get_dn(conn, entry), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) == LDAP_SUCCESS)
{
ldap_msgfree(msg);
user->Extend("ldapauthed");
};
MODULE_INIT(ModuleLDAPAuth)
-