iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Filter out server-dependent caps in CAP NEW using blacklist too

Browse Source
This commit is contained in:
Alexey Sokolov
2025-05-08 23:25:58 +01:00
parent 1c197a5508
commit c2f299abdf
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Client.cpp
View File

@@ -1070,7 +1070,7 @@ void CClient::SetTagSupport(const CString& sTag, bool bState) {
}
void CClient::NotifyServerDependentCap(const CString& sCap, bool bValue, const CString& sValue) {
if (bValue) {
if (bValue && !CZNC::Get().GetClientCapBlacklist().count(sCap)) {
if (HasCapNotify()) {
if (HasCap302() && !sValue.empty()) {
PutClient(":irc.znc.in CAP " + GetNick() + " NEW :" + sCap + "=" + sValue);

14
test/integration/tests/core.cpp
View File

@@ -1111,6 +1111,7 @@ TEST_F(ZNCTest, DisableCap) {
QTextStream out(&conf);
out << R"(
DisableClientCap = sasl
DisableClientCap = away-notify
DisableServerCap = chghost
)";
}
@@ -1126,6 +1127,19 @@ TEST_F(ZNCTest, DisableCap) {
ASSERT_THAT(client.ReadRemainder().toStdString(), Not(HasSubstr("sasl")));
client.Write("CAP REQ sasl");
client.ReadUntil("CAP foo NAK :sasl");
client.Write("PASS :hunter2");
client.Write("USER user/test x x :x");
client.Write("CAP END");
client.ReadUntil("001");
// Server-dependent
ircd.Write("001 nick Welcome");
ircd.Write("CAP nick NEW away-notify");
ircd.ReadUntil("CAP REQ :away-notify");
ircd.Write("CAP nick ACK away-notify");
ASSERT_THAT(client.ReadRemainder().toStdString(),
Not(AllOf(HasSubstr("NEW"), HasSubstr("away-notify"))));
}
} // namespace