From c9ea418dd7f913ba1c2fbae49a82cf39d22e282f Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 20 Jul 2020 05:51:38 +0100 Subject: Show an error when an unprivileged user tries to mass-message. Closes #1790. --- src/coremods/core_message.cpp | 3 +++ src/modules/m_ircv3_ctctags.cpp | 3 +++ 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp index c950ab24b..26573c8bf 100644 --- a/src/coremods/core_message.cpp +++ b/src/coremods/core_message.cpp @@ -174,7 +174,10 @@ class CommandMessage : public Command // If the source isn't allowed to mass message users then reject // the attempt to mass-message users. if (!source->HasPrivPermission("users/mass-message")) + { + source->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges"); return CMD_FAILURE; + } // Extract the server glob match from the target parameter. std::string servername(parameters[0], 1); diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp index 3815b025d..285657987 100644 --- a/src/modules/m_ircv3_ctctags.cpp +++ b/src/modules/m_ircv3_ctctags.cpp @@ -109,7 +109,10 @@ class CommandTagMsg : public Command // If the source isn't allowed to mass message users then reject // the attempt to mass-message users. if (!source->HasPrivPermission("users/mass-message")) + { + source->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges"); return CMD_FAILURE; + } // Extract the server glob match from the target parameter. std::string servername(parameters[0], 1); -- cgit v1.3.1-10-gc9f91 From c2218abac11a2ddaff197f93721818efdcc9ae01 Mon Sep 17 00:00:00 2001 From: iwalkalone Date: Wed, 22 Jul 2020 15:31:55 +0200 Subject: Allow disabling the timedbans set/unset notices (#1789). --- docs/conf/modules.conf.example | 3 +++ src/modules/m_timedbans.cpp | 35 +++++++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index fbd29ffca..2e50977bd 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -2284,6 +2284,9 @@ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Timed bans module: Adds timed channel bans with the /TBAN command. # +# By default, it sends a notice to channel operators when timed ban is +# set and when it is removed by server. +# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Test line module: Adds the /TLINE command, used to test how many diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index ef62294fd..47fbd7fb6 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -71,6 +71,8 @@ class CommandTban : public Command } public: + bool sendnotice; + CommandTban(Module* Creator) : Command(Creator,"TBAN", 3) , banmode(Creator, "ban") @@ -131,13 +133,17 @@ class CommandTban : public Command T.chan = channel; TimedBanList.push_back(T); - const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", + if (sendnotice) + { + const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", mask.c_str(), user->nick.c_str(), channel->name.c_str(), InspIRCd::DurationString(duration).c_str()); - // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above - PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); - char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above + PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); + char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + + channel->WriteRemoteNotice(message, pfxchar); + } - channel->WriteRemoteNotice(message, pfxchar); return CMD_SUCCESS; } @@ -203,6 +209,12 @@ class ModuleTimedBans : public Module { } + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + ConfigTag* tag = ServerInstance->Config->ConfValue("timedbans"); + cmd.sendnotice = tag->getBool("sendnotice", true); + } + void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE { timedbans expired; @@ -222,13 +234,16 @@ class ModuleTimedBans : public Module const std::string mask = i->mask; Channel* cr = i->chan; - const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", + if (cmd.sendnotice) + { + const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", mask.c_str(), i->setter.c_str(), cr->name.c_str()); - // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above - PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); - char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above + PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); + char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; - cr->WriteRemoteNotice(message, pfxchar); + cr->WriteRemoteNotice(message, pfxchar); + } Modes::ChangeList setban; setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask); -- cgit v1.3.1-10-gc9f91 From 30648e84ce9c2515994b95b9d1e2e870283ed214 Mon Sep 17 00:00:00 2001 From: Matt Schatz Date: Mon, 20 Jul 2020 20:37:20 -0600 Subject: Fix secure websocket users not being seen as secure. Since a TLS (SSL) module will always be the last IOHook attached to a socket, IsSSL() needs to ignore any Middle IOHooks that may also be attached. --- include/inspsocket.h | 5 +++++ include/modules/ssl.h | 7 ++++--- src/inspsocket.cpp | 12 ++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/include/inspsocket.h b/include/inspsocket.h index fef76ae4e..16d2cdbce 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -365,6 +365,11 @@ class CoreExport StreamSocket : public EventHandler * @return IOHook belonging to the module or NULL if the module haven't attached an IOHook to this socket */ IOHook* GetModHook(Module* mod) const; + + /** Get the last IOHook attached to this socket + * @return The last IOHook attached to this socket or NULL if no IOHooks are attached + */ + IOHook* GetLastHook() const; }; /** * BufferedSocket is an extendable socket class which modules diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 2227c4b13..ac2e367fd 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -186,9 +186,10 @@ class SSLIOHook : public IOHook public: static SSLIOHook* IsSSL(StreamSocket* sock) { - IOHook* const iohook = sock->GetIOHook(); - if ((iohook) && ((iohook->prov->type == IOHookProvider::IOH_SSL))) - return static_cast(iohook); + IOHook* const lasthook = sock->GetLastHook(); + if (lasthook && (lasthook->prov->type == IOHookProvider::IOH_SSL)) + return static_cast(lasthook); + return NULL; } diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 6cf3e3008..6172aebe2 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -510,6 +510,18 @@ IOHook* StreamSocket::GetModHook(Module* mod) const return NULL; } +IOHook* StreamSocket::GetLastHook() const +{ + IOHook* curr = GetIOHook(); + IOHook* last = curr; + + for (; curr; curr = GetNextHook(curr)) + last = curr; + + return last; +} + + void StreamSocket::AddIOHook(IOHook* newhook) { IOHook* curr = GetIOHook(); -- cgit v1.3.1-10-gc9f91 From 1047f053811717df4e4c3c18c512b169b64aa93a Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 27 Jul 2020 09:51:34 +0100 Subject: Send ERR_KEYSET when trying to change a channel key. Closes #1750. --- src/coremods/core_channel/cmode_k.cpp | 1 + src/coremods/core_channel/core_channel.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/coremods/core_channel/cmode_k.cpp b/src/coremods/core_channel/cmode_k.cpp index ea4b5241d..495af3650 100644 --- a/src/coremods/core_channel/cmode_k.cpp +++ b/src/coremods/core_channel/cmode_k.cpp @@ -46,6 +46,7 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s if (exists && (parameter != *key)) { /* Key is currently set and the correct key wasn't given */ + source->WriteNumeric(ERR_KEYSET, channel->name, "Channel key already set"); return MODEACTION_DENY; } } else { diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h index 3701b9a71..26b23c3ea 100644 --- a/src/coremods/core_channel/core_channel.h +++ b/src/coremods/core_channel/core_channel.h @@ -54,7 +54,8 @@ enum { // From RFC 1459. RPL_BANLIST = 367, - RPL_ENDOFBANLIST = 368 + RPL_ENDOFBANLIST = 368, + ERR_KEYSET = 467 }; /** Handle /INVITE. -- cgit v1.3.1-10-gc9f91 From 88df35c715b7d0218cffa741ac568502d7a2ee15 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 29 Jul 2020 11:54:49 +0100 Subject: Replace all erroneous space indentation with tab indentation. --- src/modules/m_override.cpp | 2 +- src/modules/m_timedbans.cpp | 20 ++++++++++---------- src/users.cpp | 2 +- src/xline.cpp | 38 +++++++++++++++++++------------------- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 6edc656c7..21b427dea 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -146,7 +146,7 @@ class ModuleOverride : public Module { // If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) || - (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE)) + (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE)) { ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")"); return MOD_RES_ALLOW; diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 47fbd7fb6..8dd334230 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -135,13 +135,13 @@ class CommandTban : public Command if (sendnotice) { - const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", + const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", mask.c_str(), user->nick.c_str(), channel->name.c_str(), InspIRCd::DurationString(duration).c_str()); - // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above - PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); - char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above + PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); + char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; - channel->WriteRemoteNotice(message, pfxchar); + channel->WriteRemoteNotice(message, pfxchar); } return CMD_SUCCESS; @@ -236,13 +236,13 @@ class ModuleTimedBans : public Module if (cmd.sendnotice) { - const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", + const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", mask.c_str(), i->setter.c_str(), cr->name.c_str()); - // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above - PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); - char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above + PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); + char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; - cr->WriteRemoteNotice(message, pfxchar); + cr->WriteRemoteNotice(message, pfxchar); } Modes::ChangeList setban; diff --git a/src/users.cpp b/src/users.cpp index 0800b2f89..f6bed6c1d 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1145,7 +1145,7 @@ void LocalUser::SetClass(const std::string &explicit_name) /* check if host matches.. */ if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && - !InspIRCd::MatchCIDR(this->GetRealHost(), c->GetHost(), NULL)) + !InspIRCd::MatchCIDR(this->GetRealHost(), c->GetHost(), NULL)) { ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "No host match (for %s)", c->GetHost().c_str()); continue; diff --git a/src/xline.cpp b/src/xline.cpp index 4a70700a7..0d627023e 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -67,15 +67,15 @@ class ELineFactory : public XLineFactory class KLineFactory : public XLineFactory { public: - KLineFactory() : XLineFactory("K") { } + KLineFactory() : XLineFactory("K") { } /** Generate a KLine */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE - { - IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); - return new KLine(set_time, duration, source, reason, ih.first, ih.second); - } + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new KLine(set_time, duration, source, reason, ih.first, ih.second); + } }; /** An XLineFactory specialized to generate QLine* pointers @@ -83,14 +83,14 @@ class KLineFactory : public XLineFactory class QLineFactory : public XLineFactory { public: - QLineFactory() : XLineFactory("Q") { } + QLineFactory() : XLineFactory("Q") { } /** Generate a QLine */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE - { - return new QLine(set_time, duration, source, reason, xline_specific_mask); - } + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + return new QLine(set_time, duration, source, reason, xline_specific_mask); + } }; /** An XLineFactory specialized to generate ZLine* pointers @@ -98,14 +98,14 @@ class QLineFactory : public XLineFactory class ZLineFactory : public XLineFactory { public: - ZLineFactory() : XLineFactory("Z") { } + ZLineFactory() : XLineFactory("Z") { } /** Generate a ZLine */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE - { - return new ZLine(set_time, duration, source, reason, xline_specific_mask); - } + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + return new ZLine(set_time, duration, source, reason, xline_specific_mask); + } }; @@ -608,7 +608,7 @@ bool KLine::Matches(User *u) if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || - InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -631,7 +631,7 @@ bool GLine::Matches(User *u) if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || - InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -650,7 +650,7 @@ bool ELine::Matches(User *u) if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || - InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } -- cgit v1.3.1-10-gc9f91