fix warnings

[user/henk/code/inspircd.git] / src / modules / extra / m_ldapauth.cpp

diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 166624bc20b508908c67238eb10c42b8c5869adc..7de157601fdd26ac0fea2ed98af1e168a8a18740 100644 (file)
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -26,8 +26,6 @@
 #include "channels.h"
 #include "modules.h"
 
-/* FIXME */
-#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 /* $ModDesc: Allow/Deny connections based upon answer from LDAP server */
@@ -40,6 +38,8 @@ class ModuleLDAPAuth : public Module
        std::string ldapserver;
        std::string allowpattern;
        std::string killreason;
+       std::string username;
+       std::string password;
        int searchscope;
        bool verbose;
        LDAP *conn;
@@ -57,20 +57,22 @@ public:
        virtual ~ModuleLDAPAuth()
        {
                if (conn)
-                       ldap_unbind_s(conn);
+                       ldap_unbind_ext(conn, NULL, NULL);
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
        {
                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;
@@ -84,7 +86,7 @@ public:
        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)
@@ -100,7 +102,7 @@ public:
                {
                        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;
                }
@@ -130,18 +132,26 @@ public:
                                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));
@@ -161,7 +171,9 @@ public:
                        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");
@@ -191,10 +203,9 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version(4,0,0,0,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
        }
        
 };
 
 MODULE_INIT(ModuleLDAPAuth)
-