acetone/3proxy-eagle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reject IPs from statistics feature and top lists size as parameter

Browse Source
This commit is contained in:
acetone
2022-11-21 10:17:45 +03:00
parent 2e39d2f29f
commit a01bbaf540
6 changed files with 78 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbmanager.cpp
+2 -2
View File
@@ -84,7 +84,7 @@ TopDestinationList DBManager::totalTop() const
TopDestinationList result;
if (not query.exec("SELECT * FROM total_history ORDER BY request_counter DESC LIMIT " + QString::number(g::c::LAST_AND_TOP_LIST_SIZE)))
if (not query.exec("SELECT * FROM total_history ORDER BY request_counter DESC LIMIT " + QString::number(g::p::LAST_AND_TOP_LIST_SIZE)))
{
qCritical() << "Db query failed:" << query.lastError().text();
}
@@ -105,7 +105,7 @@ TopDestinationList DBManager::dailyTop() const
TopDestinationList result;
if (not query.exec("SELECT * FROM daily_history ORDER BY request_counter DESC LIMIT " + QString::number(g::c::LAST_AND_TOP_LIST_SIZE)))
if (not query.exec("SELECT * FROM daily_history ORDER BY request_counter DESC LIMIT " + QString::number(g::p::LAST_AND_TOP_LIST_SIZE)))
{
qCritical() << "Db query failed:" << query.lastError().text();
}
src/g.cpp
+1 -1
View File
@@ -33,7 +33,6 @@ namespace c {
const QString SOFTWARE_NAME = "3proxy-eagle";
const QString SOFTWARE_VERSION = "0.0.1a";
const QString COPYRIGHT = "GPLv3 (c) acetone, 2022";
const int LAST_AND_TOP_LIST_SIZE = 10;
const qint64 DB_DAILY_TOP_TABLE_ACTUALIZE_MINIMAL_INTERVAL_MS = 300000; // 5 min
const qint64 CACHE_ACTUALIZE_TOP_LISTS_FROM_DB_MINIMAL_INTERVAL_MS = 5000; // 5 sec
const QString HA_PAGE_TITLE = "{{PAGE_TITLE}}";
@@ -60,6 +59,7 @@ namespace p {
QString SERVICE_TITLE = "3proxy-eagle";
QString BIND_TO_ADDRESS = "127.0.0.1";
quint16 BIND_TO_PORT = 8161;
bool IGNORE_IP_ADDRS_IN_STATISTCS = false;
} // namespace p
std::list< std::pair<QThread*, ProxyInstanse*> > instanses;
src/g.h
+2 -1
View File
@@ -35,7 +35,6 @@ namespace c /* for Constants */ {
extern const QString SOFTWARE_NAME;
extern const QString SOFTWARE_VERSION;
extern const QString COPYRIGHT;
extern const int LAST_AND_TOP_LIST_SIZE;
extern const qint64 DB_DAILY_TOP_TABLE_ACTUALIZE_MINIMAL_INTERVAL_MS;
extern const qint64 CACHE_ACTUALIZE_TOP_LISTS_FROM_DB_MINIMAL_INTERVAL_MS;
extern const QString HA_PAGE_TITLE;
@@ -56,11 +55,13 @@ namespace c /* for Constants */ {
} // namespace c
namespace p /* for Parameters */ {
extern uint LAST_AND_TOP_LIST_SIZE;
extern QString WORKING_DIR;
extern QStringList IGNORED_DESTINATIONS;
extern QString SERVICE_TITLE;
extern QString BIND_TO_ADDRESS;
extern quint16 BIND_TO_PORT;
extern bool IGNORE_IP_ADDRS_IN_STATISTCS;
} // namespace p
extern std::list< std::pair<QThread*, ProxyInstanse*> > instanses;
src/main.cpp
+28 -7
View File
@@ -46,13 +46,15 @@ void usage()
<< "Accumulate ethical 3proxy statistics with web interface\n\n"
"U S A G E:\n"
" -i --instanse <3proxy>,<3proxy.cfg>\n"
" -w --working-directory <data>\n"
" -t --service-title <3proxy-eagle>\n"
" -I --ignored-destinations <[0.0.0.0],127.0.0.1>\n"
" -a --bind-to-address <127.0.0.1>\n"
" -p --bind-to-port <8161>\n"
" -l --log-level <info> (off, error, warn, info, debug)\n\n"
" -i --instanse <3proxy>,<3proxy.cfg>\n"
" -w --working-directory <data>\n"
" -t --service-title <3proxy-eagle>\n"
" -I --ignored-destinations <[0.0.0.0],127.0.0.1>\n"
" -a --bind-to-address <127.0.0.1>\n"
" -p --bind-to-port <8161>\n"
" -l --log-level <info> (off, error, warn, info, debug)\n"
" -s --top-lists-size <5>\n"
" -D --reject-ip-from-statistics\n\n"
"N O T E S:\n"
"* Multi instanses supported. Just pass new one --instanse value!\n"
@@ -174,6 +176,23 @@ int main(int argc, char *argv[])
g::p::SERVICE_TITLE = value;
}
else if ((key == "-s" or key == "--top-lists-size") and not value.isEmpty())
{
bool ok = false;
value.toUInt(&ok);
if (not ok)
{
qWarning() << "--top-lists-size parsing failed, incorrect unsigned integer" << value;
continue;
}
g::p::LAST_AND_TOP_LIST_SIZE = value.toUInt();
}
else if (key == "-D" or key == "--reject-ip-from-statistics")
{
g::p::IGNORE_IP_ADDRS_IN_STATISTCS = true;
}
else if (key == "-h" or key == "--help")
{
usage();
@@ -203,6 +222,8 @@ int main(int argc, char *argv[])
qInfo().noquote() << "Instanses count:" << g::instanses.size();
qInfo().noquote() << "Working directory:" << g::p::WORKING_DIR;
qInfo().noquote() << "Ignored destinations:" << g::p::IGNORED_DESTINATIONS;
qInfo().noquote() << "Top lists size:" << g::p::LAST_AND_TOP_LIST_SIZE;
qInfo() << "Reject IP addresses from statistics:" << g::p::IGNORE_IP_ADDRS_IN_STATISTCS;
(new HttpServer)/*->killTheCapitalism()*/;
src/statistics.cpp
+41 -12
View File
@@ -21,11 +21,13 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "dbmanager.h"
#include "g.h"
#include <QRegularExpression>
#include <QDateTime>
#include <QDebug>
#include <QMutex>
#include <QFile>
QMutex Statistics::m_lastDestinationsMtx;
QStringList Statistics::m_lastDestinations;
std::atomic<quint64> Statistics::m_dailyUpload {0};
@@ -33,6 +35,7 @@ std::atomic<quint64> Statistics::m_dailyDownload {0};
std::atomic<quint64> Statistics::m_totalUpload {0};
std::atomic<quint64> Statistics::m_totalDownload {0};
QMutex Statistics::m_topDestinationsMtx;
TopDestinationList Statistics::m_dailyTopDestinations;
TopDestinationList Statistics::m_totalTopDestinations;
@@ -47,6 +50,23 @@ void Statistics::report(const LogEvent& event)
return;
}
m_lastDestinationsMtx.lock();
if (not lastDestinations().contains(event.dest))
{
if (lastDestinations().size() >= static_cast<int>(g::p::LAST_AND_TOP_LIST_SIZE))
{
m_lastDestinations.pop_back();
}
m_lastDestinations.push_front(event.dest);
}
m_lastDestinationsMtx.unlock();
if (g::p::IGNORE_IP_ADDRS_IN_STATISTCS and isIpAddress(event.dest))
{
qDebug() << event.dest << "rejected from statistics";
return;
}
DBManager db;
m_dailyDownload = db.incrementDailyDownloadTraffic(event.from);
@@ -57,21 +77,12 @@ void Statistics::report(const LogEvent& event)
db.incrementTotalTopCount(event.dest);
db.incrementDailyTopCount(event.dest);
// editing without mutex because DBManager() already lock this place
if (not lastDestinations().contains(event.dest))
{
if (lastDestinations().size() >= g::c::LAST_AND_TOP_LIST_SIZE)
{
m_lastDestinations.pop_back();
}
m_lastDestinations.push_front(event.dest);
}
m_cacheUpdatedAfterLastReport = false;
}
const QStringList Statistics::lastDestinations()
{
QMutexLocker lock (&m_lastDestinationsMtx);
return m_lastDestinations;
}
@@ -81,18 +92,19 @@ const TopDestinationList Statistics::dailyTopDestinations()
{
actualizeTopLists();
}
QMutexLocker lock (&m_topDestinationsMtx);
return m_dailyTopDestinations;
}
const TopDestinationList Statistics::totalTopDestinations()
{
QMutexLocker lock (&m_topDestinationsMtx);
return m_totalTopDestinations;
}
void Statistics::actualizeTopLists()
{
static QMutex mutex;
QMutexLocker lock (&mutex);
QMutexLocker lock (&m_topDestinationsMtx);
qint64 started = QDateTime::currentMSecsSinceEpoch();
if (started - m_actualizeTopListsLastTimestamp < g::c::CACHE_ACTUALIZE_TOP_LISTS_FROM_DB_MINIMAL_INTERVAL_MS)
@@ -109,3 +121,20 @@ void Statistics::actualizeTopLists()
m_actualizeTopListsLastTimestamp = QDateTime::currentMSecsSinceEpoch();
qDebug() << "Cache actualized in" << m_actualizeTopListsLastTimestamp-started << "ms";
}
bool Statistics::isIpAddress(const QString& dest)
{
static QRegularExpression ipv4("^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}$");
if (ipv4.match(dest).hasMatch())
{
return true;
}
static QRegularExpression ipv6("^\\[[a-f0-9:]*\\]$");
if (ipv6.match(dest).hasMatch())
{
return true;
}
return false;
}
src/statistics.h
+4
View File
@@ -22,6 +22,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "g.h"
#include <QStringList>
#include <QMutex>
struct LogEvent
{
@@ -49,7 +50,9 @@ public:
private:
static void actualizeTopLists();
static bool isIpAddress(const QString& dest);
static QMutex m_lastDestinationsMtx;
static QStringList m_lastDestinations;
static bool m_cacheUpdatedAfterLastReport;
@@ -60,6 +63,7 @@ private:
static std::atomic<quint64> m_totalUpload;
static std::atomic<quint64> m_totalDownload;
static QMutex m_topDestinationsMtx;
static TopDestinationList m_dailyTopDestinations;
static TopDestinationList m_totalTopDestinations;
};