From 2c4971ee03b9d0799dbece40fcc1b4d0e114548e Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 10 Jun 2024 21:45:38 +0100 Subject: Remove host-based cloak data from the hmac-sha256-addr link data. --- src/modules/m_cloak_sha256.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/modules/m_cloak_sha256.cpp') diff --git a/src/modules/m_cloak_sha256.cpp b/src/modules/m_cloak_sha256.cpp index 5e3d8689a..1d2df9650 100644 --- a/src/modules/m_cloak_sha256.cpp +++ b/src/modules/m_cloak_sha256.cpp @@ -195,7 +195,7 @@ public: SHA256Method(const Cloak::Engine* engine, const std::shared_ptr& tag, const std::string& k, psl_ctx_t* p, bool ch) ATTR_NOT_NULL(2) : Cloak::Method(engine, tag) , cloakhost(ch) - , hostparts(tag->getNum("hostparts", 3, 0, ServerInstance->Config->Limits.MaxHost / 2)) + , hostparts(cloakhost ? tag->getNum("hostparts", 3, 0, ServerInstance->Config->Limits.MaxHost / 2) : 0) , key(k) , pathparts(tag->getNum("pathparts", 1, 0, ServerInstance->Config->Limits.MaxHost / 2)) , prefix(tag->getString("prefix")) @@ -256,14 +256,17 @@ public: // allow verification of or less the same thing. data["cloak-v4"] = sha256 ? Generate("123.123.123.123") : broken; data["cloak-v6"] = sha256 ? Generate("dead:beef:cafe::") : broken; - data["cloak-host"] = sha256 ? Generate("extremely.long.inspircd.cloak.example") : broken; data["cloak-unix"] = sha256 ? Generate("/extremely/long/inspircd/cloak.example") : broken; - - data["host-parts"] = ConvToStr(hostparts); data["path-parts"] = ConvToStr(pathparts); data["prefix"] = prefix; data["suffix"] = suffix; + if (!cloakhost) + return; + + data["cloak-host"] = sha256 ? Generate("extremely.long.inspircd.cloak.example") : broken; + data["host-parts"] = ConvToStr(hostparts); + #ifdef HAS_PSL data["using-psl"] = psl ? "yes" : "no"; #else -- cgit v1.3.1-10-gc9f91