ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge <ldapauth:allowpattern> and <ldapwhitelist>.

Browse Source 
Closes #1478.
This commit is contained in:
Sadie Powell 2023-04-20 11:51:10 +01:00
parent 42313bb836
commit 87f8c35e03
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/conf/modules.conf.example
View File

@ -1402,13 +1402,13 @@
# <ldapauth dbid="ldapdb" #
# baserdn="ou=People,dc=brainbox,dc=cc" #
# attribute="uid" #
# allowpattern="Guest* Bot*" #
# killreason="Access denied" #
# verbose="yes" #
# host="$uid.$ou.inspircd.org" #
# useusername="no"> #
# #
# <ldapwhitelist cidr="10.42.0.0/16"> #
# <ldapexemption mask="*!*@10.42.0.0/16"> #
# <ldapexemption mask="Guest*!*@*"> #
# #
# <ldaprequire attribute="attr" value="val"> #
# #

50
src/modules/m_ldapauth.cpp
View File

@ -320,8 +320,7 @@ class ModuleLDAPAuth final
StringExtItem ldapVhost;
std::string base;
std::string attribute;
std::vector<std::string> allowpatterns;
std::vector<std::string> whitelistedcidrs;
std::vector<std::string> exemptions;
bool useusername;
public:
@ -339,9 +338,6 @@ public:
void ReadConfig(ConfigStatus& status) override
{
const auto& tag = ServerInstance->Config->ConfValue("ldapauth");
whitelistedcidrs.clear();
requiredattributes.clear();
base = tag->getString("baserdn");
attribute = tag->getString("attribute");
killreason = tag->getString("killreason");
@ -352,14 +348,7 @@ public:
LDAP.SetProvider("LDAP/" + tag->getString("dbid"));
for (const auto& [_, wtag] : ServerInstance->Config->ConfTags("ldapwhitelist"))
{
std::string cidr = wtag->getString("cidr");
if (!cidr.empty()) {
whitelistedcidrs.push_back(cidr);
}
}
requiredattributes.clear();
for (const auto& [_, rtag] : ServerInstance->Config->ConfTags("ldaprequire"))
{
const std::string attr = rtag->getString("attribute");
@ -369,12 +358,26 @@ public:
requiredattributes.emplace_back(attr, val);
}
std::string allowpattern = tag->getString("allowpattern");
irc::spacesepstream ss(allowpattern);
for (std::string more; ss.GetToken(more); )
exemptions.clear();
for (const auto& [_, etag] : ServerInstance->Config->ConfTags("ldapexemption"))
{
allowpatterns.push_back(more);
const std::string mask = etag->getString("mask");
if (!mask.empty())
exemptions.push_back(mask);
}
// Begin v3 config compatibility.
for (const auto& [_, wtag] : ServerInstance->Config->ConfTags("ldapwhitelist"))
{
const std::string cidr = wtag->getString("cidr");
if (!cidr.empty())
exemptions.push_back("*!*@" + cidr);
}
irc::spacesepstream nickstream(tag->getString("allowpattern"));
for (std::string nick; nickstream.GetToken(nick); )
exemptions.push_back(nick + "!*@*");
// End v3 config compatibility.
}
void OnUserConnect(LocalUser* user) override
@ -389,18 +392,9 @@ public:
ModResult OnUserRegister(LocalUser* user) override
{
for (const auto& allowpattern : allowpatterns)
for (const auto& exemption : exemptions)
{
if (InspIRCd::Match(user->nick, allowpattern))
{
ldapAuthed.Set(user, true);
return MOD_RES_PASSTHRU;
}
}
for (const auto& whitelistedcidr : whitelistedcidrs)
{
if (InspIRCd::MatchCIDR(user->GetAddress(), whitelistedcidr, ascii_case_insensitive_map))
if (InspIRCd::MatchCIDR(user->GetRealMask(), exemption) || InspIRCd::MatchCIDR(user->GetMask(), exemption))
{
ldapAuthed.Set(user, true);
return MOD_RES_PASSTHRU;