Add download feature for domain block list

- Add new /blocklist/domain/download route
- Add link on /friendica page
This commit is contained in:
Hypolite Petovan 2022-07-27 11:54:50 -04:00
parent 1b2182c43c
commit 7d7a5a65e9
4 changed files with 87 additions and 18 deletions

View file

@ -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();
}
}

View file

@ -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;

View file

@ -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]],

View file

@ -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>