Add download feature for domain block list

- Add new /blocklist/domain/download route
- Add link on /friendica page

diff --git a/src/Module/Blocklist/Domain/Download.php b/src/Module/Blocklist/Domain/Download.php
new file mode 100644 (file)
index 0000000..db7437d
--- /dev/null
+++ b/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();
+       }
+}

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 6b5e05c8b36cf7d3f521e4b35762923742f49ff2..012f65ef69c826f4a2fc3a6b27b015e0f7504933 100644 (file)
--- a/src/Module/Friendica.php
+++ b/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;

diff --git a/static/routes.config.php b/static/routes.config.php
index dac56a1255a36316a11db24b1900865ed62bbe1e..8c7a08758f5420f23b766693d393db4608bf2ea5 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -353,6 +353,9 @@ return [
        '/attach/{item:\d+}'   => [Module\Attach::class,       [R::GET]],
        '/babel'               => [Module\Debug\Babel::class,  [R::GET, R::POST]],
        '/debug/ap'            => [Module\Debug\ActivityPubConversion::class,  [R::GET, R::POST]],
+
+       '/blocklist/domain/download' => [Module\Blocklist\Domain\Download::class, [R::GET]],
+
        '/bookmarklet'         => [Module\Bookmarklet::class,  [R::GET]],
 
        '/community[/{content}]' => [Module\Conversation\Community::class, [R::GET]],

diff --git a/view/templates/friendica.tpl b/view/templates/friendica.tpl
index 25f1d2b64b415f67c5e30801646ede893ed444ad..a5c765f96e9532f13b094620fc72850f6553422f 100644 (file)
--- a/view/templates/friendica.tpl
+++ b/view/templates/friendica.tpl
@@ -1,28 +1,22 @@
-<div id="friendica" class="generic-page-wrapper">
+<div id="friendica">
        <h1>Friendica</h1>
-       <br>
        <p>{{$about nofilter}}</p>
-       <br>
        <p>{{$friendica nofilter}}</p>
-       <br>
        <p>{{$bugs nofilter}}</p>
-       <br>
        <p>{{$info nofilter}}</p>
-       <br>
 
        <p>{{$visible_addons.title nofilter}}</p>
-       {{if $visible_addons.list}}
+{{if $visible_addons.list}}
        <div style="margin-left: 25px; margin-right: 25px; margin-bottom: 25px;">{{$visible_addons.list}}</div>
-       {{/if}}
+{{/if}}
 
-       {{if $tos}}
+{{if $tos}}
        <p>{{$tos nofilter}}</p>
-       {{/if}}
+{{/if}}
 
-       {{if $block_list}}
+{{if $block_list}}
        <div id="about_blocklist">
                <p>{{$block_list.title}}</p>
-               <br>
                <table class="table">
                        <thead>
                                <tr>
@@ -39,9 +33,9 @@
                        {{/foreach}}
                        </tbody>
                </table>
+               <p><a href="/blocklist/domain/download"><i class="fa fa-download"></i> {{$block_list.download}}</a></p>
        </div>
+{{/if}}
 
-       {{/if}}
-
-{{$hooked nofilter}}
+       {{$hooked nofilter}}
 </div>