pwn 0.4.698 → 0.4.700

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1876724f8a6e17d3f41247dc8bc4daea0f8fadaf433a99883ed67b016c45205d
-  data.tar.gz: f5f93dd5ed24f7d8e3d880bcd05d183d3105c10f3515302cf88a8db256e5fdf1
+  metadata.gz: f21820a32e67fe03171657ab0c5c382103354ad1465fb2de2a7ecc167ab1f77b
+  data.tar.gz: 4ffbee987270f1e6509e4363db92f6ede6c84266c52bdd1032c777f9be3aaa8d
 SHA512:
-  metadata.gz: f8703953cf8b45c61a0de488246dd9ee19d213d3c7577e43f756d26283f49842fc45371aeddcc00e734f730f9b89146a8df3363f47e9c9476de1c77f53078383
-  data.tar.gz: 5403587ece0718fa16fb20a053c37b12a32470cca9c97b0dade132d1ad321a4326253e7826458fbbc9fd50933e7f4fc4def891f8856b38658cf18d0e32297fce
+  metadata.gz: ee613e295e8a5d6fcb1e1d49938cac273a2f9fdff4916b26c4cae7e9235bdb6ca4a967c94fd61263f8e3af8f603c05544488efb21916867b5bffb92f5defee9c
+  data.tar.gz: 35d4cf79f4199a10171a0561cb5f538ba8a7b0e50dd9500aaafddc6e39850d6f52d5454ccf8d5019a378f4435cdc2cfddad975cc85097e601369907014828886

data/Gemfile

@@ -51,6 +51,7 @@ gem 'nexpose', '7.3.0'
 gem 'nokogiri', '1.15.0'
 gem 'nokogiri-diff', '0.2.0'
 gem 'oily_png', '1.2.1'
+gem 'open3', '0.1.2'
 gem 'os', '1.1.4'
 gem 'packetfu', '1.1.13'
 gem 'pdf-reader', '2.11.0'
@@ -80,7 +81,8 @@ gem 'sinatra', '3.0.6'
 gem 'slack-ruby-client', '2.1.0'
 gem 'socksify', '1.7.1'
 gem 'spreadsheet', '1.3.0'
