peplum-nmap 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43119975167b6d77c7c37a659ebe0d0ed00bc7d337d1e75c9bbf5c82734f34f9
-  data.tar.gz: a0d173ea8eca5258bd65d4780628936cbb37d738eb1f4ac3aff6482ce5c14c19
+  metadata.gz: 909d1bf87e2c6e01c356fdd5052b04c65ab7aa0146793f879351117c717c163f
+  data.tar.gz: d859d987045778ad52e30253c345ac5a7e7dfd45a4e540a5a3b04d184284703c
 SHA512:
-  metadata.gz: '0493a3bc95b08c909ced90634791be7ac8300d18af8b9ad3217515db3e86bc82256e4445533736acf4ed3bd88781eeb845432dc1427eeb441458cce3689779ef'
-  data.tar.gz: c3d8f9e06a9bbe248ca916264e07c46ed668ea5b749bd015caac1c3ee7930dbb019bac5d7c31ffc8824eef2a31098c3048b8254b090f4aae2ee89eebd36a1d96
+  metadata.gz: 4a87fb1b4e7b775e6ed9039238f023754c6c9ade3252f56955d1a34081c8991f239f016983e7f3206ad8209e2f23b5cee5e58c5a1e381baa47928b0ae4448203
+  data.tar.gz: 50f0c401b91396fe690b9368e21b3cd97198e01d7b27aaf8a15218b32ca0f3e5144fe78d59009a0b5f99708aa5b5a3e61f4e1e50c8b5cb27e739b841568f66a0

data/examples/rest.rb

@@ -39,6 +39,9 @@ request :post, 'instances', {
 instance_id = response_data['id']
 
 while sleep( 1 )
+  request :get, "instances/#{instance_id}/info/progress"
+  ap response_data
+
   # Continue looping while instance status is 'busy'.
   request :get, "instances/#{instance_id}"
   break if !response_data['busy']

data/examples/rpc.rb

@@ -24,7 +24,10 @@ nmap.run(
 )
 
 # Waiting to complete.
-sleep 1 while nmap.running?
+while nmap.running?
+  ap nmap.info.progress
+  sleep 1
+end
 
 # Hooray!
 puts JSON.pretty_generate( nmap.generate_report.data )

data/lib/peplum/nmap/payload.rb

@@ -21,11 +21,19 @@ module Payload
   end
 
   def run( targets, options )
-    _run options.merge( targets: targets, output_xml: SCAN_REPORT )
-    report_from_xml( SCAN_REPORT )
+    # Do it this way so we'll be able to have progress reports per scanned host.
+    merge( targets.map do |target|
+      _run options.merge( targets: target, output_xml: SCAN_REPORT )
+
+      report = report_from_xml( SCAN_REPORT )
+      next if !report.include?('hosts')
+
+      Nmap::Application.master.info.update report
+      report
+    end.compact )
   end
 
-  def group( targets, chunks )
+  def split( targets, chunks )
     @hosts ||= self.live_hosts( targets )
     @hosts.chunk( chunks ).reject(&:empty?)
   end
@@ -45,7 +53,12 @@ module Payload
          ping:       true,
          output_xml: PING_REPORT
 
-    hosts_from_xml( PING_REPORT )
+    hosts = hosts_from_xml( PING_REPORT )
+
+    # Seed the progress data with the live hosts
+    hosts.each { |h| Services::Info.progress_data['hosts'][h] ||= {} }
+
+    hosts
   end
 
   def set_default_options( nmap )

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

@@ -0,0 +1,26 @@
+module Peplum
+class Nmap
+module Services
+
+class Info
+
+  class <<self
+    def progress_data
+      @progress_data ||= { 'hosts' => {} }
+    end
+  end
+
+  def progress
+    self.class.progress_data
+  end
+
+  def update( data )
+    self.class.progress_data['hosts'].merge! Payload.merge( [self.class.progress_data, data] )['hosts']
+    nil
+  end
+
+end
+
+end
+end
+end

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

@@ -0,0 +1,17 @@
+module Peplum
+class Nmap
+module Services
+module RESTProxy
+def self.registered( app )
+
+  app.get '/progress' do
+    instance_for( params[:instance] ) do |instance|
+      json instance.info.progress
+    end
+  end
+
+end
+end
+end
+end
+end

data/lib/peplum/nmap/version.rb

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

data/lib/peplum/nmap.rb

@@ -11,6 +11,13 @@ class Nmap
   class Error < Peplum::Error; end
 
   class Application < Peplum::Application
+
+    require_relative "nmap/services/info"
+    instance_service_for :info, Services::Info
+
+    require_relative "nmap/services/rest_proxy"
+    rest_service_for :info, Services::RESTProxy
+
     def payload
       Payload
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peplum-nmap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peplum
@@ -53,6 +53,8 @@ files:
 - examples/rpc.rb
 - lib/peplum/nmap.rb
 - lib/peplum/nmap/payload.rb
+- lib/peplum/nmap/services/info.rb
+- lib/peplum/nmap/services/rest_proxy.rb
 - lib/peplum/nmap/version.rb
 - peplum-nmap.gemspec
 homepage: http://ecsypno.com/