Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Terra <[email protected]>
  • Loading branch information
@MCterra10
MCterra10 committed Dec 28, 2020
1 parent 1930a6f commit 7dc5177
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 27 deletions.
57 changes: 31 additions & 26 deletions api/bans/get/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@
return;
}

// Because I can't specify the sort order with prepared statements, I need to sanitize the order param, on the off chance that someone manages to compromize the server AND get the API key AND make a valid request
$saniOrder = sql_escape("`{$_GET['sort']}` {$_GET['order']}");
// Var to store number of bans selected
$totalBans = 0;
// Universal var to store our results to. We can avoid some copypasta with this.
$rows = array();
// Do some stuff with the IP address


// Handle each different type of search
if(key_exists('all', $_GET['search'])) {
Expand All @@ -34,20 +38,19 @@
$term,
$term,
$term,
$term
ip_to_int($term),
]);

// Now through the power of copypasta, get required amount of rows, god it's so ugly
$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND (`ckey` LIKE CONCAT('%', ?, '%') OR `akey` LIKE CONCAT('%', ?, '%') OR `reason` LIKE CONCAT('%', ?, '%') OR `compid` = ? OR `ip` = ?) ORDER BY ? LIMIT ? OFFSET ?",
$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND (`ckey` LIKE CONCAT('%', ?, '%') OR `akey` LIKE CONCAT('%', ?, '%') OR `reason` LIKE CONCAT('%', ?, '%') OR `compid` = ? OR `ip` = ?) ORDER BY {$saniOrder} LIMIT ? OFFSET ?",
[
'issssisii',
'issssiii',
$_GET['removed'],
$term,
$term,
$term,
$term,
$term,
strtolower($_GET['order']),
ip_to_int($term),
$_GET['limit'],
$_GET['offset']
], true);
Expand All @@ -56,31 +59,31 @@

$totalBans = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `ckey` LIKE CONCAT('%', ?, '%')", ['is', $_GET['removed'], $term]);

