Merge remote-tracking branch 'upstream/develop' into untrusted

src/Module/Admin/Blocklist/Server/Import.php

@@ -0,0 +1,163 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Admin\Blocklist\Server;
+
+use Friendica\App;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Module\Response;
+use Friendica\Navigation\SystemMessages;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+class Import extends \Friendica\Module\BaseAdmin
+{
+	/** @var IManageConfigValues */
+	private $config;
+
+	/** @var SystemMessages */
+	private $sysmsg;
+
+	/** @var array of blocked server domain patterns */
+	private $blocklist = [];
+
+	public function __construct(IManageConfigValues $config, SystemMessages $sysmsg, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->config = $config;
+		$this->sysmsg = $sysmsg;
+	}
+
+	/**
+	 * @param array $request
+	 * @return void
+	 * @throws \Friendica\Network\HTTPException\ForbiddenException
+	 * @throws \Friendica\Network\HTTPException\FoundException
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Friendica\Network\HTTPException\MovedPermanentlyException
+	 * @throws \Friendica\Network\HTTPException\TemporaryRedirectException
+	 */
+	protected function post(array $request = [])
+	{
+		self::checkAdminAccess();
+
+		if (!isset($_POST['page_blocklist_upload']) && !isset($_POST['page_blocklist_import'])) {
+			return;
+		}
+
+		self::checkFormSecurityTokenRedirectOnError('/admin/blocklist/server/import', 'admin_blocklist_import');
+
+		if (isset($_POST['page_blocklist_upload'])) {
+			if (($fp = fopen($_FILES['listfile']['tmp_name'], 'r')) !== false) {
+				$blocklist = [];
+				while (($data = fgetcsv($fp, 1000, ',')) !== false) {
+					$domain = $data[0];
+					if (count($data) == 0) {
+						$reason = 'blocked';
+					} else {
+						$reason = $data[1];
+					}
+
+					$blocklist[] = [
+						'domain' => $domain,
+						'reason' => $reason
+					];
+				}
+			} else {
+				$this->sysmsg->addNotice($this->l10n->t('Error importing pattern file'));
+				return;
+			}
+
+			$this->blocklist = $blocklist;
+
+			return;
+		}
+
+		if (isset($_POST['page_blocklist_import'])) {
+			$blocklist = json_decode($_POST['blocklist'], true);
+			if ($blocklist === null) {
+				$this->sysmsg->addNotice($this->l10n->t('Error importing pattern file'));
+				return;
+			}
+
+			if (($_POST['mode'] ?? 'append') == 'replace') {
+				$this->config->set('system', 'blocklist', $blocklist);
+				$this->sysmsg->addNotice($this->l10n->t('Local blocklist replaced with the provided file.'));
+			} else {
+				$localBlocklist = $this->config->get('system', 'blocklist', []);
+				$localPatterns  = array_column($localBlocklist, 'domain');
+
+				$importedPatterns = array_column($blocklist, 'domain');
+
+				$patternsToAppend = array_diff($importedPatterns, $localPatterns);
+
+				if (count($patternsToAppend)) {
+					foreach (array_keys($patternsToAppend) as $key) {
+						$localBlocklist[] = $blocklist[$key];
+					}
+
+					$this->config->set('system', 'blocklist', $localBlocklist);
+					$this->sysmsg->addNotice($this->l10n->tt('%d pattern was added to the local blocklist.', '%d patterns were added to the local blocklist.', count($patternsToAppend)));
+				} else {
+					$this->sysmsg->addNotice($this->l10n->t('No pattern was added to the local blocklist.'));
+				}
+			}
+
+			$this->baseUrl->redirect('/admin/blocklist/server');
+		}
+	}
+
+	/**
+	 * @param array $request
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\ServiceUnavailableException
+	 */
+	protected function content(array $request = []): string
+	{
+		parent::content();
+
+		$t = Renderer::getMarkupTemplate('admin/blocklist/server/import.tpl');
+		return Renderer::replaceMacros($t, [
+			'$l10n' => [
+				'return_list'    => $this->l10n->t('← Return to the list'),
+				'title'          => $this->l10n->t('Administration'),
+				'page'           => $this->l10n->t('Import a Server Domain Pattern Blocklist'),
+				'download'       => $this->l10n->t('<p>This file can be downloaded from the <code>/friendica</code> path of any Friendica server.</p>'),
+				'upload'         => $this->l10n->t('Upload file'),
+				'patterns'       => $this->l10n->t('Patterns to import'),
+				'domain_pattern' => $this->l10n->t('Domain Pattern'),
+				'block_reason'   => $this->l10n->t('Block Reason'),
+				'mode'           => $this->l10n->t('Import Mode'),
+				'import'         => $this->l10n->t('Import Patterns'),
+				'pattern_count'  => $this->l10n->tt('%d total pattern', '%d total patterns', count($this->blocklist)),
+			],
+			'$listfile'            => ['listfile', $this->l10n->t('Server domain pattern blocklist CSV file'), '', '', $this->l10n->t('Required'), '', 'file'],
+			'$mode_append'         => ['mode', $this->l10n->t('Append'), 'append', $this->l10n->t('Imports patterns from the file that weren\'t already existing in the current blocklist.'), 'checked="checked"'],
+			'$mode_replace'        => ['mode', $this->l10n->t('Replace'), 'replace', $this->l10n->t('Replaces the current blocklist by the imported patterns.')],
+			'$blocklist'           => $this->blocklist,
+			'$baseurl'             => $this->baseUrl->get(true),
+			'$form_security_token' => self::getFormSecurityToken('admin_blocklist_import')
+		]);
+	}
+}

