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

Remove invalid subnets directly from list

Browse source
This commit is contained in:
Thomas Piccirello 2017-12-06 20:32:50 -05:00 • committed by sledgehammer999
commit dff753c452
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/base/preferences.cpp
View file

@ -35,6 +35,7 @@
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QDir> #include <QDir>
#include <QLocale> #include <QLocale>
#include <QMutableListIterator>
#include <QPair> #include <QPair>
#include <QSettings> #include <QSettings>
@ -487,21 +488,17 @@ QList<Utils::Net::Subnet> Preferences::getWebUiAuthSubnetWhitelist() const
return subnets; return subnets;
} }
void Preferences::setWebUiAuthSubnetWhitelist(const QStringList &subnets) void Preferences::setWebUiAuthSubnetWhitelist(QStringList subnets)
{ {
QList<Utils::Net::Subnet> filteredSubnets; QMutableListIterator<QString> i(subnets);
foreach (QString subnetString, subnets) { while (i.hasNext()) {
bool ok = false; bool ok = false;
const Utils::Net::Subnet subnet = Utils::Net::parseSubnet(subnetString.trimmed(), &ok); const Utils::Net::Subnet subnet = Utils::Net::parseSubnet(i.next().trimmed(), &ok);
if (ok) if (!ok)
filteredSubnets.append(subnet); i.remove();
} }
QStringList subnetsStringList; setValue("Preferences/WebUI/AuthSubnetWhitelist", subnets);
for (const Utils::Net::Subnet &subnet : filteredSubnets)
subnetsStringList.append(Utils::Net::subnetToString(subnet));
setValue("Preferences/WebUI/AuthSubnetWhitelist", subnetsStringList);
} }
QString Preferences::getServerDomains() const QString Preferences::getServerDomains() const

2
src/base/preferences.h
View file

@ -191,7 +191,7 @@ public:
bool isWebUiAuthSubnetWhitelistEnabled() const; bool isWebUiAuthSubnetWhitelistEnabled() const;
void setWebUiAuthSubnetWhitelistEnabled(bool enabled); void setWebUiAuthSubnetWhitelistEnabled(bool enabled);
QList<Utils::Net::Subnet> getWebUiAuthSubnetWhitelist() const; QList<Utils::Net::Subnet> getWebUiAuthSubnetWhitelist() const;
void setWebUiAuthSubnetWhitelist(const QStringList &subnets); void setWebUiAuthSubnetWhitelist(QStringList subnets);
QString getWebUiUsername() const; QString getWebUiUsername() const;
void setWebUiUsername(const QString &username); void setWebUiUsername(const QString &username);
QString getWebUiPassword() const; QString getWebUiPassword() const;