diff options
| author |  Sadie Powell | 2026-05-31 11:50:37 +0100 |
|---|---|---|
| committer | Sadie Powell | 2026-06-05 13:43:29 +0100 |
| commit | 6319ae4fb8c10dabc9464ad49faec532096fbcb5 (patch) | |
| tree | 6b6418e4e50d867f7ff14ef4adb5813dfa5c6e65 /src/modules/m_ldapoper.cpp | |
| parent | Port over some recent changes to the Anope LDAP API. (diff) | |
Fix escaping LDAP search filters in ldapauth and ldapoper.
Diffstat (limited to 'src/modules/m_ldapoper.cpp')
| -rw-r--r-- | src/modules/m_ldapoper.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index 14776b913..8b8b4ec19 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -151,10 +151,10 @@ class AdminBindInterface final const std::string opername; const std::string password; const std::string base; - const std::string what; + const LDAPAttribute 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) + AdminBindInterface(Module* c, const std::string& p, const std::string& u, const std::string& o, const std::string& pa, const std::string& b, const LDAPAttribute& w) : LDAPInterface(c) , provider(p) , user(u) @@ -172,7 +172,8 @@ public: { try { - LDAP->Search(new SearchInterface(this->creator, provider, user, opername, password), base, what); + const auto sf = INSP_FORMAT("{}={}", what.first, LDAP->EscapeSF(what.second)); + LDAP->Search(new SearchInterface(this->creator, provider, user, opername, password), base, sf); } catch (const LDAPException& ex) { @@ -233,7 +234,9 @@ public: try { - std::string what = attribute + "=" + opername; + LDAPAttribute what; + what.first = attribute; + what.second = opername; LDAP->BindAsManager(new AdminBindInterface(this, LDAP.GetProvider(), user->uuid, opername, password, base, what)); return MOD_RES_DENY; } |