Allow to reject specific languages on receiving posts via the relay

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 79fe4c02ee6f01da6d1e1b1070051b9ebf944c12..3fb8e52a508723f4638c90f603c770cfc32e9059 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1870,23 +1870,33 @@ class Item
                        return '';
                }
 
+               $languages = self::getLanguageArray(trim($item['title'] . "\n" . $item['body']));
+               if (empty($languages)) {
+                       return '';
+               }
+
+               return json_encode($languages);
+       }
+
+       public static function getLanguageArray(string $body): array
+       {
                // Convert attachments to links
-               $naked_body = BBCode::removeAttachment($item['body']);
+               $naked_body = BBCode::removeAttachment($body);
                if (empty($naked_body)) {
-                       return '';
+                       return [];
                }
 
                // Remove links and pictures
                $naked_body = BBCode::removeLinks($naked_body);
 
                // Convert the title and the body to plain text
-               $naked_body = trim($item['title'] . "\n" . BBCode::toPlaintext($naked_body));
+               $naked_body = BBCode::toPlaintext($naked_body);
 
                // Remove possibly remaining links
                $naked_body = preg_replace(Strings::autoLinkRegEx(), '', $naked_body);
 
                if (empty($naked_body)) {
-                       return '';
+                       return [];
                }
 
                $naked_body = self::getDominantLanguage($naked_body);
@@ -1898,12 +1908,7 @@ class Item
                $availableLanguages['fa'] = 'fa';
 
                $ld = new Language(array_keys($availableLanguages));
-               $languages = $ld->detect($naked_body)->limit(0, 3)->close();
-               if (is_array($languages)) {
-                       return json_encode($languages);
-               }
-
-               return '';
+               return $ld->detect($naked_body)->limit(0, 3)->close() ?: [];
        }
 
        /**

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index e16e2e9539e65a56e52b2f1da37e99af5e7950b3..7988d97f60ea8772b39b0f24cb1bfafcbc93464f 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -91,7 +91,7 @@ class Processor
         * @param string $body
         * @return string
         */
-       protected static function normalizeMentionLinks(string $body): string
+       public static function normalizeMentionLinks(string $body): string
        {
                return preg_replace('%\[url=([^\[\]]*)]([#@!])(.*?)\[/url]%ism', '$2[url=$1]$3[/url]', $body);
        }

diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php
index 7414c29315e5981c479804708fa5065a7158c0fd..f427d85b67efb16e07d4bc81f5ed14978a88c0cf 100644 (file)
--- a/src/Protocol/Relay.php
+++ b/src/Protocol/Relay.php
@@ -29,6 +29,7 @@ use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\GServer;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Search;
 use Friendica\Model\Tag;
@@ -76,6 +77,8 @@ class Relay
                        return false;
                }
 
+               $body = ActivityPub\Processor::normalizeMentionLinks($body);
+
                $systemTags = [];
                $userTags = [];
                $denyTags = [];
@@ -125,6 +128,25 @@ class Relay
                        }
                }
 
+               $languages = [];
+               foreach (Item::getLanguageArray($body) as $language => $reliability) {
+                       if ($reliability > 0) {
+                               $languages[] = $language;
+                       }
+               }
+
+               Logger::debug('Got languages', ['languages' => $languages, 'body' => $body]);
+
+               if (!empty($languages)) {
+                       if (in_array($languages[0], $config->get('system', 'relay_deny_languages'))) {
+                               Logger::info('Unwanted language found - rejected', ['language' => $languages[0], 'network' => $network, 'url' => $url]);
+                               return false;
+                       }
+               } elseif ($config->get('system', 'relay_deny_undetected_language')) {
+                       Logger::info('Undetected language found - rejected', ['body' => $body, 'network' => $network, 'url' => $url]);
+                       return false;
+               }
+
                if ($scope == self::SCOPE_ALL) {
                        Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url]);
                        return true;

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index f4e48504875189e6b738b23c7e35ebf3f59abec2..a98e728928765fe6a61fd30d493ec5abecf20293 100644 (file)
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -152,13 +152,13 @@ class Profiler implements ContainerInterface
         * Saves a timestamp for a value - f.e. a call
         * Necessary for profiling Friendica
         *
-        * @param int    $timestamp the Timestamp
+        * @param float  $timestamp the Timestamp
         * @param string $value     A value to profile
         * @param string $callstack A callstack string, generated if absent
         *
         * @return void
         */
-       public function saveTimestamp(int $timestamp, string $value, string $callstack = '')
+       public function saveTimestamp(float $timestamp, string $value, string $callstack = '')
        {
                if (!$this->enabled) {
                        return;
@@ -358,9 +358,9 @@ class Profiler implements ContainerInterface
         * @throws NotFoundExceptionInterface  No entry was found for **this** identifier.
         * @throws ContainerExceptionInterface Error while retrieving the entry.
         *
-        * @return int Entry.
+        * @return float Entry.
         */
-       public function get(string $id): int
+       public function get(string $id): float
        {
                if (!$this->has($id)) {
                        return 0;

diff --git a/static/defaults.config.php b/static/defaults.config.php
index adffad89674e36f4672cfc59d234e8597da6cfeb..285e544c87ee0d7f63fb37a57e23ae2dcc31096b 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -525,6 +525,14 @@ return [
                // The authentication password for the redis database
                'redis_password' => null,
 
+               // relay_deny_languages (Array)
+               // Array of languages that are rejected.
+               'relay_deny_languages' => [],
+
+               // relay_deny_undetected_language (Boolean)
+               // Deny undetected languages
+               'relay_deny_undetected_language' => false,
+
                // session_handler (database|cache|native)
                // Whether to use Cache to store session data or to use PHP native session storage.
                'session_handler' => 'database',