Merge pull request #4 from clarkstuth/master

willdurand · Aug 7, 2014 · 2ecbdb0 · 2ecbdb0
2 parents f26ef98 + d079e8d
commit 2ecbdb0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/Nmap/Nmap.php b/src/Nmap/Nmap.php
@@ -33,6 +33,8 @@ class Nmap
 
     private $disableReverseDNS = false;
 
+    private $treatHostsAsOnline = false;
+
     /**
      * @return Nmap
      */
@@ -86,6 +88,10 @@ public function scan(array $targets, array $ports = array())
             $options[] = '-n';
         }
 
+        if (true == $this->treatHostsAsOnline) {
+            $options[] = '-Pn';
+        }
+
         $options[] = '-oX';
         $command   = sprintf('nmap %s %s %s',
             implode(' ', $options),
@@ -162,6 +168,18 @@ public function disableReverseDNS($disable = true)
         return $this;
     }
 
+    /**
+     * @param boolean $disable
+     *
+     * @return Nmap
+     */
+    public function treatHostsAsOnline($disable = true)
+    {
+        $this->treatHostsAsOnline = $disable;
+
+        return $this;
+    }
+
     private function parseOutputFile($xmlFile)
     {
         $xml = simplexml_load_file($xmlFile);

diff --git a/tests/Nmap/Tests/NmapTest.php b/tests/Nmap/Tests/NmapTest.php
@@ -176,4 +176,20 @@ public function testScanWithoutReverseDNS()
             ->disableReverseDNS()
             ->scan(array('williamdurand.fr'));
     }
+
+    public function testScanWithTreatHostsAsOnline()
+    {
+        $outputFile = __DIR__ . '/Fixtures/test_scan_with_verbose.xml';
+        $expectedCommand = sprintf("nmap -Pn -oX '%s' 'williamdurand.fr'", $outputFile);
+
+        $executor = $this->getMock('Nmap\Util\ProcessExecutor');
+        $executor
+            ->expects($this->once())
+            ->method('execute')
+            ->with($this->equalTo($expectedCommand))
+            ->will($this->returnValue(0));
+
+        $nmap = new Nmap($executor, $outputFile);
+        $hosts = $nmap->treatHostsAsOnline()->scan(array('williamdurand.fr'));
+    }
 }