From 461b214b794f3c8723ae6e6d795d126285b35076 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 5 Apr 2022 17:48:46 +0100 Subject: Fix the grammar of various xline messages. --- src/modules/m_rline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/m_rline.cpp') diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index f4c675919..ecaf9b6a3 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -165,11 +165,11 @@ class CommandRLine : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent R-line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added a permanent R-line on %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); } else { - ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s, expires in %s (on %s): %s", + ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed R-line on %s, expires in %s (on %s): %s", user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str()); } -- cgit v1.3.1-10-gc9f91 From ddf306850efb9e4059ecb0506b073b3af4d79dca Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 5 Apr 2022 22:57:14 +0100 Subject: Include the module name in the setter for server-added xlines. --- src/modules/m_connectban.cpp | 2 +- src/modules/m_dnsbl.cpp | 6 +++--- src/modules/m_rline.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules/m_rline.cpp') diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp index a590e5b95..c24f03080 100644 --- a/src/modules/m_connectban.cpp +++ b/src/modules/m_connectban.cpp @@ -151,7 +151,7 @@ class ModuleConnectBan CXX11_FINAL if (i->second >= threshold) { // Create Z-line for set duration. - ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, banmessage, mask.str()); + ZLine* zl = new ZLine(ServerInstance->Time(), banduration, MODNAME "@" + ServerInstance->Config->ServerName, banmessage, mask.str()); if (!ServerInstance->XLines->AddLine(zl, NULL)) { delete zl; diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 6cfadff59..35b750e97 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -181,7 +181,7 @@ class DNSBLResolver : public DNS::Request } case DNSBLConfEntry::I_KLINE: { - KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), + KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, MODNAME "@" + ServerInstance->Config->ServerName, reason, them->GetBanIdent(), them->GetIPString()); if (ServerInstance->XLines->AddLine(kl,NULL)) { @@ -199,7 +199,7 @@ class DNSBLResolver : public DNS::Request } case DNSBLConfEntry::I_GLINE: { - GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), + GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, MODNAME "@" + ServerInstance->Config->ServerName, reason, them->GetBanIdent(), them->GetIPString()); if (ServerInstance->XLines->AddLine(gl,NULL)) { @@ -217,7 +217,7 @@ class DNSBLResolver : public DNS::Request } case DNSBLConfEntry::I_ZLINE: { - ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), + ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, MODNAME "@" + ServerInstance->Config->ServerName, reason, them->GetIPString()); if (ServerInstance->XLines->AddLine(zl,NULL)) { diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index ecaf9b6a3..214095706 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -72,7 +72,7 @@ class RLine : public XLine { if (ZlineOnMatch) { - ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, ServerInstance->Config->ServerName.c_str(), reason.c_str(), u->GetIPString()); + ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, MODNAME "@" + ServerInstance->Config->ServerName, reason.c_str(), u->GetIPString()); if (ServerInstance->XLines->AddLine(zl, NULL)) { std::string expirystr = zl->duration ? InspIRCd::Format(" to expire in %s (on %s)", InspIRCd::DurationString(zl->duration).c_str(), InspIRCd::TimeString(zl->expiry).c_str()) : ""; -- cgit v1.3.1-10-gc9f91 From 070d41431084409a85660b7ef0b171840cae69ef Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 5 Apr 2022 23:13:56 +0100 Subject: Use consistent xline messages locally For connectban these messages would have previously been duplicated to other servers until this was fixed earlier today. For dnsbl and rline they would have just differed on the local to a remote. As of the previous commit the module name is included in the setter so there is no need to vary the snotice. This makes things more consistent for server operators and allows scripts to parse the messages. --- src/modules/m_connectban.cpp | 5 +++-- src/modules/m_dnsbl.cpp | 18 +++++++++--------- src/modules/m_rline.cpp | 14 +++++++++++--- 3 files changed, 23 insertions(+), 14 deletions(-) (limited to 'src/modules/m_rline.cpp') diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp index 624ab57ec..80705bf81 100644 --- a/src/modules/m_connectban.cpp +++ b/src/modules/m_connectban.cpp @@ -158,8 +158,9 @@ class ModuleConnectBan CXX11_FINAL return; } std::string maskstr = mask.str(); - ServerInstance->SNO->WriteToSnoMask('x', "Z-line added by module m_connectban on %s to expire in %s (on %s): Connect flooding", - maskstr.c_str(), InspIRCd::DurationString(zl->duration).c_str(), InspIRCd::TimeString(zl->expiry).c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed Z-line on %s, expires in %s (on %s): %s", + zl->source.c_str(), maskstr.c_str(), InspIRCd::DurationString(zl->duration).c_str(), + InspIRCd::TimeString(zl->expiry).c_str(), zl->reason.c_str()); ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", maskstr.c_str(), threshold); connects.erase(i); ServerInstance->XLines->ApplyLines(); diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 35b750e97..8777b6f24 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -185,9 +185,9 @@ class DNSBLResolver : public DNS::Request them->GetBanIdent(), them->GetIPString()); if (ServerInstance->XLines->AddLine(kl,NULL)) { - ServerInstance->SNO->WriteToSnoMask('x', "K-line added due to DNSBL match on %s to expire in %s (on %s): %s", - kl->Displayable().c_str(), InspIRCd::DurationString(kl->duration).c_str(), - InspIRCd::TimeString(kl->expiry).c_str(), reason.c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed K-line on %s, expires in %s (on %s): %s", + kl->source.c_str(), kl->Displayable().c_str(), InspIRCd::DurationString(kl->duration).c_str(), + InspIRCd::TimeString(kl->expiry).c_str(), kl->reason.c_str()); ServerInstance->XLines->ApplyLines(); } else @@ -203,9 +203,9 @@ class DNSBLResolver : public DNS::Request them->GetBanIdent(), them->GetIPString()); if (ServerInstance->XLines->AddLine(gl,NULL)) { - ServerInstance->SNO->WriteToSnoMask('x', "G-line added due to DNSBL match on %s to expire in %s (on %s): %s", - gl->Displayable().c_str(), InspIRCd::DurationString(gl->duration).c_str(), - InspIRCd::TimeString(gl->expiry).c_str(), reason.c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed G-line on %s, expires in %s (on %s): %s", + gl->source.c_str(), gl->Displayable().c_str(), InspIRCd::DurationString(gl->duration).c_str(), + InspIRCd::TimeString(gl->expiry).c_str(), gl->reason.c_str()); ServerInstance->XLines->ApplyLines(); } else @@ -221,9 +221,9 @@ class DNSBLResolver : public DNS::Request them->GetIPString()); if (ServerInstance->XLines->AddLine(zl,NULL)) { - ServerInstance->SNO->WriteToSnoMask('x', "Z-line added due to DNSBL match on %s to expire in %s (on %s): %s", - them->GetIPString().c_str(), InspIRCd::DurationString(zl->duration).c_str(), - InspIRCd::TimeString(zl->expiry).c_str(), reason.c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed Z-line on %s, expires in %s (on %s): %s", + zl->source.c_str(), zl->Displayable().c_str(), InspIRCd::DurationString(zl->duration).c_str(), + InspIRCd::TimeString(zl->expiry).c_str(), zl->reason.c_str()); ServerInstance->XLines->ApplyLines(); } else diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 214095706..9d6028b09 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -75,9 +75,17 @@ class RLine : public XLine ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, MODNAME "@" + ServerInstance->Config->ServerName, reason.c_str(), u->GetIPString()); if (ServerInstance->XLines->AddLine(zl, NULL)) { - std::string expirystr = zl->duration ? InspIRCd::Format(" to expire in %s (on %s)", InspIRCd::DurationString(zl->duration).c_str(), InspIRCd::TimeString(zl->expiry).c_str()) : ""; - ServerInstance->SNO->WriteToSnoMask('x', "Z-line added due to R-line match on %s%s: %s", - zl->ipaddr.c_str(), expirystr.c_str(), zl->reason.c_str()); + if (!duration) + { + ServerInstance->SNO->WriteToSnoMask('x', "%s added a permanent Z-line on %s: %s", + zl->source.c_str(), u->GetIPString().c_str(), zl->reason.c_str()); + } + else + { + ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed Z-line on %s, expires in %s (on %s): %s", + zl->source.c_str(), u->GetIPString().c_str(), InspIRCd::DurationString(zl->duration).c_str(), + InspIRCd::TimeString(zl->duration).c_str(), zl->reason.c_str()); + } added_zline = true; } else -- cgit v1.3.1-10-gc9f91