mirror of
https://github.com/vichan-devel/vichan.git
synced 2024-12-18 02:16:03 +01:00
Format filter
This commit is contained in:
parent
e52c996a56
commit
db7d51670e
@ -11,24 +11,27 @@ class Filter {
|
|||||||
private $condition;
|
private $condition;
|
||||||
private $post;
|
private $post;
|
||||||
|
|
||||||
|
|
||||||
public function __construct(array $arr) {
|
public function __construct(array $arr) {
|
||||||
foreach ($arr as $key => $value)
|
foreach ($arr as $key => $value) {
|
||||||
$this->$key = $value;
|
$this->$key = $value;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function match($condition, $match) {
|
public function match($condition, $match) {
|
||||||
$condition = strtolower($condition);
|
$condition = strtolower($condition);
|
||||||
|
|
||||||
$post = &$this->post;
|
$post = &$this->post;
|
||||||
|
|
||||||
switch($condition) {
|
switch($condition) {
|
||||||
case 'custom':
|
case 'custom':
|
||||||
if (!is_callable($match))
|
if (!is_callable($match)) {
|
||||||
error('Custom condition for filter is not callable!');
|
error('Custom condition for filter is not callable!');
|
||||||
|
}
|
||||||
return $match($post);
|
return $match($post);
|
||||||
case 'flood-match':
|
case 'flood-match':
|
||||||
if (!is_array($match))
|
if (!is_array($match)) {
|
||||||
error('Filter condition "flood-match" must be an array.');
|
error('Filter condition "flood-match" must be an array.');
|
||||||
|
}
|
||||||
|
|
||||||
// Filter out "flood" table entries which do not match this filter.
|
// Filter out "flood" table entries which do not match this filter.
|
||||||
|
|
||||||
@ -38,26 +41,32 @@ class Filter {
|
|||||||
foreach ($match as $flood_match_arg) {
|
foreach ($match as $flood_match_arg) {
|
||||||
switch ($flood_match_arg) {
|
switch ($flood_match_arg) {
|
||||||
case 'ip':
|
case 'ip':
|
||||||
if ($flood_post['ip'] != $_SERVER['REMOTE_ADDR'])
|
if ($flood_post['ip'] != $_SERVER['REMOTE_ADDR']) {
|
||||||
continue 3;
|
continue 3;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'body':
|
case 'body':
|
||||||
if ($flood_post['posthash'] != make_comment_hex($post['body_nomarkup']))
|
if ($flood_post['posthash'] != make_comment_hex($post['body_nomarkup'])) {
|
||||||
continue 3;
|
continue 3;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'file':
|
case 'file':
|
||||||
if (!isset($post['filehash']))
|
if (!isset($post['filehash'])) {
|
||||||
return false;
|
return false;
|
||||||
if ($flood_post['filehash'] != $post['filehash'])
|
}
|
||||||
|
if ($flood_post['filehash'] != $post['filehash']) {
|
||||||
continue 3;
|
continue 3;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'board':
|
case 'board':
|
||||||
if ($flood_post['board'] != $post['board'])
|
if ($flood_post['board'] != $post['board']) {
|
||||||
continue 3;
|
continue 3;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'isreply':
|
case 'isreply':
|
||||||
if ($flood_post['isreply'] == $post['op'])
|
if ($flood_post['isreply'] == $post['op']) {
|
||||||
continue 3;
|
continue 3;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
error('Invalid filter flood condition: ' . $flood_match_arg);
|
error('Invalid filter flood condition: ' . $flood_match_arg);
|
||||||
@ -67,7 +76,6 @@ class Filter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->flood_check = $flood_check_matched;
|
$this->flood_check = $flood_check_matched;
|
||||||
|
|
||||||
return !empty($this->flood_check);
|
return !empty($this->flood_check);
|
||||||
case 'flood-time':
|
case 'flood-time':
|
||||||
foreach ($this->flood_check as $flood_post) {
|
foreach ($this->flood_check as $flood_post) {
|
||||||
@ -97,8 +105,9 @@ class Filter {
|
|||||||
case 'filehash':
|
case 'filehash':
|
||||||
return $match === $post['filehash'];
|
return $match === $post['filehash'];
|
||||||
case 'filename':
|
case 'filename':
|
||||||
if (!$post['files'])
|
if (!$post['files']) {
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($post['files'] as $file) {
|
foreach ($post['files'] as $file) {
|
||||||
if (preg_match($match, $file['filename'])) {
|
if (preg_match($match, $file['filename'])) {
|
||||||
@ -107,8 +116,9 @@ class Filter {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
case 'extension':
|
case 'extension':
|
||||||
if (!$post['files'])
|
if (!$post['files']) {
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($post['files'] as $file) {
|
foreach ($post['files'] as $file) {
|
||||||
if (preg_match($match, $file['extension'])) {
|
if (preg_match($match, $file['extension'])) {
|
||||||
@ -143,12 +153,14 @@ class Filter {
|
|||||||
$query->bindValue(':body', "Autoban message: ".$this->post['body']);
|
$query->bindValue(':body', "Autoban message: ".$this->post['body']);
|
||||||
$query->execute() or error(db_error($query));
|
$query->execute() or error(db_error($query));
|
||||||
}
|
}
|
||||||
if (isset ($this->action)) switch($this->action) {
|
if (isset($this->action)) {
|
||||||
|
switch($this->action) {
|
||||||
case 'reject':
|
case 'reject':
|
||||||
error(isset($this->message) ? $this->message : 'Posting throttled by filter.');
|
error(isset($this->message) ? $this->message : 'Posting throttled by filter.');
|
||||||
case 'ban':
|
case 'ban':
|
||||||
if (!isset($this->reason))
|
if (!isset($this->reason)) {
|
||||||
error('The ban action requires a reason.');
|
error('The ban action requires a reason.');
|
||||||
|
}
|
||||||
|
|
||||||
$this->expires = isset($this->expires) ? $this->expires : false;
|
$this->expires = isset($this->expires) ? $this->expires : false;
|
||||||
$this->reject = isset($this->reject) ? $this->reject : true;
|
$this->reject = isset($this->reject) ? $this->reject : true;
|
||||||
@ -157,8 +169,9 @@ class Filter {
|
|||||||
Bans::new_ban($_SERVER['REMOTE_ADDR'], $this->reason, $this->expires, $this->all_boards ? false : $board['uri'], -1);
|
Bans::new_ban($_SERVER['REMOTE_ADDR'], $this->reason, $this->expires, $this->all_boards ? false : $board['uri'], -1);
|
||||||
|
|
||||||
if ($this->reject) {
|
if ($this->reject) {
|
||||||
if (isset($this->message))
|
if (isset($this->message)) {
|
||||||
error($message);
|
error($message);
|
||||||
|
}
|
||||||
|
|
||||||
checkBan($board['uri']);
|
checkBan($board['uri']);
|
||||||
exit;
|
exit;
|
||||||
@ -169,6 +182,7 @@ class Filter {
|
|||||||
error('Unknown filter action: ' . $this->action);
|
error('Unknown filter action: ' . $this->action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function check(array $post) {
|
public function check(array $post) {
|
||||||
$this->post = $post;
|
$this->post = $post;
|
||||||
@ -176,11 +190,14 @@ class Filter {
|
|||||||
if ($condition[0] == '!') {
|
if ($condition[0] == '!') {
|
||||||
$NOT = true;
|
$NOT = true;
|
||||||
$condition = substr($condition, 1);
|
$condition = substr($condition, 1);
|
||||||
} else $NOT = false;
|
} else {
|
||||||
|
$NOT = false;
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->match($condition, $value) == $NOT)
|
if ($this->match($condition, $value) == $NOT) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -197,10 +214,11 @@ function purge_flood_table() {
|
|||||||
} else {
|
} else {
|
||||||
$max_time = 0;
|
$max_time = 0;
|
||||||
foreach ($config['filters'] as $filter) {
|
foreach ($config['filters'] as $filter) {
|
||||||
if (isset($filter['condition']['flood-time']))
|
if (isset($filter['condition']['flood-time'])) {
|
||||||
$max_time = max($max_time, $filter['condition']['flood-time']);
|
$max_time = max($max_time, $filter['condition']['flood-time']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$time = time() - $max_time;
|
$time = time() - $max_time;
|
||||||
|
|
||||||
@ -210,8 +228,9 @@ function purge_flood_table() {
|
|||||||
function do_filters(array $post) {
|
function do_filters(array $post) {
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
if (!isset($config['filters']) || empty($config['filters']))
|
if (!isset($config['filters']) || empty($config['filters'])) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($config['filters'] as $filter) {
|
foreach ($config['filters'] as $filter) {
|
||||||
if (isset($filter['condition']['flood-match'])) {
|
if (isset($filter['condition']['flood-match'])) {
|
||||||
@ -240,10 +259,10 @@ function do_filters(array $post) {
|
|||||||
foreach ($config['filters'] as $filter_array) {
|
foreach ($config['filters'] as $filter_array) {
|
||||||
$filter = new Filter($filter_array);
|
$filter = new Filter($filter_array);
|
||||||
$filter->flood_check = $flood_check;
|
$filter->flood_check = $flood_check;
|
||||||
if ($filter->check($post))
|
if ($filter->check($post)) {
|
||||||
$filter->action();
|
$filter->action();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
purge_flood_table();
|
purge_flood_table();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user