src/Module/Admin/Blocklist/Server/Index.php

@@ -84,8 +84,10 @@ class Index extends BaseAdmin
 	<li><code>*</code>: Any number of characters</li>
 	<li><code>?</code>: Any single character</li>
 </ul>'),
+				'importtitle'    => DI::l10n()->t('Import server domain pattern blocklist'),
 				'addtitle'       => DI::l10n()->t('Add new entry to the blocklist'),
-				'submit'         => DI::l10n()->t('Check pattern'),
+				'importsubmit'   => DI::l10n()->t('Upload file'),
+				'addsubmit'      => DI::l10n()->t('Check pattern'),
 				'savechanges'    => DI::l10n()->t('Save changes to the blocklist'),
 				'currenttitle'   => DI::l10n()->t('Current Entries in the Blocklist'),
 				'thurl'          => DI::l10n()->t('Blocked server domain pattern'),
@@ -93,10 +95,12 @@ class Index extends BaseAdmin
 				'delentry'       => DI::l10n()->t('Delete entry from the blocklist'),
 				'confirm_delete' => DI::l10n()->t('Delete entry from the blocklist?'),
 			],
+			'$listfile'            => ['listfile', DI::l10n()->t('Server domain pattern blocklist CSV file'), '', '', DI::l10n()->t('Required'), '', 'file'],
 			'$newdomain'           => ['pattern', DI::l10n()->t('Server Domain Pattern'), '', DI::l10n()->t('The domain pattern of the new server to add to the blocklist. Do not include the protocol.'), DI::l10n()->t('Required'), '', ''],
 			'$entries'             => $blocklistform,
 			'$baseurl'             => DI::baseUrl()->get(true),
-			'$form_security_token' => self::getFormSecurityToken('admin_blocklist')
+			'$form_security_token' => self::getFormSecurityToken('admin_blocklist'),
+			'$form_security_token_import' => self::getFormSecurityToken('admin_blocklist_import'),
 		]);
 	}
 }

src/Module/Blocklist/Domain/Download.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Blocklist\Domain;
+
+use Friendica\App;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Module\Response;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+class Download extends \Friendica\BaseModule
+{
+	/** @var IManageConfigValues */
+	private $config;
+
+	public function __construct(IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->config = $config;
+	}
+
+	protected function rawContent(array $request = [])
+	{
+		$blocklist = $this->config->get('system', 'blocklist');
+
+		$blocklistJson = json_encode($blocklist, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+
+		$hash = md5($blocklistJson);
+
+		$etag = 'W/"' . $hash . '"';
+
+		if (trim($_SERVER['HTTP_IF_NONE_MATCH'] ?? '') == $etag) {
+			header("HTTP/1.1 304 Not Modified");
+		}
+
+		header('Content-Type: text/csv');
+		header('Content-Transfer-Encoding: Binary');
+		header('Content-disposition: attachment; filename="' . $this->baseUrl->getHostname() . '_domain_blocklist_' . substr($hash, 0, 6) . '.csv"');
+		header("Etag: $etag");
+
+		$fp = fopen('php://output', 'w');
+		foreach ($blocklist as $domain) {
+			fputcsv($fp, $domain);
+		}
+		fclose($fp);
+
+		System::exit();
+	}
+}

src/Module/DFRN/Notify.php

@@ -59,13 +59,13 @@ class Notify extends BaseModule
 		}
 	}
 
