ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2024-02-25 22:26:22 +00:00
commit 8bfb92a86e
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-windows.yml vendored
View File

@ -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

2
.github/workflows/misspell-fixer.yml vendored
View File

@ -31,7 +31,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 }}

2
src/modules/m_hidechans.cpp
View File

@ -82,7 +82,7 @@ public:
ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) 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());

2
src/modules/m_spanningtree/hmac.cpp
View File

@ -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 TLS certificate fingerprint on link {}: need \"{}\" got \"{}\"",
link.Name, link.Fingerprint, fp);

2
src/modules/m_spanningtree/utils.cpp
View File

@ -321,7 +321,9 @@ void SpanningTreeUtilities::ReadConfiguration()
if (!L->Port && L->IPAddr.find('/') == std::string::npos)
ServerInstance->Logs.Warning(MODNAME, "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);
}