Continued:

- someone removed these checks, if the GServer's url is blocked, flooders like
  activitypub-troll.cf will then be able to flood your gserver table again

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 0c839a78e186c8cddb4de0cbbb63061acfe60f58..8295a02ea538a2d8fe0b12c5e00e38c870b574ca 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -471,6 +471,14 @@ class GServer
                        return;
                }
 
+               if (Network::isUrlBlocked($url)) {
+                       Logger::info('Server domain is blocked', ['url' => $url]);
+                       return;
+               } elseif (Network::isUrlBlocked($nurl)) {
+                       Logger::info('Server domain is blocked', ['nurl' => $nurl]);
+                       return;
+               }
+
                self::insert(['url' => $url, 'nurl' => $nurl,
                        'network' => Protocol::PHANTOM, 'created' => DateTimeFormat::utcNow(),
                        'failed' => true, 'last_failure' => DateTimeFormat::utcNow()]);
@@ -561,6 +569,9 @@ class GServer
                                self::detect($url, $network, $only_nodeinfo);
                        }
                        return false;
+               } elseif (Network::isUrlBlocked($url)) {
+                       Logger::info('Server domain is blocked', ['url' => $url]);
+                       return false;
                }
 
                $valid_url = Network::isUrlValid($url);