summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/modes.h20
-rw-r--r--include/sockets.h4
-rw-r--r--modules/protocol/inspircd12.cpp2
-rw-r--r--modules/protocol/inspircd20.cpp2
-rw-r--r--modules/protocol/unreal.cpp2
-rw-r--r--src/modes.cpp148
-rw-r--r--src/sockets.cpp36
7 files changed, 92 insertions, 122 deletions
diff --git a/include/modes.h b/include/modes.h
index 4b207fa44..a9957e332 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -393,28 +393,14 @@ class CoreExport ModeManager
static void UpdateDefaultMLock(ServerConfig *config);
};
-/** Entry flags
- */
-enum EntryType
-{
- ENTRYTYPE_CIDR,
- ENTRYTYPE_NICK_WILD,
- ENTRYTYPE_NICK,
- ENTRYTYPE_USER_WILD,
- ENTRYTYPE_USER,
- ENTRYTYPE_HOST_WILD,
- ENTRYTYPE_HOST
-};
-
/** Represents a mask set on a channel (b/e/I)
*/
class CoreExport Entry
{
Anope::string name;
- public:
- std::set<EntryType> types;
- unsigned char cidr_len;
Anope::string mask;
+ public:
+ unsigned short cidr_len;
Anope::string nick, user, host;
/** Constructor
@@ -426,7 +412,7 @@ class CoreExport Entry
/** Get the banned mask for this entry
* @return The mask
*/
- const Anope::string GetMask();
+ const Anope::string GetMask() const;
/** Check if this entry matches a user
* @param u The user
diff --git a/include/sockets.h b/include/sockets.h
index 8fc675614..0e490ac24 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -85,12 +85,12 @@ class CoreExport cidr
{
sockaddrs addr;
Anope::string cidr_ip;
- unsigned char cidr_len;
+ unsigned short cidr_len;
public:
cidr(const Anope::string &ip);
cidr(const Anope::string &ip, unsigned char len);
Anope::string mask() const;
- bool match(sockaddrs &other);
+ bool match(const sockaddrs &other);
bool operator<(const cidr &other) const;
bool operator==(const cidr &other) const;
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index f42b97696..62886d311 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -383,7 +383,7 @@ class InspIRCdExtBan : public ChannelModeList
bool Matches(const User *u, const Entry *e) anope_override
{
- const Anope::string &mask = e->mask;
+ const Anope::string &mask = e->GetMask();
if (mask.find("m:") == 0 || mask.find("N:") == 0)
{
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index f1f814190..cd2a1bbd4 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -81,7 +81,7 @@ class InspIRCdExtBan : public ChannelModeList
bool Matches(const User *u, const Entry *e) anope_override
{
- const Anope::string &mask = e->mask;
+ const Anope::string &mask = e->GetMask();
if (mask.find("m:") == 0 || mask.find("N:") == 0)
{
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index b7cd2e322..3f1d33279 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -381,7 +381,7 @@ class UnrealExtBan : public ChannelModeList
bool Matches(const User *u, const Entry *e) anope_override
{
- const Anope::string &mask = e->mask;
+ const Anope::string &mask = e->GetMask();
if (mask.find("~c:") == 0)
{
diff --git a/src/modes.cpp b/src/modes.cpp
index d8926d7e8..b7c22dfc7 100644
--- a/src/modes.cpp
+++ b/src/modes.cpp
@@ -605,105 +605,104 @@ void ModeManager::UpdateDefaultMLock(ServerConfig *config)
}
}
-Entry::Entry(const Anope::string &m, const Anope::string &_host) : name(m)
+Entry::Entry(const Anope::string &m, const Anope::string &fh) : name(m), mask(fh), cidr_len(0)
{
- this->cidr_len = 0;
- this->mask = _host;
+ Anope::string n, u, h;
- Anope::string _nick, _user, _realhost;
- size_t at = _host.find('@');
+ size_t at = fh.find('@');
if (at != Anope::string::npos)
{
- _realhost = _host.substr(at + 1);
- Anope::string _nickident = _host.substr(0, at);
+ this->host = fh.substr(at + 1);
- size_t ex = _nickident.find('!');
+ const Anope::string &nu = fh.substr(0, at);
+
+ size_t ex = nu.find('!');
if (ex != Anope::string::npos)
{
- _user = _nickident.substr(ex + 1);
- _nick = _nickident.substr(0, ex);
+ this->user = nu.substr(ex + 1);
+ this->nick = nu.substr(0, ex);
}
else
- _user = _nickident;
+ this->user = nu;
}
else
- _realhost = _host;
+ this->host = fh;
- if (!_nick.empty() && _nick.find_first_not_of("*") != Anope::string::npos)
- {
- this->nick = _nick;
- if (_nick.find_first_of("*?") != Anope::string::npos)
- this->types.insert(ENTRYTYPE_NICK_WILD);
- else
- this->types.insert(ENTRYTYPE_NICK);
- }
-
- if (!_user.empty() && _user.find_first_not_of("*") != Anope::string::npos)
- {
- this->user = _user;
- if (_user.find_first_of("*?") != Anope::string::npos)
- this->types.insert(ENTRYTYPE_USER_WILD);
- else
- this->types.insert(ENTRYTYPE_USER);
- }
-
- if (!_realhost.empty() && _realhost.find_first_not_of("*") != Anope::string::npos)
+ /* If the mask is all *'s it will match anything, so just clear it */
+ if (this->nick.find_first_not_of("*") == Anope::string::npos)
+ this->nick.clear();
+
+ if (this->user.find_first_not_of("*") == Anope::string::npos)
+ this->user.clear();
+
+ if (this->host.find_first_not_of("*") == Anope::string::npos)
+ this->host.clear();
+ else
{
- size_t sl = _realhost.find_last_of('/');
+ /* Host might be a CIDR range */
+ size_t sl = this->host.find_last_of('/');
if (sl != Anope::string::npos)
{
+ const Anope::string &cidr_ip = this->host.substr(0, sl),
+ &cidr_range = this->host.substr(sl + 1);
try
{
- sockaddrs addr(_realhost.substr(0, sl));
- /* If we got here, _realhost is a valid IP */
+ sockaddrs addr(cidr_ip);
+ /* If we got here, cidr_ip is a valid ip */
- Anope::string cidr_range = _realhost.substr(sl + 1);
if (cidr_range.is_pos_number_only())
{
- _realhost = _realhost.substr(0, sl);
- this->cidr_len = convertTo<unsigned int>(cidr_range);
- this->types.insert(ENTRYTYPE_CIDR);
- Log(LOG_DEBUG) << "Ban " << _realhost << " has cidr " << static_cast<unsigned int>(this->cidr_len);
+ this->cidr_len = convertTo<unsigned short>(cidr_range);
+ /* If we got here, cidr_len is a valid number.
+ * If cidr_len is >32 (or 128) it is handled later in
+ * cidr::match
+ */
+
+ this->host = cidr_ip;
+
+ Log(LOG_DEBUG) << "Ban " << this->mask << " has cidr " << this->cidr_len;
}
}
catch (const SocketException &) { }
catch (const ConvertException &) { }
}
-
- this->host = _realhost;
-
- if (!this->types.count(ENTRYTYPE_CIDR))
- {
- if (_realhost.find_first_of("*?") != Anope::string::npos)
- this->types.insert(ENTRYTYPE_HOST_WILD);
- else
- this->types.insert(ENTRYTYPE_HOST);
- }
}
}
-const Anope::string Entry::GetMask()
+const Anope::string Entry::GetMask() const
{
return this->mask;
}
bool Entry::Matches(const User *u, bool full) const
{
+ /* First check if this mode has defined any matches (usually for extbans). */
+ ChannelMode *cm = ModeManager::FindChannelModeByName(this->name);
+ if (cm != NULL && cm->type == MODE_LIST)
+ {
+ ChannelModeList *cml = anope_dynamic_static_cast<ChannelModeList *>(cm);
+ if (cml->Matches(u, this))
+ return true;
+ }
+
+ /* If the user's displayed host is their real host, then we can do a full match without
+ * having to worry about exposing a user's IP
+ */
+ full |= u->GetDisplayedHost() == u->host;
+
bool ret = true;
-
- if (this->types.count(ENTRYTYPE_CIDR))
+
+ if (!this->nick.empty() && !Anope::Match(u->nick, this->nick))
+ ret = false;
+
+ if (!this->user.empty() && !Anope::Match(u->GetVIdent(), this->user) && (!full || !Anope::Match(u->GetIdent(), this->user)))
+ ret = false;
+
+ if (this->cidr_len && full)
{
try
{
- if (full)
- {
- cidr cidr_mask(this->host, this->cidr_len);
- sockaddrs addr(u->ip);
- if (!cidr_mask.match(addr))
- ret = false;
- }
- /* If we're not matching fully and their displayed host isnt their IP */
- else if (u->ip != u->GetDisplayedHost())
+ if (!cidr(this->host, this->cidr_len).match(u->ip))
ret = false;
}
catch (const SocketException &)
@@ -711,33 +710,10 @@ bool Entry::Matches(const User *u, bool full) const
ret = false;
}
}
- if (this->types.count(ENTRYTYPE_NICK) && !this->nick.equals_ci(u->nick))
- ret = false;
- if (this->types.count(ENTRYTYPE_USER) && !this->user.equals_ci(u->GetVIdent()) && (!full ||
- !this->user.equals_ci(u->GetIdent())))
- ret = false;
- if (this->types.count(ENTRYTYPE_HOST) && !this->host.equals_ci(u->GetDisplayedHost()) && (!full ||
- (!this->host.equals_ci(u->host) && !this->host.equals_ci(u->chost) && !this->host.equals_ci(u->vhost) &&
- !this->host.equals_ci(u->ip))))
- ret = false;
- if (this->types.count(ENTRYTYPE_NICK_WILD) && !Anope::Match(u->nick, this->nick))
- ret = false;
- if (this->types.count(ENTRYTYPE_USER_WILD) && !Anope::Match(u->GetVIdent(), this->user) && (!full ||
- !Anope::Match(u->GetIdent(), this->user)))
- ret = false;
- if (this->types.count(ENTRYTYPE_HOST_WILD) && !Anope::Match(u->GetDisplayedHost(), this->host) && (!full ||
- (!Anope::Match(u->host, this->host) && !Anope::Match(u->chost, this->host) &&
- !Anope::Match(u->vhost, this->host) && !Anope::Match(u->ip, this->host))))
+ else if (!this->host.empty() && !Anope::Match(u->GetDisplayedHost(), this->host) && !Anope::Match(u->GetCloakedHost(), this->host) &&
+ (!full || (!Anope::Match(u->host, this->host) && !Anope::Match(u->ip, this->host))))
ret = false;
- ChannelMode *cm = ModeManager::FindChannelModeByName(this->name);
- if (cm != NULL && cm->type == MODE_LIST)
- {
- ChannelModeList *cml = anope_dynamic_static_cast<ChannelModeList *>(cm);
- if (cml->Matches(u, this))
- ret = true;
- }
-
return ret;
}
diff --git a/src/sockets.cpp b/src/sockets.cpp
index 53ca40f80..b30932935 100644
--- a/src/sockets.cpp
+++ b/src/sockets.cpp
@@ -207,24 +207,29 @@ Anope::string cidr::mask() const
return Anope::printf("%s/%d", this->cidr_ip.c_str(), this->cidr_len);
}
-bool cidr::match(sockaddrs &other)
+bool cidr::match(const sockaddrs &other)
{
if (this->addr.sa.sa_family != other.sa.sa_family)
return false;
- unsigned char *ip, *their_ip, byte;
+ const unsigned char *ip, *their_ip;
+ unsigned char byte, len = this->cidr_len;
switch (this->addr.sa.sa_family)
{
case AF_INET:
- ip = reinterpret_cast<unsigned char *>(&this->addr.sa4.sin_addr);
- byte = this->cidr_len / 8;
- their_ip = reinterpret_cast<unsigned char *>(&other.sa4.sin_addr);
+ ip = reinterpret_cast<const unsigned char *>(&this->addr.sa4.sin_addr);
+ if (len > 32)
+ len = 32;
+ byte = len / 8;
+ their_ip = reinterpret_cast<const unsigned char *>(&other.sa4.sin_addr);
break;
case AF_INET6:
- ip = reinterpret_cast<unsigned char *>(&this->addr.sa6.sin6_addr);
- byte = this->cidr_len / 8;
- their_ip = reinterpret_cast<unsigned char *>(&other.sa6.sin6_addr);
+ ip = reinterpret_cast<const unsigned char *>(&this->addr.sa6.sin6_addr);
+ if (len > 128)
+ len = 128;
+ byte = len / 8;
+ their_ip = reinterpret_cast<const unsigned char *>(&other.sa6.sin6_addr);
break;
default:
throw SocketException("Invalid address type");
@@ -233,11 +238,14 @@ bool cidr::match(sockaddrs &other)
if (memcmp(ip, their_ip, byte))
return false;
- ip += byte;
- their_ip += byte;
- byte = this->cidr_len % 8;
- if ((*ip & byte) != (*their_ip & byte))
- return false;
+ byte = len % 8;
+ if (byte)
+ {
+ ip += byte;
+ their_ip += byte;
+ if ((*ip & byte) != (*their_ip & byte))
+ return false;
+ }
return true;
}
@@ -295,7 +303,7 @@ size_t cidr::hash::operator()(const cidr &s) const
{
size_t h = 0;
- for (int i = 0; i < s.cidr_len / 8; ++i)
+ for (unsigned i = 0; i < s.cidr_len / 8; ++i)
h ^= (s.addr.sa6.sin6_addr.s6_addr[i] << ((i * 8) % sizeof(size_t)));
int remaining = s.cidr_len % 8;
generated by cgit (git 2.34.1) at 2025-06-17 03:23:58 +0000