From 67e241bcf2b6530c90424305692218a1e952dec5 Mon Sep 17 00:00:00 2001 From: dependabot[bot] Date: Thu, 1 Feb 2024 13:28:56 +0000 Subject: Bump microsoft/setup-msbuild from 1.3.1 to 2.0.0 Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild) from 1.3.1 to 2.0.0. - [Release notes](https://github.com/microsoft/setup-msbuild/releases) - [Changelog](https://github.com/microsoft/setup-msbuild/blob/main/building-release.md) - [Commits](https://github.com/microsoft/setup-msbuild/compare/v1.3.1...v2.0.0) --- updated-dependencies: - dependency-name: microsoft/setup-msbuild dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index bb34d826d..0e83f59ca 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v2.0.0 with: msbuild-architecture: x64 -- cgit v1.3.1-10-gc9f91 From 97bd26e08cac528e2b0b87dcb0b439105e173c94 Mon Sep 17 00:00:00 2001 From: dependabot[bot] Date: Thu, 1 Feb 2024 13:29:00 +0000 Subject: Bump peter-evans/create-pull-request from 5 to 6 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/misspell-fixer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/misspell-fixer.yml b/.github/workflows/misspell-fixer.yml index d7a02026d..61aac36c9 100644 --- a/.github/workflows/misspell-fixer.yml +++ b/.github/workflows/misspell-fixer.yml @@ -30,7 +30,7 @@ jobs: - uses: sobolevn/misspell-fixer-action@master with: options: '-rvnfuRVD .' - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GITHUB_TOKEN }} branch: ${{ env.REF_BRANCH }}+fix-spellings-${{ env.DATE }} -- cgit v1.3.1-10-gc9f91 From 9dba51c12a78ccce865f3a573b9d6435a576f13e Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 11 Feb 2024 04:10:41 +0000 Subject: Use TimingSafeCompare when comparing server SSL fingerprints. --- src/modules/m_spanningtree/hmac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp index ce0b070cd..4556006a2 100644 --- a/src/modules/m_spanningtree/hmac.cpp +++ b/src/modules/m_spanningtree/hmac.cpp @@ -77,7 +77,7 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs) if (capab->auth_fingerprint) { /* Require fingerprint to exist and match */ - if (link.Fingerprint != fp) + if (!InspIRCd::TimingSafeCompare(link.Fingerprint, fp)) { ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL certificate fingerprint on link %s: need \"%s\" got \"%s\"", link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str()); -- cgit v1.3.1-10-gc9f91 From 3d0ca1a79bb38de00d534aee336021d3c1787058 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 11 Feb 2024 04:11:17 +0000 Subject: Fix matching certificate fingerprints to be case insensitive. Closes #2083. --- src/modules/m_spanningtree/utils.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index f6bc25c81..885295079 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -320,7 +320,9 @@ void SpanningTreeUtilities::ReadConfiguration() if (!L->Port && L->IPAddr.find('/') == std::string::npos) ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no port defined, you will not be able to /connect it."); + std::transform(L->Fingerprint.begin(), L->Fingerprint.end(), L->Fingerprint.begin(), ::tolower); L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end()); + LinkBlocks.push_back(L); } -- cgit v1.3.1-10-gc9f91 From 57a4eca963044d4ed8c586f7cbb0d0977bf1c2bd Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 25 Feb 2024 22:20:02 +0000 Subject: Fix erroneously sending RPL_CHANNELSMSG when a whois chanlist is blocked. --- src/modules/m_hidechans.cpp | 2 +- src/modules/m_servprotect.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp index 91048e971..250915fe2 100644 --- a/src/modules/m_hidechans.cpp +++ b/src/modules/m_hidechans.cpp @@ -82,7 +82,7 @@ class ModuleHideChans CXX11_FINAL ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE { - if (numeric.GetNumeric() != RPL_WHOISCHANNELS) + if (numeric.GetNumeric() != RPL_WHOISCHANNELS && numeric.GetNumeric() != RPL_CHANNELSMSG) return MOD_RES_PASSTHRU; return ShouldHideChans(whois.GetSource(), whois.GetTarget()); diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index 6b8f5c3e5..7405b69e2 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -129,7 +129,10 @@ class ModuleServProtectMode CXX11_FINAL ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE { - return ((numeric.GetNumeric() == RPL_WHOISCHANNELS) && whois.GetTarget()->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU; + if (numeric.GetNumeric() != RPL_WHOISCHANNELS && numeric.GetNumeric() != RPL_CHANNELSMSG) + return MOD_RES_PASSTHRU; + + return whois.GetTarget()->IsModeSet(bm) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } }; -- cgit v1.3.1-10-gc9f91