X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ldapauth.cpp;h=93ca34ff2dc0794f07ba54866ccf58f36f68a0f6;hb=813bc55a8496875cef52e6da42d608e4d2fa35da;hp=f40f986562e57e0fc5b9ca607cec77be148e54e8;hpb=b6b7bbe7f6c5a0efb32d32883bb3981d71eba06d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index f40f98656..93ca34ff2 100644
--- 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,8 +38,11 @@ class ModuleLDAPAuth : public Module
 	std::string ldapserver;
 	std::string allowpattern;
 	std::string killreason;
+	std::string username;
+	std::string password;
 	int searchscope;
 	bool verbose;
+	bool useusername;
 	LDAP *conn;
 	
 public:
@@ -64,13 +65,16 @@ public:
 	{
 		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 */
+		useusername		= Conf.ReadFlag("ldapauth", "userfield", 0);
 		
 		if (scope == "base")
 			searchscope = LDAP_SCOPE_BASE;
@@ -117,7 +121,7 @@ public:
 
 		if (!CheckCredentials(user))
 		{
-			User::QuitUser(ServerInstance,user,killreason);
+			ServerInstance->Users->QuitUser(user, killreason);
 			return 1;
 		}
 		return 0;
@@ -130,42 +134,47 @@ public:
 				return false;
 
 		int res;
-		// bind anonymously
-		//if ((res = ldap_simple_bind_s(conn, "", "")) != LDAP_SUCCESS)
-		struct berval cred; cred.bv_val = ""; cred.bv_len = 0;
-		if ((res = ldap_sasl_bind_s(conn, "", LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) != 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));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP bind failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), 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, NULL, &msg)) != LDAP_SUCCESS)
+		std::string what = (attribute + "=" + (useusername ? user->ident : user->nick));
+		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));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			return false;
 		}
 		if (ldap_count_entries(conn, msg) > 1)
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned more than one result: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned more than one result: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			ldap_msgfree(msg);
 			return false;
 		}
 		if ((entry = ldap_first_entry(conn, msg)) == NULL)
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned no results: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned no results: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), 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);
+		cred.bv_val = (char*)user->password.data();
+		cred.bv_len = user->password.length();
 		if ((res = ldap_sasl_bind_s(conn, ldap_get_dn(conn, entry), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) == LDAP_SUCCESS)
 		{
 			ldap_msgfree(msg);
@@ -175,7 +184,7 @@ public:
 		else
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (%s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (%s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			ldap_msgfree(msg);
 			user->Extend("ldapauth_failed");
 			return false;