keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue 10747: Improved check for blocked domains

Browse source
This commit is contained in:
Michael 2021-10-02 10:25:50 +00:00
parent ac49a02c36
commit f1e2ceb32c
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Model/APContact.php
View file

@ -119,7 +119,8 @@ class APContact
*/ */
public static function getByURL($url, $update = null) public static function getByURL($url, $update = null)
{ {
if (empty($url)) { if (empty($url) || Network::isUrlBlocked($url)) {
Logger::info('Domain is blocked', ['url' => $url]);
return []; return [];
} }

10
src/Network/Probe.php
View file

@ -231,6 +231,11 @@ class Probe
} }
} }
if (Network::isUrlBlocked($host_url)) {
Logger::info('Domain is blocked', ['url' => $host]);
return [];
}
self::$baseurl = $host_url; self::$baseurl = $host_url;
Logger::info('Probing successful', ['host' => $host]); Logger::info('Probing successful', ['host' => $host]);
@ -625,6 +630,11 @@ class Probe
*/ */
private static function getWebfinger(string $template, string $type, string $uri, string $addr) private static function getWebfinger(string $template, string $type, string $uri, string $addr)
{ {
if (Network::isUrlBlocked($template)) {
Logger::info('Domain is blocked', ['url' => $template]);
return [];
}
// First try the address because this is the primary purpose of webfinger // First try the address because this is the primary purpose of webfinger
if (!empty($addr)) { if (!empty($addr)) {
$detected = $addr; $detected = $addr;