feat: add defs list functions encoded

Author: marcocesarato

src/Console.php

@@ -178,14 +178,14 @@ public static function title($text, $char = ' ', $length = null)
     /**
      * Print progress.
      *
-     * @param $done
-     * @param $total
+     * @param float $done
+     * @param float $total
      * @param int $size
      */
     public static function progress($done, $total, $size = 30)
     {
         static $startTime;
-        if ($done > $total) {
+        if ($done > $total || $total === 0) {
             return;
         }
         if (empty($startTime)) {
@@ -534,6 +534,13 @@ public static function helplist($type = null)
             $functionsList = implode(self::eol(1) . '- ', Definitions::$FUNCTIONS);
             $list .= self::eol(1) . 'Functions:' . self::eol(1) . "- $functionsList";
         }
+        if (empty($type)) {
+            $list .= self::eol(1);
+        }
+        if (empty($type) || $type === 'functions-encoded') {
+            $functionsList = implode(self::eol(1) . '- ', Definitions::$FUNCTIONS_ENCODED);
+            $list .= self::eol(1) . 'Functions Encoded:' . self::eol(1) . "- $functionsList";
+        }
         self::displayTitle(trim($type . ' List'), 'black', 'cyan');
         self::displayLine($list, 2);
     }

src/Scanner.php

@@ -349,7 +349,7 @@ private function arguments($args = null)
         // Define Arguments
         self::$argv = new Argv(self::$name, self::$description);
         self::$argv->addFlag('agile', ['alias' => '-a', 'default' => false, 'help' => 'Help to have less false positive on WordPress and others platforms enabling exploits mode and removing some common exploit pattern']);
-        self::$argv->addFlag('help', ['alias' => '-h', 'default' => false, 'help' => 'Check only functions and not the exploits']);
+        self::$argv->addFlag('help', ['alias' => ['-h', '-?'], 'default' => false, 'help' => 'Check only functions and not the exploits']);
         self::$argv->addFlag('log', ['alias' => '-l', 'default' => self::$pathLogs, 'has_value' => true, 'value_name' => 'path', 'help' => 'Write a log file on the specified file path']);
         self::$argv->addFlag('backup', ['alias' => '-b', 'default' => false, 'help' => 'Make a backup of every touched files']);
         self::$argv->addFlag('offset', ['default' => null, 'has_value' => true, 'help' => 'Set file mapping offset']);
@@ -361,9 +361,10 @@ private function arguments($args = null)
         self::$argv->addFlag('only-signatures', ['alias' => '-s', 'default' => false, 'help' => "Check only functions and not the exploits.\nThis is recommended for WordPress or others platforms"]);
         self::$argv->addFlag('only-exploits', ['alias' => '-e', 'default' => false, 'help' => 'Check only exploits and not the functions']);
         self::$argv->addFlag('only-functions', ['alias' => '-f', 'default' => false, 'help' => 'Check only functions and not the exploits']);
-        self::$argv->addFlag('definitions-list', ['default' => false, 'help' => 'Get default definitions exploit and functions list']);
-        self::$argv->addFlag('definitions-exploits', ['default' => false, 'help' => 'Get default definitions exploits list']);
-        self::$argv->addFlag('definitions-functions', ['default' => false, 'help' => 'Get default definitions functions lists']);
+        self::$argv->addFlag('defs', ['default' => false, 'help' => 'Get default definitions exploit and functions list']);
+        self::$argv->addFlag('defs-exploits', ['default' => false, 'help' => 'Get default definitions exploits list']);
+        self::$argv->addFlag('defs-functions', ['default' => false, 'help' => 'Get default definitions functions lists']);
+        self::$argv->addFlag('defs-functions-encoded', ['default' => false, 'help' => 'Get default definitions functions encoded lists']);
         self::$argv->addFlag('exploits', ['default' => false, 'has_value' => true, 'help' => 'Filter exploits']);
         self::$argv->addFlag('functions', ['default' => false, 'has_value' => true, 'help' => 'Define functions to search']);
         self::$argv->addFlag('whitelist-only-path', ['default' => false, 'help' => 'Check on whitelist only file path and not line number']);
@@ -401,21 +402,26 @@ private function arguments($args = null)
         }
 
         // List exploits
-        if (isset(self::$argv['definitions-list']) && self::$argv['definitions-list']) {
+        if (isset(self::$argv['defs']) && self::$argv['defs']) {
             Console::helplist();
             $this->interrupt();
         }
 
         // List exploits
-        if (isset(self::$argv['definitions-exploits']) && self::$argv['definitions-exploits']) {
+        if (isset(self::$argv['defs-exploits']) && self::$argv['defs-exploits']) {
             Console::helplist('exploits');
         }
 
         // List functions
-        if (isset(self::$argv['definitions-functions']) && self::$argv['definitions-functions']) {
+        if (isset(self::$argv['defs-functions']) && self::$argv['defs-functions']) {
             Console::helplist('functions');
         }
 
+        // List functions encoded
+        if (isset(self::$argv['defs-functions-encoded']) && self::$argv['defs-functions-encoded']) {
+            Console::helplist('functions-encoded');
+        }
+
         // Update
         if (isset(self::$argv['update']) && self::$argv['update']) {
             $this->update();