pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 10:26:38 +02:00
Code Activity

Sanitize nuh masks more to prevent the other side from rewriting them, which screws with our internal tracking of them

Browse Source
This commit is contained in:
Adam
2014-05-13 22:57:53 -04:00
parent 1c8a77ab9f
commit 63b02b8c97
9 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modes.cpp
+17 -2
View File
@@ -175,6 +175,13 @@ ChannelModeList::ChannelModeList(const Anope::string &cm, char mch) : ChannelMod
this->type = MODE_LIST;
}
bool ChannelModeList::IsValid(Anope::string &mask) const
{
if (name == "BAN" || name == "EXCEPT" || name == "INVITEOVERRIDE")
mask = IRCD->NormalizeMask(mask);
return true;
}
ChannelModeParam::ChannelModeParam(const Anope::string &cm, char mch, bool ma) : ChannelMode(cm, mch), minus_no_arg(ma)
{
this->type = MODE_PARAM;
@@ -231,7 +238,7 @@ bool UserModeNoone::CanSet(User *u) const
return false;
}
bool ChannelModeKey::IsValid(const Anope::string &value) const
bool ChannelModeKey::IsValid(Anope::string &value) const
{
if (!value.empty() && value.find(':') == Anope::string::npos && value.find(',') == Anope::string::npos)
return true;
@@ -796,7 +803,7 @@ Entry::Entry(const Anope::string &m, const Anope::string &fh) : name(m), mask(fh
this->host = cidr_ip;
Log(LOG_DEBUG) << "Ban " << this->mask << " has cidr " << this->cidr_len;
Log(LOG_DEBUG) << "Ban " << m << " has cidr " << this->cidr_len;
}
}
catch (const ConvertException &) { }
@@ -812,6 +819,14 @@ const Anope::string Entry::GetMask() const
return this->mask;
}
const Anope::string Entry::GetNUHMask() const
{
Anope::string n = nick.empty() ? "*" : nick,
u = user.empty() ? "*" : user,
h = host.empty() ? "*" : host;
return n + "!" + u + "@" + h;
}
bool Entry::Matches(User *u, bool full) const
{
/* First check if this mode has defined any matches (usually for extbans). */