clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12117 from MrPetovan/bug/12113-malformed-url-containsLink 

Suppress InvalidArgument exceptions handling URLs in Model\Item::containsLink
This commit is contained in:
Michael Vogel 2022-11-06 08:43:14 +01:00 committed by GitHub
parent ea49ab6e04 3e33ec0c0f
commit eecd5020ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Model/Item.php
View File

@ -3094,11 +3094,20 @@ class Item
{ {
// Make sure that for example site parameters aren't used when testing if the link is contained in the body // Make sure that for example site parameters aren't used when testing if the link is contained in the body
$urlparts = parse_url($url); $urlparts = parse_url($url);
if (!empty($urlparts)) { if (empty($urlparts)) {
unset($urlparts['query']); return false;
unset($urlparts['fragment']); }
unset($urlparts['query']);
unset($urlparts['fragment']);
try {
$url = (string)Uri::fromParts($urlparts); $url = (string)Uri::fromParts($urlparts);
} else { } catch (\InvalidArgumentException $e) {
DI::logger()->notice('Invalid URL', ['$url' => $url, '$urlparts' => $urlparts]);
/* See https://github.com/friendica/friendica/issues/12113
* Malformed URLs will result in a Fatal Error
*/
return false; return false;
} }
@ -3111,12 +3120,14 @@ class Item
if (strpos($body, $url)) { if (strpos($body, $url)) {
return true; return true;
} }
foreach ([0, 1, 2] as $size) { foreach ([0, 1, 2] as $size) {
if (preg_match('#/photo/.*-' . $size . '\.#ism', $url) && if (preg_match('#/photo/.*-' . $size . '\.#ism', $url) &&
strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $body), $url)) { strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $body), $url)) {
return true; return true;
} }
} }
return false; return false;
} }