From dc60cea1927c3532d35855c34073eff16c1d5cc1 Mon Sep 17 00:00:00 2001 From: nichogenius Date: Sat, 19 Aug 2017 12:57:49 -0600 Subject: [PATCH] Bug Fixes, added time/checksum flags, organized --Fixed a bug with the out function. Previous updates of mine did not update all calls to the out function which I changed the parameters for. Fixed this by replacing the out function with an 'error' function. --Alphabetized function definitions and did some general tidying up --Made all functions private except the constructor. --Created parseArgs function to handle reading in options. --Fixed a bug with 'extra-check' where htaccess and googleBot were being pushed to the pattern array each time a file was scanned. This bug was created when I moved the pattern initialize code to the constructor. Moved extra-check code with the rest of the initialize pattern calls. --Added -no-color, -time, and -checksum flags. I'd prefer if the output was only as spammy as the user requests. Time should be helpful in tracing when the attack occurred and if files are related to the same hack. Time and checksum do not display by default. no-color flag makes it easier to dump to plain text files. --- scan.php | 366 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 223 insertions(+), 143 deletions(-) diff --git a/scan.php b/scan.php index 044880a..acbb5bc 100644 --- a/scan.php +++ b/scan.php @@ -18,15 +18,19 @@ class MalwareScanner { - const ANSI_GREEN = "\033[32m"; - const ANSI_RED = "\033[31m"; - const ANSI_YELLOW = "\033[33m"; - const ANSI_BLUE = "\033[36m"; - const ANSI_OFF = "\033[0m"; + //Pretty Colors + private $ANSI_GREEN = "\033[32m"; + private $ANSI_RED = "\033[31m"; + private $ANSI_YELLOW = "\033[33m"; + private $ANSI_BLUE = "\033[36m"; + private $ANSI_OFF = "\033[0m"; + private $dir = ''; private $extension = '.php'; + private $flagChecksum = false; private $flagHideOk = false; private $flagHideWhitelist = false; + private $flagTime = false; private $extraCheck = false; private $verbose = false; private $whitelist = array(); @@ -44,61 +48,76 @@ class MalwareScanner public function __construct() { - $this->patterns_raw = $this->loadPatterns(dirname(__FILE__) . '/patterns_raw.txt'); - $this->patterns_iraw = $this->loadPatterns(dirname(__FILE__) . '/patterns_iraw.txt'); - $this->patterns_re = $this->loadPatterns(dirname(__FILE__) . '/patterns_re.txt'); - - $options = getopt('he:i:kwxd:lv', array('help', 'extension:', 'ignore:', 'hide-ok', 'hide-whitelist', 'extra-check', 'directory:', 'follow-symlink', 'verbose')); - if (isset($options['help']) || isset($options['h'])) { - $this->showHelp(); - exit; - } - if (isset($options['extension']) || isset($options['e'])) { - $ext = isset($options['extension']) ? $options['extension'] : $options['e']; - if ($ext[0] != '.') { - $ext = '.' . $ext; - } - $this->extension = strtolower($ext); - } - if (isset($options['ignore']) || isset($options['i'])) { - $tmp = isset($options['ignore']) ? $options['ignore'] : $options['i']; - $this->ignore = is_array($tmp) ? $tmp : array($tmp); - } - if (isset($options['hide-ok']) || isset($options['k'])) { - $this->flagHideOk = true; - } - if (isset($options['hide-whitelist']) || isset($options['w'])) { - $this->flagHideWhitelist = true; - } - if (isset($options['extra-check']) || isset($options['x'])) { - $this->extraCheck = true; - } - if (isset($options['follow-symlink']) || isset($options['l'])) { - $this->followSymlink = true; - } - if (isset($options['verbose']) || isset($options['v'])){ - $this->verbose = true; - } - if (isset($options['directory']) || isset($options['d'])) { - $tmp = isset($options['directory']) ? $options['directory'] : $options['d']; - $this->run($tmp); - } else { - $this->out(MalwareScanner::ANSI_RED, 'ER', 'No directory specified'); - $this->showHelp(); + //Read Run Options + $this->parseArgs(); + + //Load Patterns + $this->initializePatterns(); + + //Initiate Scan + $this->run($this->dir); + } + + private function disableColor() + { + $this->ANSI_GREEN = ''; + $this->ANSI_RED = ''; + $this->ANSI_YELLOW = ''; + $this->ANSI_BLUE = ''; + $this->ANSI_OFF = ''; + } + + private function error($msg) + { + echo $this->ANSI_RED . 'Error: ' . $msg . $this->ANSI_OFF . PHP_EOL; + $this->showHelp(); + echo PHP_EOL . $this->ANSI_RED . 'Quiting' . PHP_EOL; + exit(-1); + } + + private function initializePatterns() + { + $this->patterns_raw = $this->loadPatterns(dirname(__FILE__) . '/patterns_raw.txt'); + $this->patterns_iraw = $this->loadPatterns(dirname(__FILE__) . '/patterns_iraw.txt'); + $this->patterns_re = $this->loadPatterns(dirname(__FILE__) . '/patterns_re.txt'); + if ($this->extraCheck) { + array_push($this->patterns_raw, "googleBot", "htaccess"); } } - public function run($dir) + private function inWhitelist($hash) { - $dir = rtrim($dir, '/'); - if (!is_dir($dir)) { - $this->out(self::ANSI_RED, 'ER', 'Specified path is not a directory: ' . $dir); - exit(-1); + return in_array($hash, $this->whitelist); + } + + private function isIgnored($pathname) + { + foreach ($this->ignore as $pattern) { + $match = $this->pathMatches($pathname, $pattern); + if ($match) { + return true; + } } - $start = time(); - $this->loadWhitelist(); - $this->process($dir . '/'); - $this->report($start, $dir . '/'); + return false; + } + + private function loadPatterns($file) + { + $list = array(); + if (is_readable($file)) { + foreach (file($file) as $pattern) { + //Check if the line is only whitespace and skips. + if (strlen(trim($pattern)) == 0) { + continue; + } + //Check if first char in pattern is a '#' which indicates a comment and skips. + if ($pattern[0] === '#') { + continue; + } + $list[] = trim($pattern); + } + } + return $list; } private function loadWhitelist() @@ -113,9 +132,135 @@ class MalwareScanner } } - private function inWhitelist($hash) + private function parseArgs() { - return in_array($hash, $this->whitelist); + $options = getopt('d:e:i:cxlhkwntv', array('directory:', 'extension:', 'ignore:', 'checksum', 'extra-check', 'follow-link', 'help', 'hide-ok', 'hide-whitelist', 'no-color', 'time', 'verbose')); + + //Help Option should be first + if (isset($options['help']) || isset($options['h'])) { + $this->showHelp(); + exit; + } + + //Options that Require Additional Parameters + if (isset($options['directory']) || isset($options['d'])) { + $this->dir = isset($options['directory']) ? $options['directory'] : $options['d']; + } + if (isset($options['extension']) || isset($options['e'])) { + $ext = isset($options['extension']) ? $options['extension'] : $options['e']; + if ($ext[0] != '.') { + $ext = '.' . $ext; + } + $this->extension = strtolower($ext); + } + if (isset($options['ignore']) || isset($options['i'])) { + $tmp = isset($options['ignore']) ? $options['ignore'] : $options['i']; + $this->ignore = is_array($tmp) ? $tmp : array($tmp); + } + + //Simple Flag Options + if (isset($options['checksum']) || isset($options['c'])){ + $this->flagChecksum = true; + } + if (isset($options['extra-check']) || isset($options['x'])) { + $this->extraCheck = true; + } + if (isset($options['follow-symlink']) || isset($options['l'])) { + $this->followSymlink = true; + } + if (isset($options['hide-ok']) || isset($options['k'])) { + $this->flagHideOk = true; + } + if (isset($options['hide-whitelist']) || isset($options['w'])) { + $this->flagHideWhitelist = true; + } + if (isset($options['no-color']) || isset($options['n'])){ + $this->disableColor(); + } + if (isset($options['time']) || isset($options['t'])){ + $this->flagTime = true; + } + if (isset($options['verbose']) || isset($options['v'])){ + $this->verbose = true; + } + } + + // @see http://stackoverflow.com/a/13914119 + private function pathMatches($path, $pattern, $ignoreCase = false) + { + $expr = preg_replace_callback( + '/[\\\\^$.[\\]|()?*+{}\\-\\/]/', + function ($matches) { + switch ($matches[0]) { + case '*': + return '.*'; + case '?': + return '.'; + default: + return '\\' . $matches[0]; + } + }, + $pattern + ); + + $expr = '/' . $expr . '/'; + if ($ignoreCase) { + $expr .= 'i'; + } + + return (bool)preg_match($expr, $path); + } + + private function printPath($found, $path, $pattern, $hash) + { + $output_string = '# '; + + //OK + if (!$found) { + if ($this->flagHideOk){return;} + $state = 'OK'; + $state_color = $this->ANSI_GREEN; + } + //WL + elseif ($this->inWhitelist($hash)) { + if ($this->flagHideWhitelist) {return;} + $state = 'WL'; + $state_color = $this->ANSI_YELLOW; + } + //ER + else { + $state = 'ER'; + $state_color = $this->ANSI_RED; + } + $output_string = $state_color . $output_string . $state . $this->ANSI_OFF . ' '; + + //Include cTime + if ($this->flagTime) { + $changed_time = filectime($path); + $htime = date('H:i d-m-Y', $changed_time); + $output_string = $output_string . $this->ANSI_BLUE . $htime . $this->ANSI_OFF . ' '; + } + + //Include Checksum + if ($this->flagChecksum) { + $output_string = $output_string . $this->ANSI_BLUE . $hash . $this->ANSI_OFF . ' '; + } + + //Append Path + //'#' and {} included to prevent accidental script execution attempts + // in the event that script output is pasted into a root terminal + $opath = '# ' . '{' . $path . '}'; + $output_string = $output_string . $opath . ' '; + + //'#' added again as code snippets have the potential to be valid shell commands + if ($found) { + $opatt = "# $pattern"; + $output_string = $output_string . $state_color . $opatt . $this->ANSI_OFF; + } + + $output_string = $output_string . PHP_EOL; + + echo $output_string; } private function process($dir) @@ -159,23 +304,23 @@ class MalwareScanner echo 'Total malware identified: ' . $this->stat['files_infected'] . PHP_EOL; } - private function loadPatterns($file) - { - $list = array(); - if (is_readable($file)) { - foreach (file($file) as $pattern) { - //Check if the line is only whitespace and skips. - if (strlen(trim($pattern)) == 0) { - continue; - } - //Check if first char in pattern is a '#' which indicates a comment and skips. - if ($pattern[0] === '#') { - continue; - } - $list[] = trim($pattern); - } + private function run($dir) + { + //Make sure a directory was specified. + if ($this->dir === '') { + $this->error('No directory specified'); } - return $list; + + //Make sure the input is a valid directory path. + $dir = rtrim($dir, '/'); + if (!is_dir($dir)) { + $this->error('Specified path is not a directory: ' . $dir); + } + + $start = time(); + $this->loadWhitelist(); + $this->process($dir . '/'); + $this->report($start, $dir . '/'); } private function scan($path) @@ -187,9 +332,6 @@ class MalwareScanner $hash = ''; $toSearch = ''; - if ($this->extraCheck) { - array_push($this->patterns_raw, "googleBot", "htaccess"); - } foreach ($this->patterns_raw as $toSearch) { if (strpos($fileContent, $toSearch) !== FALSE){ $found = true; @@ -246,81 +388,19 @@ class MalwareScanner return true; } - private function printPath($found, $path, $pattern, $hash) - { - $blank_hash = ' '; - $blank_pattern = ''; - $safe_path = '{' . $path . '}'; - if ($found && $this->inWhitelist($hash)) { - if (!$this->flagHideWhitelist) { - $this->out(self::ANSI_YELLOW, 'WL', $blank_hash, $safe_path, $blank_pattern); - } - } - - elseif ($found) { - $this->out(self::ANSI_RED, 'ER', $hash, $safe_path, $pattern); - } - - else { - if (!$this->flagHideOk) { - $this->out(self::ANSI_GREEN, 'OK', $blank_hash, $safe_path, $blank_pattern); - } - } - } - - private function isIgnored($pathname) - { - foreach ($this->ignore as $pattern) { - $match = $this->pathMatches($pathname, $pattern); - if ($match) { - return true; - } - } - return false; - } - - // @see http://stackoverflow.com/a/13914119 - private function pathMatches($path, $pattern, $ignoreCase = false) - { - $expr = preg_replace_callback( - '/[\\\\^$.[\\]|()?*+{}\\-\\/]/', - function ($matches) { - switch ($matches[0]) { - case '*': - return '.*'; - case '?': - return '.'; - default: - return '\\' . $matches[0]; - } - }, - $pattern - ); - - $expr = '/' . $expr . '/'; - if ($ignoreCase) { - $expr .= 'i'; - } - - return (bool)preg_match($expr, $path); - } - - private function out($color, $serv, $hash, $path, $pattern) - { - echo $color . '#' . ' ' . $serv . self::ANSI_BLUE . " $hash " . self::ANSI_OFF . "# " . $path . $color . ' # ' . $pattern . self::ANSI_OFF . PHP_EOL; - } - private function showHelp() { echo 'Usage: scan.php -d ' . PHP_EOL; echo ' -h --help Show this help message' . PHP_EOL; echo ' -d --directory Directory for searching' . PHP_EOL; - echo ' -e .php --extension File Extension to Scan' . PHP_EOL; + echo ' -e --extension File Extension to Scan' . PHP_EOL; echo ' -i --ignore Directory of file to igonre' . PHP_EOL; - echo ' -k --hide-ok Hide OK aka not infected messages' . PHP_EOL; - echo ' -w --hide-whitelist Hide whitelisted messages' . PHP_EOL; + echo ' -c --checksum Display MD5 Checksum of file' . PHP_EOL; echo ' -x --extra-check Adds GoogleBot and htaccess to Scan List' . PHP_EOL; echo ' -l --follow-symlink Follow symlinked directories' . PHP_EOL; + echo ' -k --hide-ok Hide OK aka not infected messages' . PHP_EOL; + echo ' -w --hide-whitelist Hide whitelisted messages' . PHP_EOL; + echo ' -t --time Show time of last file change' . PHP_EOL; echo ' -v --verbose Continue scanning file afater first hit' . PHP_EOL; }