mirror/RSS-Bridge.rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-08-31 23:39:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: general code base refactor (#2950)

Browse source 
* refactor

* fix: bug in previous refactor

* chore: exclude phpcompat sniff due to bug in phpcompat

* fix: do not leak absolute paths

* refactor/fix: batch extensions checking, fix DOS issue
This commit is contained in:
Dag 2022-08-06 22:46:28 +02:00 • committed by GitHub
parent b042412416
commit 2bbce8ebef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 679 additions and 827 deletions
Download patch file Download diff file Expand all files Collapse all files

54
actions/DisplayAction.php
View file

@ -16,7 +16,7 @@ class DisplayAction implements ActionInterface
{
public function execute(array $request)
{
$bridgeFactory = new \BridgeFactory();
$bridgeFactory = new BridgeFactory();
$bridgeClassName = null;
if (isset($request['bridge'])) {
@ -27,16 +27,14 @@ class DisplayAction implements ActionInterface
throw new \InvalidArgumentException('Bridge name invalid!');
}
$format = $request['format']
or returnClientError('You must specify a format!');
// whitelist control
$format = $request['format'] ?? null;
if (!$format) {
throw new \Exception('You must specify a format!');
}
if (!$bridgeFactory->isWhitelisted($bridgeClassName)) {
throw new \Exception('This bridge is not whitelisted', 401);
die;
throw new \Exception('This bridge is not whitelisted');
}
// Data retrieval
$bridge = $bridgeFactory->create($bridgeClassName);
$bridge->loadConfiguration();
@ -47,14 +45,12 @@ class DisplayAction implements ActionInterface
define('NOPROXY', true);
}
// Cache timeout
$cache_timeout = -1;
if (array_key_exists('_cache_timeout', $request)) {
if (!CUSTOM_CACHE_TIMEOUT) {
unset($request['_cache_timeout']);
$uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) . '?' . http_build_query($request);
header('Location: ' . $uri, true, 301);
exit;
return;
}
$cache_timeout = filter_var($request['_cache_timeout'], FILTER_VALIDATE_INT);
@ -93,7 +89,6 @@ class DisplayAction implements ActionInterface
)
);
// Initialize cache
$cacheFactory = new CacheFactory();
$cache = $cacheFactory->create();
@ -109,15 +104,17 @@ class DisplayAction implements ActionInterface
$mtime !== false
&& (time() - $cache_timeout < $mtime)
&& !Debug::isEnabled()
) { // Load cached data
) {
// Load cached data
// Send "Not Modified" response if client supports it
// Implementation based on https://stackoverflow.com/a/10847262
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
$stime = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
if ($mtime <= $stime) { // Cached data is older or same
if ($mtime <= $stime) {
// Cached data is older or same
header('Last-Modified: ' . gmdate('D, d M Y H:i:s ', $mtime) . 'GMT', true, 304);
exit;
return;
}
}
@ -125,27 +122,24 @@ class DisplayAction implements ActionInterface
if (isset($cached['items']) && isset($cached['extraInfos'])) {
foreach ($cached['items'] as $item) {
$items[] = new \FeedItem($item);
$items[] = new FeedItem($item);
}
$infos = $cached['extraInfos'];
}
} else { // Collect new data
} else {
// Collect new data
try {
$bridge->setDatas($bridge_params);
$bridge->collectData();
$items = $bridge->getItems();
// Transform "legacy" items to FeedItems if necessary.
// Remove this code when support for "legacy" items ends!
if (isset($items[0]) && is_array($items[0])) {
$feedItems = [];
foreach ($items as $item) {
$feedItems[] = new \FeedItem($item);
$feedItems[] = new FeedItem($item);
}
$items = $feedItems;
}
@ -158,18 +152,16 @@ class DisplayAction implements ActionInterface
} catch (\Throwable $e) {
error_log($e);
if (logBridgeError($bridge::NAME, $e->getCode()) >= Configuration::getConfig('error', 'report_limit')) {
$errorCount = logBridgeError($bridge::NAME, $e->getCode());
if ($errorCount >= Configuration::getConfig('error', 'report_limit')) {
if (Configuration::getConfig('error', 'output') === 'feed') {
$item = new \FeedItem();
$item = new FeedItem();
// Create "new" error message every 24 hours
$request['_error_time'] = urlencode((int)(time() / 86400));
$message = sprintf(
'Bridge returned error %s! (%s)',
$e->getCode(),
$request['_error_time']
);
$message = sprintf('Bridge returned error %s! (%s)', $e->getCode(), $request['_error_time']);
$item->setTitle($message);
$item->setURI(
@ -205,8 +197,8 @@ class DisplayAction implements ActionInterface
}
$cache->saveData([
'items' => array_map(function ($i) {
return $i->toArray();
'items' => array_map(function (FeedItem $item) {
return $item->toArray();
}, $items),
'extraInfos' => $infos
]);