github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 21:03:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove 'loopback address detection' helper function

Browse source 
It is not needed since `QHostAddress::isLoopback()` can do the job.
PR #21259.
This commit is contained in:
Chocobo1 2024-08-31 15:53:39 +08:00 • committed by GitHub
commit fc82abe7f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/base/utils/net.cpp
View file

@ -54,13 +54,6 @@ namespace Utils
return subnet; 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<Subnet> &subnets) bool isIPInSubnets(const QHostAddress &addr, const QList<Subnet> &subnets)
{ {
QHostAddress protocolEquivalentAddress; QHostAddress protocolEquivalentAddress;

1
src/base/utils/net.h
View file

@ -45,7 +45,6 @@ namespace Utils::Net
bool isValidIP(const QString &ip); bool isValidIP(const QString &ip);
std::optional<Subnet> parseSubnet(const QString &subnetStr); std::optional<Subnet> parseSubnet(const QString &subnetStr);
bool isLoopbackAddress(const QHostAddress &addr);
bool isIPInSubnets(const QHostAddress &addr, const QList<Subnet> &subnets); bool isIPInSubnets(const QHostAddress &addr, const QList<Subnet> &subnets);
QString subnetToString(const Subnet &subnet); QString subnetToString(const Subnet &subnet);
QHostAddress canonicalIPv6Addr(const QHostAddress &addr); QHostAddress canonicalIPv6Addr(const QHostAddress &addr);

2
src/webui/webapplication.cpp
View file

@ -698,7 +698,7 @@ QString WebApplication::generateSid() const
bool WebApplication::isAuthNeeded() bool WebApplication::isAuthNeeded()
{ {
if (!m_isLocalAuthEnabled && Utils::Net::isLoopbackAddress(m_clientAddress)) if (!m_isLocalAuthEnabled && m_clientAddress.isLoopback())
return false; return false;
if (m_isAuthSubnetWhitelistEnabled && Utils::Net::isIPInSubnets(m_clientAddress, m_authSubnetWhitelist)) if (m_isAuthSubnetWhitelistEnabled && Utils::Net::isIPInSubnets(m_clientAddress, m_authSubnetWhitelist))
return false; return false;