X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ldapoper.cpp;h=9deb9a203790b703dde614651c00312271ff900f;hb=df9bd50866a1ee95db78b88090aae74e245ad469;hp=cb81e7e189991301230ef6d6176ea7f529e8f639;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp
index cb81e7e18..9deb9a203 100644
--- a/src/modules/m_ldapoper.cpp
+++ b/src/modules/m_ldapoper.cpp
@@ -41,7 +41,7 @@ class LDAPOperBase : public LDAPInterface
 		if (!user)
 			return;
 
-		Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
+		Command* oper_command = ServerInstance->Parser.GetHandler("OPER");
 		if (!oper_command)
 			return;
 
@@ -83,7 +83,7 @@ class BindInterface : public LDAPOperBase
 	void OnResult(const LDAPResult& r) CXX11_OVERRIDE
 	{
 		User* user = ServerInstance->FindUUID(uid);
-		OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(opername);
+		ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->oper_blocks.find(opername);
 
 		if (!user || iter == ServerInstance->Config->oper_blocks.end())
 		{
@@ -126,8 +126,8 @@ class SearchInterface : public LDAPOperBase
 	}
 
  public:
-	SearchInterface(Module* mod, const std::string& prov, User* user, const std::string& oper, const std::string& pass)
-		: LDAPOperBase(mod, user->uuid, oper, pass)
+	SearchInterface(Module* mod, const std::string& prov, const std::string &uuid, const std::string& oper, const std::string& pass)
+		: LDAPOperBase(mod, uuid, oper, pass)
 		, provider(prov)
 	{
 	}
@@ -140,6 +140,45 @@ class SearchInterface : public LDAPOperBase
 	}
 };
 
+class AdminBindInterface : public LDAPInterface
+{
+	const std::string provider;
+	const std::string user;
+	const std::string opername;
+	const std::string password;
+	const std::string base;
+	const std::string what;
+
+ public:
+	AdminBindInterface(Module* c, const std::string& p, const std::string& u, const std::string& o, const std::string& pa, const std::string& b, const std::string& w)
+		: LDAPInterface(c), provider(p), user(u), opername(p), password(pa), base(b), what(w)
+	{
+	}
+
+	void OnResult(const LDAPResult& r) CXX11_OVERRIDE
+	{
+		dynamic_reference<LDAPProvider> LDAP(me, provider);
+		if (LDAP)
+		{
+			try
+			{
+				LDAP->Search(new SearchInterface(this->creator, provider, user, opername, password), base, what);
+			}
+			catch (LDAPException& ex)
+			{
+				ServerInstance->SNO->WriteToSnoMask('a', "Error searching LDAP server: " + ex.GetReason());
+			}
+		}
+		delete this;
+	}
+
+	void OnError(const LDAPResult& err) CXX11_OVERRIDE
+	{
+		ServerInstance->SNO->WriteToSnoMask('a', "Error binding as manager to LDAP server: " + err.getError());
+		delete this;
+	}
+};
+
 class ModuleLDAPAuth : public Module
 {
 	dynamic_reference<LDAPProvider> LDAP;
@@ -169,7 +208,7 @@ class ModuleLDAPAuth : public Module
 			const std::string& opername = parameters[0];
 			const std::string& password = parameters[1];
 
-			OperIndex::iterator it = ServerInstance->Config->oper_blocks.find(opername);
+			ServerConfig::OperIndex::const_iterator it = ServerInstance->Config->oper_blocks.find(opername);
 			if (it == ServerInstance->Config->oper_blocks.end())
 				return MOD_RES_PASSTHRU;
 
@@ -187,12 +226,8 @@ class ModuleLDAPAuth : public Module
 
 			try
 			{
-				// First, bind as the manager so the following search will go through
-				LDAP->BindAsManager(NULL);
-
-				// Fire off the search
 				std::string what = attribute + "=" + opername;
-				LDAP->Search(new SearchInterface(this, LDAP.GetProvider(), user, opername, password), base, what);
+				LDAP->BindAsManager(new AdminBindInterface(this, LDAP.GetProvider(), user->uuid, opername, password, base, what));
 				return MOD_RES_DENY;
 			}
 			catch (LDAPException& ex)