Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix command bash injection using filename + add constant to disable commands

This commit is contained in:
osaajani 2020-06-17 19:08:11 +02:00
parent 3839742f58
commit 39caa92a62
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/internals/Command.php
View File

@ -78,6 +78,11 @@ namespace controllers\internals;
*/ */
public function analyze_and_process (int $id_user, string $message) public function analyze_and_process (int $id_user, string $message)
{ {
if (!ENABLE_COMMAND)
{
return false;
}
$extracted_command = []; $extracted_command = [];
$decode_message = json_decode(trim($message), true); $decode_message = json_decode(trim($message), true);
@ -127,7 +132,13 @@ namespace controllers\internals;
$decode_message['password'] = '******'; $decode_message['password'] = '******';
$updated_text = json_encode($decode_message); $updated_text = json_encode($decode_message);
$generated_command = PWD_SCRIPTS . '/' . $find_command['script']; $script = $find_command['script'];
while (str_replace('..', '', $script) !== $script)
{
$script = str_replace('..', '', $script);
}
$generated_command = PWD_SCRIPTS . '/' . escapeshellarg($script);
$args = $decode_message['args'] ?? ''; $args = $decode_message['args'] ?? '';
$generated_command .= ' ' . escapeshellcmd($args); $generated_command .= ' ' . escapeshellcmd($args);

8
controllers/publics/Command.php
View File

@ -27,6 +27,14 @@ namespace controllers\publics;
$this->internal_event = new \controllers\internals\Event($bdd); $this->internal_event = new \controllers\internals\Event($bdd);
\controllers\internals\Tool::verifyconnect(); \controllers\internals\Tool::verifyconnect();
if (!ENABLE_COMMAND)
{
\FlashMessage\FlashMessage::push('danger', 'Les commandes sont désactivées.');
$this->redirect(\descartes\Router::url('Dashboard', 'show'));
exit(0);
}
} }
/** /**

8
templates/incs/nav.php
View File

@ -80,9 +80,11 @@
</li> </li>
</ul> </ul>
</li> </li>
<li <?php echo $page == 'commands' ? 'class="active"' : ''; ?>> <?php if (ENABLE_COMMAND) { ?>
<a href="<?php echo \descartes\Router::url('Command', 'list'); ?>"><i class="fa fa-fw fa-terminal"></i> Commandes</a> <li <?php echo $page == 'commands' ? 'class="active"' : ''; ?>>
</li> <a href="<?php echo \descartes\Router::url('Command', 'list'); ?>"><i class="fa fa-fw fa-terminal"></i> Commandes</a>
</li>
<?php } ?>
<?php if ($_SESSION['user']['settings']['webhook'] ?? false) { ?> <?php if ($_SESSION['user']['settings']['webhook'] ?? false) { ?>
<li <?php echo $page == 'webhooks' ? 'class="active"' : ''; ?>> <li <?php echo $page == 'webhooks' ? 'class="active"' : ''; ?>>
<a href="<?php echo \descartes\Router::url('Webhook', 'list'); ?>"><i class="fa fa-fw fa-plug"></i> Webhooks</a> <a href="<?php echo \descartes\Router::url('Webhook', 'list'); ?>"><i class="fa fa-fw fa-plug"></i> Webhooks</a>