mirror/php-rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-07-29 21:00:14 +02:00
Code Issues Releases Wiki Activity

feat: sanitize root folder also in php error messages (#3262)

Browse Source
This commit is contained in:
Dag
2023-03-06 21:47:25 +01:00
committed by GitHub
parent a01c1f6ab0
commit 007f2b2d8a
5 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/utils.php
View File

@@ -50,8 +50,8 @@ function create_sane_exception_message(\Throwable $e): string
return sprintf(
'%s: %s in %s line %s',
get_class($e),
$e->getMessage(),
trim_path_prefix($e->getFile()),
sanitize_root($e->getMessage()),
sanitize_root($e->getFile()),
$e->getLine()
);
}
@@ -74,7 +74,7 @@ function trace_from_exception(\Throwable $e): array
$trace = [];
foreach ($frames as $frame) {
$trace[] = [
'file' => trim_path_prefix($frame['file'] ?? ''),
'file' => sanitize_root($frame['file'] ?? ''),
'line' => $frame['line'] ?? null,
'class' => $frame['class'] ?? null,
'type' => $frame['type'] ?? null,
@@ -121,9 +121,17 @@ function frame_to_call_point(array $frame): string
*
* Example: "/home/davidsf/rss-bridge/index.php" => "index.php"
*/
function trim_path_prefix(string $filePath): string
function sanitize_root(string $filePath): string
{
return mb_substr($filePath, mb_strlen(dirname(__DIR__)) + 1);
// Root folder of the project e.g. /home/satoshi/repos/rss-bridge
$root = dirname(__DIR__);
return _sanitize_path_name($filePath, $root);
}
function _sanitize_path_name(string $s, string $pathName): string
{
// Remove all occurrences of $pathName in the string
return str_replace(["$pathName/", $pathName], '', $s);
}
/**