Detection of local requests

[friendica.git] / src / Worker / UpdateGServer.php

diff --git a/src/Worker/UpdateGServer.php b/src/Worker/UpdateGServer.php
index 60b8c417086c265d06be69b991d1daaa8612aa22..bc836253a5c110ab90fe74d351331718cc35d358 100644 (file)
--- a/src/Worker/UpdateGServer.php
+++ b/src/Worker/UpdateGServer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
+use Friendica\Database\DBA;
 use Friendica\Model\GServer;
 use Friendica\Util\Strings;
 
@@ -29,20 +30,33 @@ class UpdateGServer
 {
        /**
         * Update the given server
-        * @param string $server_url Server URL
+        * @param string  $server_url    Server URL
+        * @param boolean $only_nodeinfo Only use nodeinfo for server detection
         */
-       public static function execute($server_url)
+       public static function execute(string $server_url, bool $only_nodeinfo = false)
        {
                if (empty($server_url)) {
                        return;
                }
 
-               $server_url = filter_var($server_url, FILTER_SANITIZE_URL);
-               if (substr(Strings::normaliseLink($server_url), 0, 7) != 'http://') {
+               $filtered = filter_var($server_url, FILTER_SANITIZE_URL);
+               if (substr(Strings::normaliseLink($filtered), 0, 7) != 'http://') {
+                       GServer::setFailure($server_url);
                        return;
                }
 
-               $ret = GServer::check($server_url);
-               Logger::info('Updated gserver', ['url' => $server_url, 'result' => $ret]);
+               if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
+                       GServer::setFailure($server_url);
+                       return;
+               }
+
+               $cleaned = GServer::cleanURL($server_url);
+               if (($cleaned != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
+                       GServer::setFailure($server_url);
+                       return;
+               }
+
+               $ret = GServer::check($filtered, '', true, $only_nodeinfo);
+               Logger::info('Updated gserver', ['url' => $filtered, 'result' => $ret]);
        }
 }