$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `ckey` LIKE CONCAT('%', ?, '%') ORDER BY ? LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, strtolower($_GET['order']), $_GET['limit'], $_GET['offset']], true);
$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `ckey` LIKE CONCAT('%', ?, '%') ORDER BY {$saniOrder} LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, $_GET['limit'], $_GET['offset']], true);
} elseif(key_exists('akey', $_GET['search'])) {
$term = $_GET['search']['akey'];

$totalBans = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `akey` LIKE CONCAT('%', ?, '%')", ['is', $_GET['removed'], $term]);

$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `akey` LIKE CONCAT('%', ?, '%') ORDER BY ? LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, strtolower($_GET['order']), $_GET['limit'], $_GET['offset']], true);
$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `akey` LIKE CONCAT('%', ?, '%') ORDER BY {$saniOrder} LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, $_GET['limit'], $_GET['offset']], true);
} elseif(key_exists('reason', $_GET['search'])) {
$term = $_GET['search']['reason'];

$totalBans = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `reason` LIKE CONCAT('%', ?, '%')", ['is', $_GET['removed'], $term]);

$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `reason` LIKE CONCAT('%', ?, '%') ORDER BY ? LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, strtolower($_GET['order']), $_GET['limit'], $_GET['offset']], true);
$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `reason` LIKE CONCAT('%', ?, '%') ORDER BY {$saniOrder} LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, $_GET['limit'], $_GET['offset']], true);
} elseif(key_exists('compID', $_GET['search'])) {
$term = $_GET['search']['compID'];

$totalBans = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `compid` = ?", ['is', $_GET['removed'], $term]);

$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `compid` = ? ORDER BY ? LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, strtolower($_GET['order']), $_GET['limit'], $_GET['offset']], true);
$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `compid` = ? ORDER BY {$saniOrder} LIMIT ? OFFSET ?", ['isii', $_GET['removed'], $term, $_GET['limit'], $_GET['offset']], true);
} elseif(key_exists('ip', $_GET['search'])) {
$term = $_GET['search']['ip'];

$totalBans = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `ip` = ?", ['ii', $_GET['removed'], ip_to_int($term)]);

$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `ip` = ? ORDER BY ? LIMIT ? OFFSET ?", ['iiii', $_GET['removed'], ip_to_int($term), strtolower($_GET['order']), $_GET['limit'], $_GET['offset']], true);
$rows = sql_query("SELECT * FROM `bans` WHERE `removed` = ? AND `ip` = ? ORDER BY {$saniOrder} LIMIT ? OFFSET ?", ['iiii', $_GET['removed'], ip_to_int($term), $_GET['limit'], $_GET['offset']], true);
} else {
// wut
echo json_error("No valid search term provided");
Expand All @@ -91,22 +94,24 @@
$response = array();
$response['total'] = $totalBans;

foreach($rows as $row) {
$response[$row['id']] = [
'id' => $row['id'],
'ckey' => $row['ckey'],
'compID' => $row['compid'],
'ip' => int_to_ip($row['ip']),
'reason' => $row['reason'],
'timestamp' => $row['timestamp'],
'akey' => $row['akey'],
'oakey' => $row['oakey'],
'previous' => $row['previous'],
'chain' => $row['chain']
];

if($row['server']) {
$response[$row['id']]['server'] = $row['server'];
if($rows) {
foreach($rows as $row) {
$response[$row['id']] = [
'id' => $row['id'],
'ckey' => $row['ckey'],
'compID' => $row['compid'],
'ip' => int_to_ip($row['ip']),
'reason' => $row['reason'],
'timestamp' => $row['timestamp'],
'akey' => $row['akey'],
'oakey' => $row['oakey'],
'previous' => $row['previous'],
'chain' => $row['chain']
];

if($row['server']) {
$response[$row['id']]['server'] = $row['server'];
}
}
}

Expand Down
24 changes: 24 additions & 0 deletions api/utils.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ function sql_query($query, $params, $returnValues = false, $failSafe = false) {
return $result;
}

// Connects to the DB and escapes a string for (probably) safe use.
function sql_escape($str) {
global $databaseAddress, $databaseUser, $databasePassword, $databaseName;
mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
$db = mysqli_connect($databaseAddress, $databaseUser, $databasePassword, $databaseName);
$out = $db->real_escape_string($str);
$db->close();
return $out;
}

// Referenceize arrays for arg passing
function ref_values($arr){
if (strnatcmp(phpversion(),'5.3') >= 0) //Reference is required for PHP 5.3+
Expand All @@ -113,11 +123,25 @@ function ref_values($arr){
}

function ip_to_int($ipStr) {
if($ipStr == "N/A") {
return 0;
}
$arr = preg_split('/\./', $ipStr);
if(count($arr) != 4) {
return -1;
}
foreach($arr as $val) {
if(!is_numeric($val)) {
return -1;
}
}
return ((int)$arr[0] * (256 ** 3)) + ((int)$arr[1] * (256 ** 2)) + ((int)$arr[2] * 256) + ((int)$arr[3]);
}

function int_to_ip($ipInt) {
if($ipInt == 0) {
return "N/A";
}
$one = $ipInt & 255;
$two = ($ipInt & 65280) >> 8;
$three = ($ipInt & 16711680) >> 16;
Expand Down
2 changes: 1 addition & 1 deletion schema_api.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ CREATE TABLE IF NOT EXISTS `bans` (
`previous` INT UNSIGNED NOT NULL DEFAULT '0',
`chain` SMALLINT UNSIGNED NOT NULL DEFAULT '0',
`server` VARCHAR(32) DEFAULT NULL,
`removed` BOOLEAN NOT NULL DEFAULT 'FALSE', -- tbh, we shouldn't just nuke bans from the face of the earth, because that's what I did. let's keep them around for admins to look at
`removed` BOOLEAN NOT NULL DEFAULT FALSE, -- tbh, we shouldn't just nuke bans from the face of the earth, because that's what I did. let's keep them around for admins to look at
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

Expand Down

0 comments on commit 7dc5177

Please sign in to comment.