peplum-nmap 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77102d2b6c314e3b3f3585bb3d892338b81080087289b11631e2295cf4711499
-  data.tar.gz: cf41927ba26efe42963c4064522c3e68735f5deb3163e6067dbb863b5470daa3
+  metadata.gz: d908da9a53e5a64f52446ad732503d62744dfa2a20632d28b0e3b2273cc2dc18
+  data.tar.gz: a816397bc1c7685af4159eeaf32b2604e0dd25bea19ae33589ba18f08ee9c607
 SHA512:
-  metadata.gz: ad0e5f023991b6b8c95ae46621fbb4ce55f64dabc1a6509abc6b7767571facdff926077b8e23213d5f362e38dec82f926cd97f9fc5d1a5bcb65cdacdbfd8fce8
-  data.tar.gz: 866b15d443a8a0b7bb33a57548fb460bff9fec8bf3b4120aee08e27730e62caf24041bcf58c464f327557a5c3d1bbd3c293a8d70114ff18996fed3d788a0b23b
+  metadata.gz: c6faf1368cb4627eb22b992bd19023f6318d4a24fa5ebf56095de003b36bda6fc54b092dfb45e9740e06bbf69cc549a60724131bfbaf9eddd02ec2d637025139
+  data.tar.gz: 9023be58238b489c87403d2c542badb755e61db8b5c4a64032fcfd90b5710287d5eb040eea4781e745c94498feb91c0d1a6d05b7b97dab96f87253d32129e900

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,30 +23,22 @@ 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 group( targets, chunks )
+  def split( targets, chunks )
     @hosts ||= self.live_hosts( targets )
     @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! Payload.merge( [self.class.progress_data, data] )
     nil
   end
 

data/lib/peplum/nmap/version.rb

@@ -2,6 +2,6 @@
 
 module Peplum
 class Nmap
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peplum-nmap
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peplum