-gem 'sqlite3', '1.6.2'
+gem 'sqlite3', '1.6.3'
+gem 'sys-proctable', '1.3.0'
 gem 'thin', '1.8.2'
 gem 'tty-prompt', '0.23.1'
 gem 'tty-spinner', '0.9.3'

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.698]:001 >>> PWN.help
+pwn[v0.4.700]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.698]:001 >>> PWN.help
+pwn[v0.4.700]:001 >>> PWN.help
 ```
 
 

data/bin/pwn

@@ -4,6 +4,7 @@
 require 'optparse'
 require 'pwn'
 require 'pry'
+require 'sys/proctable'
 require 'yaml'
 
 opts = {}
@@ -292,10 +293,27 @@ begin
   )
 
   # Start PWN REPL
+  pwn_pid = Process.pid
   Pry.start(
     self,
     prompt: prompt
   )
 rescue StandardError => e
   raise e
+ensure
+  child_pids = Sys::ProcTable.ps(smaps: false).select do |pe|
+    pe.ppid == pwn_pid
+  end.map(&:pid)
+
+  grandkid_pids = Sys::ProcTable.ps(smaps: false).select do |pe|
+    child_pids.include?(pe.ppid)
+  end.map(&:pid)
+
+  grandkid_pids.each do |grandkid_pid|
+    Process.kill('TERM', grandkid_pid)
+  end
+
+  child_pids.each do |child_pid|
+    Process.kill('TERM', child_pid)
+  end
 end

data/lib/pwn/plugins/nmap_it.rb

@@ -2,6 +2,7 @@
 
 require 'nmap/command'
 require 'nmap/xml'
+require 'open3'
 
 module PWN
   module Plugins
@@ -57,6 +58,29 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # PWN::Plugins::NmapIt.diff_xml_results(
+      #   xml_a: 'required - path to nmap xml results',
+      #   xml_b: 'required - path to nmap xml results',
+      #   diff: 'required - path to nmap xml results diff'
+      # )
+      public_class_method def self.diff_xml_results(opts = {})
+        xml_a = opts[:xml_a].to_s.scrub.strip.chomp
+        xml_b = opts[:xml_b].to_s.scrub.strip.chomp
+        diff = opts[:diff].to_s.scrub.strip.chomp
+
+        stdout, _stderr, _status = Open3.capture3(
+          'ndiff',
+          '--xml',
+          xml_a,
+          xml_b
+        )
+
+        File.write(diff, stdout)
+      rescue StandardError => e
+        raise e
+      end
+
       # Author(s):: 0day Inc. <request.pentest@0dayinc.com>
 
       public_class_method def self.authors
@@ -98,6 +122,12 @@ module PWN
             end
           end
 
+          #{self}.diff_xml_results(
+            xml_a: 'required - path to nmap xml results',
+            xml_b: 'required - path to nmap xml results',
+            diff: 'required - path to nmap xml results diff'
+          )
+
           #{self}.authors
         "
       end

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.4.698'
+  VERSION = '0.4.700'
 end

data/packer/kali_rolling_aws_ami.json

@@ -105,7 +105,7 @@
         "provisioners/apache2.sh",
         "provisioners/tor.sh",
         "provisioners/toggle_tor.sh",
-        "provisioners/nmap_all_live_hosts.sh",
+        "provisioners/nmap.sh",
         "provisioners/arachni.sh",
         "provisioners/eyewitness.sh",
         "provisioners/afl.sh",

data/packer/kali_rolling_qemu_kvm.json

@@ -109,7 +109,7 @@
         "provisioners/apache2.sh",
         "provisioners/tor.sh",
         "provisioners/toggle_tor.sh",
-        "provisioners/nmap_all_live_hosts.sh",
+        "provisioners/nmap.sh",
         "provisioners/arachni.sh",
         "provisioners/eyewitness.sh",
         "provisioners/afl.sh",

data/packer/kali_rolling_virtualbox.json

@@ -136,7 +136,7 @@
         "provisioners/apache2.sh",
         "provisioners/tor.sh",
         "provisioners/toggle_tor.sh",
-        "provisioners/nmap_all_live_hosts.sh",
+        "provisioners/nmap.sh",
         "provisioners/arachni.sh",
         "provisioners/eyewitness.sh",
         "provisioners/afl.sh",

data/packer/kali_rolling_vmware.json

@@ -117,7 +117,7 @@
         "provisioners/apache2.sh",
         "provisioners/tor.sh",
         "provisioners/toggle_tor.sh",
-        "provisioners/nmap_all_live_hosts.sh",
+        "provisioners/nmap.sh",
         "provisioners/arachni.sh",
         "provisioners/eyewitness.sh",
         "provisioners/afl.sh",

data/packer/provisioners/nmap.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+source /etc/profile.d/globals.sh
+
+$screen_cmd "${apt} install -y nmap ncat ndiff ${assess_update_errors}"
+grok_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.698
+  version: 0.4.700
 platform: ruby
 authors:
 - 0day Inc.
@@ -570,6 +570,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: open3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -982,14 +996,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -1137,7 +1165,6 @@ executables:
 - pwn_defectdojo_importscan
 - pwn_defectdojo_reimportscan
 - pwn_diff_csv_files_w_column_exclude
-- pwn_diff_xml_files
 - pwn_domain_reversewhois
 - pwn_fuzz_net_app_proto
 - pwn_ibm_appscan_enterprise
@@ -1205,7 +1232,6 @@ files:
 - bin/pwn_defectdojo_importscan
 - bin/pwn_defectdojo_reimportscan
 - bin/pwn_diff_csv_files_w_column_exclude
-- bin/pwn_diff_xml_files
 - bin/pwn_domain_reversewhois
 - bin/pwn_fuzz_net_app_proto
 - bin/pwn_ibm_appscan_enterprise
@@ -1835,7 +1861,7 @@ files:
 - packer/provisioners/install_vagrant_ssh_key.sh
 - packer/provisioners/jenkins.sh
 - packer/provisioners/metasploit.rb
-- packer/provisioners/nmap_all_live_hosts.sh
+- packer/provisioners/nmap.sh
 - packer/provisioners/openvas.sh
 - packer/provisioners/openvas_wrappers.sh
 - packer/provisioners/openvpn.sh

data/bin/pwn_diff_xml_files

@@ -1,74 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'nokogiri/diff'
-require 'optparse'
-
-opts = {}
-OptionParser.new do |options|
-  options.on('-aXML', '--xml-a=XML', '<Required - First XML to Compare)>') do |x1|
-    opts[:x1_path] = x1
-  end
-
-  options.on('-bXML', '--xml-b=XML', '<Required - Second XML to Compare)>') do |x2|
-    opts[:x2_path] = x2
-  end
-
-  options.on('-dDIFF', '--xml-diff=DIFF', '<Required - Path of XML Diff to Generate)>') do |d|
-    opts[:diff_path] = d
-  end
-end.parse!
-
-if opts.empty?
-  puts `#{$PROGRAM_NAME} --help`
-  exit 1
-end
-
-# Compare the diff of two XML files using the nokogiri gem in Ruby
-# and output the diff to a new XML file using the same format as the
-# the original XML files.
-begin
-  x1_path = opts[:x1_path]
-  x2_path = opts[:x2_path]
-  diff_path = opts[:diff_path]
-
-  x1 = Nokogiri::XML(File.read(x1_path))
-  x2 = Nokogiri::XML(File.read(x2_path))
-
-  diff_xml = Nokogiri::XML::Builder.new do |xml|
-    xml.diff do
-      x1.root.traverse do |node|
-        next unless node.element?
-
-        node_name = node.name
-        node_x2 = x2.at_xpath(node.path)
-
-        if node_x2.nil?
-          xml.delete do
-            xml.send(node_name, node.attributes)
-          end
-        elsif node_x2 != node
-          xml.change do
-            xml.send(node_name, node.attributes)
-          end
-        end
-      end
-
-      x2.root.traverse do |node|
-        next unless node.element?
-
-        node_name = node.name
-        node_x1 = x1.at_xpath(node.path)
-
-        xml.add do
-          xml.send(node_name, node.attributes) if node_x1.nil?
-        end
-      end
-    end
-  end
-
-  File.write(diff_path, diff_xml.to_xml)
-rescue StandardError => e
-  puts "Error: #{e.message}"
-  exit 1
-end

data/packer/provisioners/nmap_all_live_hosts.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-source /etc/profile.d/globals.sh
-
-$screen_cmd "${apt} install -y nmap ncat ${assess_update_errors}"
-grok_error
-
-$screen_cmd "cd /opt && git clone https://github.com/ninp0/nmap_all_live_hosts.git && ln -sf /opt/nmap_all_live_hosts/nmap_all_live_hosts.sh /usr/local/bin/ ${assess_update_errors}"
-grok_error