From 851374e517ff1d2647eca699bf506f13fd0fa55c Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 7 Sep 2022 13:25:29 +0800 Subject: [PATCH] Rename function --- src/base/utils/net.cpp | 2 +- src/base/utils/net.h | 2 +- src/webui/webapplication.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/utils/net.cpp b/src/base/utils/net.cpp index 4d46323b6..4a8e5690f 100644 --- a/src/base/utils/net.cpp +++ b/src/base/utils/net.cpp @@ -63,7 +63,7 @@ namespace Utils || (addr == QHostAddress(u"::ffff:127.0.0.1"_qs)); } - bool isIPInRange(const QHostAddress &addr, const QVector &subnets) + bool isIPInSubnets(const QHostAddress &addr, const QVector &subnets) { QHostAddress protocolEquivalentAddress; bool addrConversionOk = false; diff --git a/src/base/utils/net.h b/src/base/utils/net.h index 3f885f852..f3c5d8ddd 100644 --- a/src/base/utils/net.h +++ b/src/base/utils/net.h @@ -45,7 +45,7 @@ namespace Utils::Net bool isValidIP(const QString &ip); std::optional parseSubnet(const QString &subnetStr); bool isLoopbackAddress(const QHostAddress &addr); - bool isIPInRange(const QHostAddress &addr, const QVector &subnets); + bool isIPInSubnets(const QHostAddress &addr, const QVector &subnets); QString subnetToString(const Subnet &subnet); QHostAddress canonicalIPv6Addr(const QHostAddress &addr); diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index 179db7108..a22002c45 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -579,7 +579,7 @@ bool WebApplication::isAuthNeeded() { if (!m_isLocalAuthEnabled && Utils::Net::isLoopbackAddress(m_clientAddress)) return false; - if (m_isAuthSubnetWhitelistEnabled && Utils::Net::isIPInRange(m_clientAddress, m_authSubnetWhitelist)) + if (m_isAuthSubnetWhitelistEnabled && Utils::Net::isIPInSubnets(m_clientAddress, m_authSubnetWhitelist)) return false; return true; }