james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sort IP bans into (specific addresses, networks) and check each list individually in an optimised way; 20x speedup /o/

Browse Source
This commit is contained in:
Shish 2012-01-27 11:04:50 +00:00
parent 93c2aa2084
commit 583b0b5eb4
1 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
contrib/ipban/main.php
View File

@ -161,13 +161,29 @@ class IPBan implements Extension {
// }}} // }}}
// deal with banned person {{{ // deal with banned person {{{
private function check_ip_ban() { private function check_ip_ban() {
global $config; $remote = $_SERVER['REMOTE_ADDR'];
global $database; $bans = $this->get_active_bans_sorted();
// bans[0] = IPs
if(isset($bans[0][$remote])) {
$this->block($remote); // never returns
}
// bans[1] = CIDR nets
foreach($bans[1] as $ip => $true) {
if(ip_in_range($remote, $ip)) {
$this->block($remote); // never returns
}
}
}
private function block($remote) {
global $config, $database;
$prefix = ($database->engine->name == "sqlite" ? "bans." : ""); $prefix = ($database->engine->name == "sqlite" ? "bans." : "");
$remote = $_SERVER['REMOTE_ADDR'];
$bans = $this->get_active_bans(); $bans = $this->get_active_bans();
foreach($bans as $row) { foreach($bans as $row) {
$ip = $row[$prefix."ip"]; $ip = $row[$prefix."ip"];
if( if(
@ -204,9 +220,6 @@ class IPBan implements Extension {
private function get_active_bans() { private function get_active_bans() {
global $database; global $database;
$cached = $database->cache->get("ip_bans");
if($cached) return $cached;
$bans = $database->get_all(" $bans = $database->get_all("
SELECT bans.*, users.name as banner_name SELECT bans.*, users.name as banner_name
FROM bans FROM bans
@ -215,12 +228,34 @@ class IPBan implements Extension {
ORDER BY end_timestamp, bans.id ORDER BY end_timestamp, bans.id
", array("end_timestamp"=>time())); ", array("end_timestamp"=>time()));
$database->cache->set("ip_bans", $bans, 600);
if($bans) {return $bans;} if($bans) {return $bans;}
else {return array();} else {return array();}
} }
// returns [ips, nets]
private function get_active_bans_sorted() {
global $database;
$cached = $database->cache->get("ip_bans_sorted");
if($cached) return $cached;
$bans = $this->get_active_bans();
$ips = array("0.0.0.0" => false);
$nets = array("0.0.0.0/32" => false);
foreach($bans as $row) {
if(strstr($row['ip'], '/')) {
$nets[$row['ip']] = true;
}
else {
$ips[$row['ip']] = true;
}
}
$sorted = array($ips, $nets);
$database->cache->set("ip_bans_sorted", $sorted, 600);
return $sorted;
}
private function add_ip_ban($ip, $reason, $end, $user) { private function add_ip_ban($ip, $reason, $end, $user) {
global $database; global $database;
$sql = "INSERT INTO bans (ip, reason, end_timestamp, banner_id) VALUES (:ip, :reason, :end, :admin_id)"; $sql = "INSERT INTO bans (ip, reason, end_timestamp, banner_id) VALUES (:ip, :reason, :end, :admin_id)";