Merge pull request #332 from AttorneyOnline/asn-support
The test no longer fails on linux
This commit is contained in:
stonedDiscord
GitHub
commit
18719c9ae8
14
bin/config_sample/ipbans.json
Normal file
14
bin/config_sample/ipbans.json
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ip_range": [
|
||||
"192.0.2.0/24",
|
||||
"198.51.100.0/24",
|
||||
"192.88.99.0/24",
|
||||
"203.0.113.0/24",
|
||||
"2001:0000:/32",
|
||||
"2001:db8::/32",
|
||||
"2002::/16"
|
||||
],
|
||||
"asn": [
|
||||
"0"
|
||||
]
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
# Test nets
|
||||
192.0.2.0/24
|
||||
198.51.100.0/24
|
||||
192.88.99.0/24
|
||||
203.0.113.0/24
|
||||
|
||||
# IPv6
|
||||
2001:0000:/32
|
||||
2001:db8::/32
|
||||
2002::/16
|
||||
14
bin_tests/config/ipbans.json
Normal file
14
bin_tests/config/ipbans.json
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"ip_range": [
|
||||
"192.0.2.0/24",
|
||||
"198.51.100.0/24",
|
||||
"192.88.99.0/24",
|
||||
"203.0.113.0/24",
|
||||
"2001:0000:/32",
|
||||
"2001:db8::/32",
|
||||
"2002::/16"
|
||||
],
|
||||
"asn": [
|
||||
"0"
|
||||
]
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
# Test nets
|
||||
192.0.2.0/24
|
||||
198.51.100.0/24
|
||||
192.88.99.0/24
|
||||
203.0.113.0/24
|
||||
|
||||
# IPv6
|
||||
2001:0000:/32
|
||||
2001:db8::/32
|
||||
2002::/16
|
||||
@ -16,8 +16,8 @@
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>. //
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
#include "include/config_manager.h"
|
||||
|
||||
#include <include/config_manager.h>
|
||||
#include <QSqlDatabase>
|
||||
#include <QSqlQuery>
|
||||
|
||||
QSettings *ConfigManager::m_settings = new QSettings("config/config.ini", QSettings::IniFormat);
|
||||
QSettings *ConfigManager::m_discord = new QSettings("config/discord.ini", QSettings::IniFormat);
|
||||
@ -43,7 +43,7 @@ bool ConfigManager::verifyServerConfig()
|
||||
// Verify config files
|
||||
QStringList l_config_files{"config/config.ini", "config/areas.ini", "config/backgrounds.txt", "config/characters.txt", "config/music.json",
|
||||
"config/discord.ini", "config/text/8ball.txt", "config/text/gimp.txt", "config/text/praise.txt",
|
||||
"config/text/reprimands.txt", "config/text/commandhelp.json", "config/text/cdns.txt"};
|
||||
"config/text/reprimands.txt", "config/text/commandhelp.json", "config/text/cdns.txt", "config/ipbans.json"};
|
||||
for (const QString &l_file : l_config_files) {
|
||||
if (!fileExists(QFileInfo(l_file))) {
|
||||
qCritical() << l_file + " does not exist!";
|
||||
@ -252,14 +252,36 @@ QStringList ConfigManager::rawAreaNames()
|
||||
|
||||
QStringList ConfigManager::iprangeBans()
|
||||
{
|
||||
QStringList l_iprange_bans;
|
||||
QFile l_file("config/iprange_bans.txt");
|
||||
l_file.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
while (!(l_file.atEnd())) {
|
||||
l_iprange_bans.append(l_file.readLine().trimmed());
|
||||
QFile l_json_file("config/ipbans.json");
|
||||
l_json_file.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
|
||||
QJsonParseError l_error;
|
||||
QJsonDocument l_ip_bans = QJsonDocument::fromJson(l_json_file.readAll(), &l_error);
|
||||
if (l_error.error != QJsonParseError::NoError) {
|
||||
qDebug() << "Unable to parse JSON file. Error:" << l_error.errorString();
|
||||
return {};
|
||||
}
|
||||
l_file.close();
|
||||
return l_iprange_bans;
|
||||
|
||||
QJsonObject l_json_obj = l_ip_bans.object();
|
||||
|
||||
QStringList l_range_bans;
|
||||
l_range_bans.append(l_json_obj["ip_range"].toVariant().toStringList());
|
||||
|
||||
if (QFile::exists("storage/asn.sqlite3")) {
|
||||
QSqlDatabase asn_db = QSqlDatabase::addDatabase("QSQLITE", "ASN");
|
||||
asn_db.setDatabaseName("storage/asn.sqlite3");
|
||||
asn_db.open();
|
||||
|
||||
// This is a dumb hack. Idk how else I can do this, but who gives a shit?
|
||||
QSqlQuery query("SELECT ip FROM maxmind WHERE asn in (" + l_json_obj["asn"].toVariant().toStringList().join(",") + ")", asn_db);
|
||||
query.exec();
|
||||
while (query.next()) {
|
||||
l_range_bans.append(query.value(0).toString());
|
||||
}
|
||||
asn_db.close();
|
||||
}
|
||||
l_range_bans.removeDuplicates();
|
||||
return l_range_bans;
|
||||
}
|
||||
|
||||
void ConfigManager::reloadSettings()
|
||||
|
||||
95
scripts/maxmind2sqlite.ps1
Normal file
95
scripts/maxmind2sqlite.ps1
Normal file
@ -0,0 +1,95 @@
|
||||
<#PSScriptInfo
|
||||
.VERSION 1.0
|
||||
.GUID aca39872-c8c6-434f-98fe-a6e95be92aa7
|
||||
#>
|
||||
|
||||
<#
|
||||
.DESCRIPTION
|
||||
Best-effort MaxMind ASN CSV database to SQLite converter.
|
||||
#>
|
||||
|
||||
$sDatabasePath= "$PSScriptRoot\storage\asn.sqlite3"
|
||||
$license_key = ""
|
||||
$uri_maxmind = [string]::Format("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN-CSV&license_key={0}&suffix=zip",$license_key)
|
||||
|
||||
Write-Host("Checking and downloading dependencies.")
|
||||
|
||||
$uri_sqlite = "https://system.data.sqlite.org/blobs/1.0.118.0/sqlite-netFx451-binary-bundle-x64-2013-1.0.118.0.zip"
|
||||
if (!(Test-Path -Path "$PSScriptRoot\bin\System.Data.SQLite.dll")) {
|
||||
Write-Host("Downloading SQlite3!")
|
||||
Start-BitsTransfer $uri_sqlite -Destination "$PSScriptRoot\sqlite3.zip" -HttpMethod GET
|
||||
Expand-Archive -Path "$PSScriptRoot\sqlite3.zip" -DestinationPath "$PSScriptRoot\bin" -Force
|
||||
Remove-Item -Path "$PSScriptRoot\sqlite3.zip" -Force
|
||||
}
|
||||
else {
|
||||
Write-Host("sqlite3 found!") -ForegroundColor Green
|
||||
}
|
||||
|
||||
if (!(Test-Path -Path "$PSScriptRoot\storage")) {
|
||||
New-Item -Path "$PSScriptRoot\storage" -ItemType Directory
|
||||
}
|
||||
|
||||
if (Test-Path -Path "$PSScriptRoot\storage\asn.sqlite3") {
|
||||
Remove-Item -Path "$PSScriptRoot\storage\asn.sqlite3" -Force
|
||||
}
|
||||
New-Item -Path "$PSScriptRoot\storage\asn.sqlite3" -ItemType File -Force
|
||||
|
||||
if (![string]::IsNullOrEmpty($license_key)) {
|
||||
|
||||
Write-Host($uri_maxmind)
|
||||
Write-Host("MaxMind License key available. Trying to download the database.")
|
||||
#Maxmiund has issues when I use BITS. So sad.
|
||||
try {
|
||||
Invoke-WebRequest -Uri $uri_maxmind -OutFile "$PSScriptRoot\maxmind.zip" -Method GET -ErrorAction Stop
|
||||
}
|
||||
catch {
|
||||
Write-Host("Unable to download MaxMind CSV database. Aborting script. Please check your license key and try again later.")
|
||||
exit
|
||||
}
|
||||
Expand-Archive -Path "$PSScriptRoot\maxmind.zip" -DestinationPath "$PSScriptRoot\storage" -Force
|
||||
Remove-Item -Path "$PSScriptRoot\maxmind.zip" -Force
|
||||
}
|
||||
|
||||
|
||||
$ipv4 = Get-ChildItem -Recurse -Path "$PSScriptRoot\storage\*IPv4.csv" | Get-Content | ConvertFrom-Csv -Delimiter ","
|
||||
$ipv6 = Get-ChildItem -Recurse -Path "$PSScriptRoot\storage\*IPv6.csv" | Get-Content | ConvertFrom-Csv -Delimiter ","
|
||||
|
||||
[Reflection.Assembly]::LoadFile("$PSScriptRoot\bin\System.Data.SQLite.dll")
|
||||
$sDatabaseConnectionString=[string]::Format("data source={0}",$sDatabasePath)
|
||||
$oSQLiteDBConnection = New-Object System.Data.SQLite.SQLiteConnection
|
||||
$oSQLiteDBConnection.ConnectionString = $sDatabaseConnectionString
|
||||
$oSQLiteDBConnection.open()
|
||||
|
||||
$oSQLiteDBCommand=$oSQLiteDBConnection.CreateCommand()
|
||||
$oSQLiteDBCommand.Commandtext='CREATE TABLE "maxmind" (
|
||||
"ip" TEXT,
|
||||
"asn" INTEGER,
|
||||
"organization" TEXT,
|
||||
"type" INTEGER
|
||||
);'
|
||||
$oSQLiteDBCommand.CommandType = [System.Data.CommandType]::Text
|
||||
$oSQLiteDBCommand.ExecuteReader()
|
||||
|
||||
Write-Host("Inserting IPv4 entries.")
|
||||
foreach($entry in $ipv4) {
|
||||
$oSQLiteDBInsertCommand = $oSQLiteDBConnection.CreateCommand()
|
||||
$oSQLiteDBInsertCommand.Commandtext='INSERT INTO maxmind (ip, asn, organization, type) VALUES (@ip_addr, @asn_id, @org, 4)'
|
||||
$oSQLiteDBInsertCommand.Parameters.AddWithValue("ip_addr", $entry.network) | Out-Null
|
||||
$oSQLiteDBInsertCommand.Parameters.AddWithValue("asn_id", $entry.autonomous_system_number) | Out-Null
|
||||
$oSQLiteDBInsertCommand.Parameters.AddWithValue("org", $entry.autonomous_system_organization) | Out-Null
|
||||
$oSQLiteDBInsertCommand.CommandType = [System.Data.CommandType]::Text
|
||||
$oSQLiteDBInsertCommand.ExecuteNonQuery() | Out-Null
|
||||
$i++
|
||||
}
|
||||
|
||||
Write-Host("Inserting IPv6 entries.")
|
||||
foreach($entry in $ipv6) {
|
||||
$oSQLiteDBInsertCommand = $oSQLiteDBConnection.CreateCommand()
|
||||
$oSQLiteDBInsertCommand.Commandtext='INSERT INTO maxmind (ip, asn, organization, type) VALUES (@ip_addr, @asn_id, @org, 6)'
|
||||
$oSQLiteDBInsertCommand.Parameters.AddWithValue("ip_addr", $entry.network) | Out-Null
|
||||
$oSQLiteDBInsertCommand.Parameters.AddWithValue("asn_id", $entry.autonomous_system_number) | Out-Null
|
||||
$oSQLiteDBInsertCommand.Parameters.AddWithValue("org", $entry.autonomous_system_organization) | Out-Null
|
||||
$oSQLiteDBInsertCommand.CommandType = [System.Data.CommandType]::Text
|
||||
$oSQLiteDBInsertCommand.ExecuteNonQuery() | Out-Null
|
||||
}
|
||||
$oSQLiteDBConnection.Close()
|
||||
@ -256,8 +256,8 @@ void tst_ConfigManager::CommandInfo()
|
||||
void tst_ConfigManager::iprangeBans()
|
||||
{
|
||||
QStringList l_ipranges = ConfigManager::iprangeBans();
|
||||
QCOMPARE(l_ipranges.at(0), "# Test nets");
|
||||
QCOMPARE(l_ipranges.at(1), "192.0.2.0/24");
|
||||
QCOMPARE(l_ipranges.at(0), "192.0.2.0/24");
|
||||
QCOMPARE(l_ipranges.at(1), "198.51.100.0/24");
|
||||
}
|
||||
|
||||
void tst_ConfigManager::maxPlayers()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user