aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-09-18 15:29:48 +0100
committerGravatar Sadie Powell2020-09-18 15:29:48 +0100
commit92dc25f007b3706b74c779dcd3464b57724808af (patch)
tree1a3312f1f4ca3dc3d085c95130fe0048dba11b03 /src
parentRequire building with at least one SSL module. (diff)
Require SSL for linking servers.
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_spanningtree/server.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 682a588f3..f73f9d6db 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -131,8 +131,6 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
if (!CheckDuplicate(sname, sid))
return NULL;
- ServerInstance->SNO.WriteToSnoMask('l', "Verified server connection " + linkID + " ("+description+")");
-
const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(this);
if (ssliohook)
{
@@ -142,9 +140,11 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
}
else if (!irc::sockets::cidr_mask("127.0.0.0/8").match(capab->remotesa) && !irc::sockets::cidr_mask("::1/128").match(capab->remotesa))
{
- ServerInstance->SNO->WriteGlobalSno('l', "Server connection to %s is not using SSL (TLS). This is VERY INSECURE and will not be allowed in the next major version of InspIRCd.", x->Name.c_str());
+ this->SendError("Non-local server connections MUST be linked with SSL!");
+ return NULL;
}
+ ServerInstance->SNO.WriteToSnoMask('l', "Verified server connection " + linkID + " ("+description+")");
return x;
}