-	private static function dispatchPublic(string $postdata)
+	private static function dispatchPublic(string $postdata): bool
 	{
 		$msg = Diaspora::decodeRaw($postdata, '', true);
 		if (!is_array($msg)) {
 			// We have to fail silently to be able to hand it over to the salmon parser
 			Logger::warning('Diaspora::decodeRaw() has failed for some reason.');
-			return;
+			return false;
 		}
 
 		// Fetch the corresponding public contact
@@ -87,6 +87,8 @@ class Notify extends BaseModule
 		// Now we should be able to import it
 		$ret = DFRN::import($msg['message'], $importer, Conversation::PARCEL_DIASPORA_DFRN, Conversation::RELAY);
 		System::xmlExit($ret, 'Done');
+
+		return true;
 	}
 
 	private static function dispatchPrivate(array $user, string $postdata)

src/Module/Friendica.php

@@ -76,12 +76,13 @@ class Friendica extends BaseModule
 
 		if (!empty($blockList)) {
 			$blocked = [
-				'title'  => DI::l10n()->t('On this server the following remote servers are blocked.'),
-				'header' => [
+				'title'    => DI::l10n()->t('On this server the following remote servers are blocked.'),
+				'header'   => [
 					DI::l10n()->t('Blocked domain'),
 					DI::l10n()->t('Reason for the block'),
 				],
-				'list'   => $blockList,
+				'download' => DI::l10n()->t('Download this list in CSV format'),
+				'list'     => $blockList,
 			];
 		} else {
 			$blocked = null;

src/Module/Notifications/Ping.php

@@ -42,6 +42,7 @@ use Friendica\Navigation\Notifications\Exception\NoMessageException;
 use Friendica\Navigation\Notifications\Factory;
 use Friendica\Navigation\Notifications\Repository;
 use Friendica\Navigation\Notifications\ValueObject;
+use Friendica\Navigation\SystemMessages;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
@@ -50,6 +51,8 @@ use Psr\Log\LoggerInterface;
 
 class Ping extends BaseModule
 {
+	/** @var SystemMessages */
+	private $systemMessages;
 	/** @var Repository\Notification */
 	private $notificationRepo;
 	/** @var Introduction */
@@ -57,10 +60,11 @@ class Ping extends BaseModule
 	/** @var Factory\FormattedNavNotification */
 	private $formattedNavNotification;
 
-	public function __construct(Repository\Notification $notificationRepo, Introduction $introductionRepo, Factory\FormattedNavNotification $formattedNavNotification, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	public function __construct(SystemMessages $systemMessages, Repository\Notification $notificationRepo, Introduction $introductionRepo, Factory\FormattedNavNotification $formattedNavNotification, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
+		$this->systemMessages           = $systemMessages;
 		$this->notificationRepo         = $notificationRepo;
 		$this->introductionRepo         = $introductionRepo;
 		$this->formattedNavNotification = $formattedNavNotification;
@@ -256,19 +260,6 @@ class Ping extends BaseModule
 			usort($navNotifications, $sort_function);
 		}
 
-		$sysmsgs      = [];
-		$sysmsgs_info = [];
-
-		if (!empty($_SESSION['sysmsg'])) {
-			$sysmsgs = $_SESSION['sysmsg'];
-			unset($_SESSION['sysmsg']);
-		}
-
-		if (!empty($_SESSION['sysmsg_info'])) {
-			$sysmsgs_info = $_SESSION['sysmsg_info'];
-			unset($_SESSION['sysmsg_info']);
-		}
-
 		$notification_count = $sysnotify_count + $intro_count + $register_count;
 
 		$data             = [];
@@ -289,8 +280,8 @@ class Ping extends BaseModule
 		$data['notifications'] = $navNotifications;
 
 		$data['sysmsgs'] = [
-			'notice' => $sysmsgs,
-			'info'   => $sysmsgs_info
+			'notice' => $this->systemMessages->flushNotices(),
+			'info'   => $this->systemMessages->flushInfos(),
 		];
 
 		if (isset($_GET['callback'])) {