Merge pull request #10793 from annando/issue-10747
Issue 10747: Improved check for blocked domains
This commit is contained in:
commit
ef7c543634
2 changed files with 12 additions and 1 deletions
|
@ -119,7 +119,8 @@ class APContact
|
|||
*/
|
||||
public static function getByURL($url, $update = null)
|
||||
{
|
||||
if (empty($url)) {
|
||||
if (empty($url) || Network::isUrlBlocked($url)) {
|
||||
Logger::info('Domain is blocked', ['url' => $url]);
|
||||
return [];
|
||||
}
|
||||
|
||||
|
|
|
@ -231,6 +231,11 @@ class Probe
|
|||
}
|
||||
}
|
||||
|
||||
if (Network::isUrlBlocked($host_url)) {
|
||||
Logger::info('Domain is blocked', ['url' => $host]);
|
||||
return [];
|
||||
}
|
||||
|
||||
self::$baseurl = $host_url;
|
||||
|
||||
Logger::info('Probing successful', ['host' => $host]);
|
||||
|
@ -625,6 +630,11 @@ class Probe
|
|||
*/
|
||||
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
|
||||
if (!empty($addr)) {
|
||||
$detected = $addr;
|
||||
|
|
Loading…
Reference in a new issue