From fc82abe7f65fd4aa174ff6d7b8ff98377eca21c8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 31 Aug 2024 15:53:39 +0800 Subject: [PATCH] Remove 'loopback address detection' helper function It is not needed since `QHostAddress::isLoopback()` can do the job. PR #21259. --- src/base/utils/net.cpp | 7 ------- src/base/utils/net.h | 1 - src/webui/webapplication.cpp | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/base/utils/net.cpp b/src/base/utils/net.cpp index 1f751e3ec..40247e38c 100644 --- a/src/base/utils/net.cpp +++ b/src/base/utils/net.cpp @@ -54,13 +54,6 @@ namespace Utils return subnet; } - bool isLoopbackAddress(const QHostAddress &addr) - { - return (addr == QHostAddress::LocalHost) - || (addr == QHostAddress::LocalHostIPv6) - || (addr == QHostAddress(u"::ffff:127.0.0.1"_s)); - } - bool isIPInSubnets(const QHostAddress &addr, const QList &subnets) { QHostAddress protocolEquivalentAddress; diff --git a/src/base/utils/net.h b/src/base/utils/net.h index 414570002..6e6e271f7 100644 --- a/src/base/utils/net.h +++ b/src/base/utils/net.h @@ -45,7 +45,6 @@ namespace Utils::Net bool isValidIP(const QString &ip); std::optional parseSubnet(const QString &subnetStr); - bool isLoopbackAddress(const QHostAddress &addr); bool isIPInSubnets(const QHostAddress &addr, const QList &subnets); QString subnetToString(const Subnet &subnet); QHostAddress canonicalIPv6Addr(const QHostAddress &addr); diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index d175cb2a5..f5c771454 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -698,7 +698,7 @@ QString WebApplication::generateSid() const bool WebApplication::isAuthNeeded() { - if (!m_isLocalAuthEnabled && Utils::Net::isLoopbackAddress(m_clientAddress)) + if (!m_isLocalAuthEnabled && m_clientAddress.isLoopback()) return false; if (m_isAuthSubnetWhitelistEnabled && Utils::Net::isIPInSubnets(m_clientAddress, m_authSubnetWhitelist)) return false;