mirrors/rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-04-01 14:24:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: # and / in filter bridge (#3236)

Browse source
This commit is contained in:
Dag 2023-02-01 20:11:20 +01:00 • committed by GitHub
parent 1fe55314be
commit e01e031e3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bridges/FilterBridge.php
View file

@ -16,7 +16,7 @@ class FilterBridge extends FeedExpander
'required' => true, 'required' => true,
], ],
'filter' => [ 'filter' => [
'name' => 'Filter (regular expression)', 'name' => 'Filter (regular expression!!!)',
'required' => false, 'required' => false,
], ],
'filter_type' => [ 'filter_type' => [
@ -87,8 +87,16 @@ class FilterBridge extends FeedExpander
} }
} }
// Build regular expression $filter = $this->getInput('filter');
$regex = '/' . $this->getInput('filter') . '/'; if (! str_contains($filter, '#')) {
$delimiter = '#';
} elseif (! str_contains($filter, '/')) {
$delimiter = '/';
} else {
throw new \Exception('Cannot use both / and # inside filter');
}
$regex = $delimiter . $filter . $delimiter;
if ($this->getInput('case_insensitive')) { if ($this->getInput('case_insensitive')) {
$regex .= 'i'; $regex .= 'i';
} }
@ -105,6 +113,7 @@ class FilterBridge extends FeedExpander
$filter_fields[] = $item['title'] ?? null; $filter_fields[] = $item['title'] ?? null;
} }
if ($this->getInput('target_uri')) { if ($this->getInput('target_uri')) {
// todo: maybe consider 'http' and 'https' equivalent? Also maybe optionally .www subdomain?
$filter_fields[] = $item['uri'] ?? null; $filter_fields[] = $item['uri'] ?? null;
} }
@ -115,7 +124,11 @@ class FilterBridge extends FeedExpander
if ($length_limit > 0) { if ($length_limit > 0) {
$field = substr($field, 0, $length_limit); $field = substr($field, 0, $length_limit);
} }
$keep_item |= boolval(preg_match($regex, $field)); $result = preg_match($regex, $field);
if ($result === false) {
// todo: maybe notify user about the error here?
}
$keep_item |= boolval($result);
if ($this->getInput('fix_encoding')) { if ($this->getInput('fix_encoding')) {
$keep_item |= boolval(preg_match($regex, utf8_decode($field))); $keep_item |= boolval(preg_match($regex, utf8_decode($field)));
$keep_item |= boolval(preg_match($regex, utf8_encode($field))); $keep_item |= boolval(preg_match($regex, utf8_encode($field)));