mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-11 09:34:26 +02:00
Merge pull request #7018 from nupplaphil/feature/6245-Block_shell
New Command "BlockedServers"
This commit is contained in:
Hypolite Petovan
GitHub
commit
e9c230e109
5 changed files with 594 additions and 28 deletions
|
|
@ -13,26 +13,6 @@ class Console extends \Asika\SimpleConsole\Console
|
|||
protected $helpOptions = [];
|
||||
protected $customHelpOptions = ['h', 'help', '?'];
|
||||
|
||||
protected $subConsoles = [
|
||||
'cache' => __NAMESPACE__ . '\Console\Cache',
|
||||
'config' => __NAMESPACE__ . '\Console\Config',
|
||||
'createdoxygen' => __NAMESPACE__ . '\Console\CreateDoxygen',
|
||||
'docbloxerrorchecker' => __NAMESPACE__ . '\Console\DocBloxErrorChecker',
|
||||
'dbstructure' => __NAMESPACE__ . '\Console\DatabaseStructure',
|
||||
'extract' => __NAMESPACE__ . '\Console\Extract',
|
||||
'globalcommunityblock' => __NAMESPACE__ . '\Console\GlobalCommunityBlock',
|
||||
'globalcommunitysilence' => __NAMESPACE__ . '\Console\GlobalCommunitySilence',
|
||||
'archivecontact' => __NAMESPACE__ . '\Console\ArchiveContact',
|
||||
'autoinstall' => __NAMESPACE__ . '\Console\AutomaticInstallation',
|
||||
'maintenance' => __NAMESPACE__ . '\Console\Maintenance',
|
||||
'newpassword' => __NAMESPACE__ . '\Console\NewPassword',
|
||||
'php2po' => __NAMESPACE__ . '\Console\PhpToPo',
|
||||
'po2php' => __NAMESPACE__ . '\Console\PoToPhp',
|
||||
'typo' => __NAMESPACE__ . '\Console\Typo',
|
||||
'postupdate' => __NAMESPACE__ . '\Console\PostUpdate',
|
||||
'storage' => __NAMESPACE__ . '\Console\Storage',
|
||||
];
|
||||
|
||||
protected function getHelp()
|
||||
{
|
||||
$help = <<<HELP
|
||||
|
|
@ -56,6 +36,7 @@ Commands:
|
|||
po2php Generate a strings.php file from a messages.po file
|
||||
typo Checks for parse errors in Friendica files
|
||||
postupdate Execute pending post update scripts (can last days)
|
||||
serverblock Manage blocked servers
|
||||
storage Manage storage backend
|
||||
|
||||
Options:
|
||||
|
|
@ -65,6 +46,27 @@ HELP;
|
|||
return $help;
|
||||
}
|
||||
|
||||
protected $subConsoles = [
|
||||
'cache' => __NAMESPACE__ . '\Console\Cache',
|
||||
'config' => __NAMESPACE__ . '\Console\Config',
|
||||
'createdoxygen' => __NAMESPACE__ . '\Console\CreateDoxygen',
|
||||
'docbloxerrorchecker' => __NAMESPACE__ . '\Console\DocBloxErrorChecker',
|
||||
'dbstructure' => __NAMESPACE__ . '\Console\DatabaseStructure',
|
||||
'extract' => __NAMESPACE__ . '\Console\Extract',
|
||||
'globalcommunityblock' => __NAMESPACE__ . '\Console\GlobalCommunityBlock',
|
||||
'globalcommunitysilence' => __NAMESPACE__ . '\Console\GlobalCommunitySilence',
|
||||
'archivecontact' => __NAMESPACE__ . '\Console\ArchiveContact',
|
||||
'autoinstall' => __NAMESPACE__ . '\Console\AutomaticInstallation',
|
||||
'maintenance' => __NAMESPACE__ . '\Console\Maintenance',
|
||||
'newpassword' => __NAMESPACE__ . '\Console\NewPassword',
|
||||
'php2po' => __NAMESPACE__ . '\Console\PhpToPo',
|
||||
'po2php' => __NAMESPACE__ . '\Console\PoToPhp',
|
||||
'typo' => __NAMESPACE__ . '\Console\Typo',
|
||||
'postupdate' => __NAMESPACE__ . '\Console\PostUpdate',
|
||||
'serverblock' => __NAMESPACE__ . '\Console\ServerBlock',
|
||||
'storage' => __NAMESPACE__ . '\Console\Storage',
|
||||
];
|
||||
|
||||
protected function doExecute()
|
||||
{
|
||||
if ($this->getOption('v')) {
|
||||
|
|
|
|||
171
src/Core/Console/ServerBlock.php
Normal file
171
src/Core/Console/ServerBlock.php
Normal file
|
|
@ -0,0 +1,171 @@
|
|||
<?php
|
||||
|
||||
namespace Friendica\Core\Console;
|
||||
|
||||
use Asika\SimpleConsole\CommandArgsException;
|
||||
use Asika\SimpleConsole\Console;
|
||||
use Console_Table;
|
||||
use Friendica\BaseObject;
|
||||
use Friendica\Core\Config\Configuration;
|
||||
|
||||
/**
|
||||
* @brief Manage blocked servers
|
||||
*
|
||||
* With this tool, you can list the current blocked servers
|
||||
* or you can add / remove a blocked server from the list
|
||||
*/
|
||||
class ServerBlock extends Console
|
||||
{
|
||||
const DEFAULT_REASON = 'blocked';
|
||||
|
||||
protected $helpOptions = ['h', 'help', '?'];
|
||||
|
||||
protected function getHelp()
|
||||
{
|
||||
$help = <<<HELP
|
||||
console serverblock - Manage blocked servers
|
||||
Usage
|
||||
bin/console serverblock [-h|--help|-?] [-v]
|
||||
bin/console serverblock add <server> <reason> [-h|--help|-?] [-v]
|
||||
bin/console serverblock remove <server> [-h|--help|-?] [-v]
|
||||
|
||||
Description
|
||||
With this tool, you can list the current blocked servers
|
||||
or you can add / remove a blocked server from the list
|
||||
|
||||
Options
|
||||
-h|--help|-? Show help information
|
||||
-v Show more debug information.
|
||||
HELP;
|
||||
return $help;
|
||||
}
|
||||
|
||||
protected function doExecute()
|
||||
{
|
||||
$a = BaseObject::getApp();
|
||||
|
||||
if (count($this->args) == 0) {
|
||||
$this->printBlockedServers($a->getConfig());
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch ($this->getArgument(0)) {
|
||||
case 'add':
|
||||
return $this->addBlockedServer($a->getConfig());
|
||||
case 'remove':
|
||||
return $this->removeBlockedServer($a->getConfig());
|
||||
default:
|
||||
throw new CommandArgsException('Unknown command.');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Prints the whole list of blocked domains including the reason
|
||||
*
|
||||
* @param Configuration $config
|
||||
*/
|
||||
private function printBlockedServers(Configuration $config)
|
||||
{
|
||||
$table = new Console_Table();
|
||||
$table->setHeaders(['Domain', 'Reason']);
|
||||
$blocklist = $config->get('system', 'blocklist');
|
||||
foreach ($blocklist as $domain) {
|
||||
$table->addRow($domain);
|
||||
}
|
||||
$this->out($table->getTable());
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a server to the blocked list
|
||||
*
|
||||
* @param Configuration $config
|
||||
*
|
||||
* @return int The return code (0 = success, 1 = failed)
|
||||
*/
|
||||
private function addBlockedServer(Configuration $config)
|
||||
{
|
||||
if (count($this->args) < 2 || count($this->args) > 3) {
|
||||
throw new CommandArgsException('Add needs a domain and optional a reason.');
|
||||
}
|
||||
|
||||
$domain = $this->getArgument(1);
|
||||
$reason = (count($this->args) === 3) ? $this->getArgument(2) : self::DEFAULT_REASON;
|
||||
|
||||
$update = false;
|
||||
|
||||
$currBlocklist = $config->get('system', 'blocklist');
|
||||
$newBlockList = [];
|
||||
foreach ($currBlocklist as $blocked) {
|
||||
if ($blocked['domain'] === $domain) {
|
||||
$update = true;
|
||||
$newBlockList[] = [
|
||||
'domain' => $domain,
|
||||
'reason' => $reason,
|
||||
];
|
||||
} else {
|
||||
$newBlockList[] = $blocked;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$update) {
|
||||
$newBlockList[] = [
|
||||
'domain' => $domain,
|
||||
'reason' => $reason,
|
||||
];
|
||||
}
|
||||
|
||||
if ($config->set('system', 'blocklist', $newBlockList)) {
|
||||
if ($update) {
|
||||
$this->out(sprintf("The domain '%s' is now updated. (Reason: '%s')", $domain, $reason));
|
||||
} else {
|
||||
$this->out(sprintf("The domain '%s' is now blocked. (Reason: '%s')", $domain, $reason));
|
||||
}
|
||||
return 0;
|
||||
} else {
|
||||
$this->out(sprintf("Couldn't save '%s' as blocked server", $domain));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes a server from the blocked list
|
||||
*
|
||||
* @param Configuration $config
|
||||
*
|
||||
* @return int The return code (0 = success, 1 = failed)
|
||||
*/
|
||||
private function removeBlockedServer(Configuration $config)
|
||||
{
|
||||
if (count($this->args) !== 2) {
|
||||
throw new CommandArgsException('Remove needs a second parameter.');
|
||||
}
|
||||
|
||||
$domain = $this->getArgument(1);
|
||||
|
||||
$found = false;
|
||||
|
||||
$currBlocklist = $config->get('system', 'blocklist');
|
||||
$newBlockList = [];
|
||||
foreach ($currBlocklist as $blocked) {
|
||||
if ($blocked['domain'] === $domain) {
|
||||
$found = true;
|
||||
} else {
|
||||
$newBlockList[] = $blocked;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$found) {
|
||||
$this->out(sprintf("The domain '%s' is not blocked.", $domain));
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ($config->set('system', 'blocklist', $newBlockList)) {
|
||||
$this->out(sprintf("The domain '%s' is not more blocked", $domain));
|
||||
return 0;
|
||||
} else {
|
||||
$this->out(sprintf("Couldn't remove '%s' from blocked servers", $domain));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue