diff options
| -rw-r--r-- | src/modules/m_ldapauth.cpp | 41 | ||||
| -rw-r--r-- | src/modules/m_ldapoper.cpp | 49 |
2 files changed, 80 insertions, 10 deletions
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index 179fe6fca..b77193e9d 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -257,6 +257,43 @@ class SearchInterface : public LDAPInterface } }; +class AdminBindInterface : public LDAPInterface +{ + const std::string provider; + const std::string uuid; + const std::string base; + const std::string what; + + public: + AdminBindInterface(Module* c, const std::string& p, const std::string& u, const std::string& b, const std::string& w) + : LDAPInterface(c), provider(p), uuid(u), 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, uuid), 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; @@ -372,10 +409,8 @@ public: try { - LDAP->BindAsManager(NULL); - std::string what = attribute + "=" + (useusername ? user->ident : user->nick); - LDAP->Search(new SearchInterface(this, LDAP.GetProvider(), user->uuid), base, what); + LDAP->BindAsManager(new AdminBindInterface(this, LDAP.GetProvider(), user->uuid, base, what)); } catch (LDAPException &ex) { diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index cb81e7e18..9bfa3971f 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -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; @@ -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) |