pwn 0.4.666 → 0.4.667

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668626b1a3332cf0b09f04a683d7b79462724328afd3535a3d47652b120aca93
-  data.tar.gz: 921a004b8a3bcf11031589da46b45b3e347f3cd6a7fe33854adaf3f61f2cf9ef
+  metadata.gz: 5a4f0feaba882e917c331a010d42bba31372d7d8ab264f2ba73be4722f865e10
+  data.tar.gz: 19060d5bb2a8be71b62ac7ccdbf06e4d5685971547d80060b56315f7e4c3d7d1
 SHA512:
-  metadata.gz: 9e1b117de7f4eceaf24145de0f8923394fb225356a7b79bd6024548476ba3770aa829c9cb65830a5eda93f280b79acbb6ecaf75178262ec9b6c2790ea34f37c0
-  data.tar.gz: 03de28428d438c9394ca0254ca7f5093e5c8e6b23d4f217edb8fdc88edaa33dc0e7be5d643c2282e6d13f2a95e834e1809cb10d6530ae68658ed0b0cf285b692
+  metadata.gz: 3e4d2c00b17b32b2042d7e76b7c9e9d92ba7d3de8edaeeb46a1975b26687f0a9404e0dd8d420a17cf26d278271f1fcd6f565e7ad279262e7925b2e88e51863d4
+  data.tar.gz: 37492df2e12eb18cd4145373b9f34bc3a83624caa54187134f45db16c120dc4dc467255baa36fa72db851f4013f35aef5b501fa5fddf84a9e8705b52e4749a22

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.666]:001 >>> PWN.help
+pwn[v0.4.667]: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.666]:001 >>> PWN.help
+pwn[v0.4.667]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_diff_csv_files_w_column_exclude

@@ -43,15 +43,33 @@ if opts.empty?
 end
 
 def csv_diff(opts = {})
-  larger_csv = opts[:larger_csv]
-  smaller_csv = opts[:smaller_csv]
+  c1_path = opts[:c1_path]
+  c2_path = opts[:c2_path]
   diff_path = opts[:diff_path]
   include_csv_headers = opts[:include_csv_headers]
-  column_names_to_exclude = opts[:column_names_to_exclude]
+  column_names_to_exclude = opts[:column_names_to_exclude].to_s.split(',')
 
-  # TODO: Exclude the column values for diff consideration
-  # while including the columns in the diff...figure out what
-  # to do with the columns' values.
+  csv1 = CSV.read(c1_path)
+  csv2 = CSV.read(c2_path)
+
+  if csv1.length >= csv2.length
+    larger_csv = csv1
+    larger_csv_orig = CSV.read(c1_path)
+
+    smaller_csv = csv2
+    smaller_csv_orig = CSV.read(c2_path)
+  end
+
+  if csv2.length >= csv1.length
+    larger_csv = csv2
+    larger_csv_orig = CSV.read(c2_path)
+
+    smaller_csv = csv1
+    smaller_csv_orig = CSV.read(c1_path)
+  end
+
+  # Exclude the column values for diff to ensure the same rows
+  # with for example different timestamps aren't included.
   columns_index_arr = []
   column_names_to_exclude&.each do |column_name|
     column_index = smaller_csv.first.find_index(column_name)
@@ -72,44 +90,39 @@ def csv_diff(opts = {})
     end
   end
 
-  csv_headers = larger_csv.first.join(',')
+  # Write diff with redacted columns (to find differences we care about)
   File.open(diff_path, 'w') do |f|
-    f.puts csv_headers if include_csv_headers
     larger_csv.each do |line_arr|
       line = line_arr.join(',')
       f.puts line unless smaller_csv.include?(line_arr)
     end
   end
+  diff_csv = CSV.read(diff_path)
+
+  # Write diff again with all columns.
+  csv_headers_orig = larger_csv_orig.first.join(',')
+  File.open(diff_path, 'w') do |f|
+    f.puts csv_headers_orig if include_csv_headers
+    larger_csv_orig.each do |line_arr|
+      line = line_arr.join(',')
+      f.puts line if diff_csv.include?(line_arr)
+    end
+  end
 end
 
 c1_path = opts[:c1_path]
-csv1 = CSV.read(c1_path)
-
 c2_path = opts[:c2_path]
-csv2 = CSV.read(c2_path)
-
 diff_path = opts[:diff_path]
-
-column_names_to_exclude = opts[:column_names_to_exclude].to_s.split(',')
+column_names_to_exclude = opts[:column_names_to_exclude]
 
 include_csv_headers = false if opts[:no_headers]
 include_csv_headers ||= true
 
 # Compare which two is larger
-if csv1.length >= csv2.length
-  csv_diff(
-    larger_csv: csv1,
-    smaller_csv: csv2,
-    diff_path: diff_path,
-    include_csv_headers: include_csv_headers,
-    column_names_to_exclude: column_names_to_exclude
-  )
-else
-  csv_diff(
-    larger_csv: csv2,
-    smaller_csv: csv1,
-    diff_path: diff_path,
-    include_csv_headers: include_csv_headers,
-    column_names_to_exclude: column_names_to_exclude
-  )
-end
+csv_diff(
+  c1_path: c1_path,
+  c2_path: c2_path,
+  diff_path: diff_path,
+  include_csv_headers: include_csv_headers,
+  column_names_to_exclude: column_names_to_exclude
+)

data/bin/pwn_nessus_cloud_vulnscan

@@ -77,12 +77,10 @@ begin
     )
 
     scan_status = scan_status_resp[:status]
-    # break if scan_status != 'initializing' && scan_status != 'pending' && scan_status != 'running' && scan_status != 'publishing'
+
     break if scan_status == 'completed'
   end
 
-  # raise "Scan status reached an unexpected condition: #{scan_status}.  Re-verify the scan config for, '#{scan_name}' and try again." unless scan_status == 'completed'
-
   puts 'scan complete.'
 
   print "Exporting results to #{path_to_export}..."

data/lib/pwn/plugins/nessus_cloud.rb

@@ -80,9 +80,10 @@ module PWN
 
         response
       rescue RestClient::ExceptionWithResponse => e
-        puts "#{base_nessus_cloud_api_uri}/#{rest_call}"
-        puts params
-        puts http_body
+        puts "URI: #{base_nessus_cloud_api_uri}/#{rest_call}"
+        puts "Params: #{params.inspect}"
+        puts "HTTP POST Body: #{http_body}"
+
         raise e
       rescue StandardError, SystemExit, Interrupt => e
         raise e

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.666
+  version: 0.4.667
 platform: ruby
 authors:
 - 0day Inc.