peplum-nmap 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 909d1bf87e2c6e01c356fdd5052b04c65ab7aa0146793f879351117c717c163f
-  data.tar.gz: d859d987045778ad52e30253c345ac5a7e7dfd45a4e540a5a3b04d184284703c
+  metadata.gz: f22db0b582b78dd84d8581db7bc36a706f3a5a329413f21c668e0dca7a7956bc
+  data.tar.gz: ba7609f7daaed784432fa341bd3fe2579bf3cc83f5797a78ad659a2cf1258def
 SHA512:
-  metadata.gz: 4a87fb1b4e7b775e6ed9039238f023754c6c9ade3252f56955d1a34081c8991f239f016983e7f3206ad8209e2f23b5cee5e58c5a1e381baa47928b0ae4448203
-  data.tar.gz: 50f0c401b91396fe690b9368e21b3cd97198e01d7b27aaf8a15218b32ca0f3e5144fe78d59009a0b5f99708aa5b5a3e61f4e1e50c8b5cb27e739b841568f66a0
+  metadata.gz: 6ff6ed52c578a1b8de3eae2af817b30eafe8ac288899cd3e7998d5fafe695386e8991f7278202eaa0b848ad0f81cb2e652955073fc0969df81e95eb95ccabcdd
+  data.tar.gz: 2290ff495e066f2a5a473b0c2e7fc9b653c4748470c60e3078059490b22641a59ac3bb99c227580afa12bb291c00a079b49b531e34ebedcb8028dd11f12bab1a

data/lib/peplum/nmap/payload.rb

@@ -6,6 +6,7 @@ module Peplum
 class Nmap
 
 module Payload
+  include Peplum::Application::Payload
 
   DEFAULT_OPTIONS = {
     'output_normal' => '/dev/null',
@@ -22,15 +23,15 @@ module Payload
 
   def run( targets, options )
     # Do it this way so we'll be able to have progress reports per scanned host.
-    merge( targets.map do |target|
+    targets.map do |target|
       _run options.merge( targets: target, output_xml: SCAN_REPORT )
 
       report = report_from_xml( SCAN_REPORT )
-      next if !report.include?('hosts')
+      next if report.empty?
 
       Nmap::Application.master.info.update report
       report
-    end.compact )
+    end.compact
   end
 
   def split( targets, chunks )
@@ -38,14 +39,6 @@ module Payload
     @hosts.chunk( chunks ).reject(&:empty?)
   end
 
-  def merge( data )
-    report = { 'hosts' => {} }
-    data.each do |d|
-      report['hosts'].merge! d['hosts']
-    end
-    report
-  end
-
   private
 
   def live_hosts( targets )
@@ -56,7 +49,7 @@ module Payload
     hosts = hosts_from_xml( PING_REPORT )
 
     # Seed the progress data with the live hosts
-    hosts.each { |h| Services::Info.progress_data['hosts'][h] ||= {} }
+    hosts.each { |h| Services::Info.progress_data[h] ||= {} }
 
     hosts
   end
@@ -93,12 +86,11 @@ module Payload
     report_data = {}
     ::Nmap::XML.open( xml ) do |xml|
       xml.each_host do |host|
-        report_data['hosts'] ||= {}
-        report_data['hosts'][host.ip] = host_to_hash( host )
+        report_data[host.ip] = host_to_hash( host )
 
-        report_data['hosts'][host.ip]['ports'] = {}
+        report_data[host.ip]['ports'] = {}
         host.each_port do |port|
-          report_data['hosts'][host.ip]['ports'][port.number] = port_to_hash( port )
+          report_data[host.ip]['ports'][port.number] = port_to_hash( port )
         end
       end
     end

data/lib/peplum/nmap/services/info.rb

@@ -6,7 +6,7 @@ class Info
 
   class <<self
     def progress_data
-      @progress_data ||= { 'hosts' => {} }
+      @progress_data ||= {}
     end
   end
 
@@ -15,7 +15,7 @@ class Info
   end
 
   def update( data )
-    self.class.progress_data['hosts'].merge! Payload.merge( [self.class.progress_data, data] )['hosts']
+    self.class.progress_data.merge! data
     nil
   end
 

data/lib/peplum/nmap/version.rb

@@ -2,6 +2,6 @@
 
 module Peplum
 class Nmap
-  VERSION = "0.2.2"
+  VERSION = "0.3.1"
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peplum-nmap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Tasos Laskos