pwn 0.4.472 → 0.4.475

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79226d5832fb6d629db612d4a2f44e02c27ae32ddbfdd41722feca31cfb13b7c
-  data.tar.gz: d1116586791753444e1d60d46efe5f4f8d099fd40d4397e4f045943fb41dce23
+  metadata.gz: 73e46f9f5d11b3a1678cc2b01ff31932ab1086a6bb950f4401c5b60f4379a018
+  data.tar.gz: a4a54c020973d8b83e8692193ad5e3fcc3f0500dc8cf5967d10eaddcbfdc221a
 SHA512:
-  metadata.gz: 23b26a6bbb579a707b948ea8bec858089e6a5dce7df26c8920946e6bc4637762cc71e8e03aa013d96ec9ad4fc35a497d4323b4fe006f5e50615e0093b6a279dd
-  data.tar.gz: 072f7811b42f425ef8a56fc120d64f6132df02408a19fa6229d725595464fe7a585db4bc9563c382a35ac5b083cc77f6df0017db466afaef86a2a99f147d5780
+  metadata.gz: 65c2271c0947f84645a6d25f981aa40cb5243bc56387fd9694925911c281745d51e264de03638003d745335a80a4e73212ad4e448115915b71a2c6a707cf63e5
+  data.tar.gz: 33fda34f85dc4e1155d527452f6d7dec225ce85cd81018ece1fb7a7496236cde8bcacfe32ea1c1f6ade513c3aef0df9569be146621049be6fb3c50ef0230e078

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.1.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.472]:001 >>> PWN.help
+pwn[v0.4.475]: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.1.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.472]:001 >>> PWN.help
+pwn[v0.4.475]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_shodan_search

@@ -12,7 +12,7 @@ OptionParser.new do |options|
     #{$PROGRAM_NAME} [opts]
   "
 
-  options.on('-c', '--config-yaml', '<Required - YAML config containing api_key from Shodan.io>') do |y|
+  options.on('-cYAML', '--config-yaml=YAML', '<Required - YAML config containing api_key from Shodan.io>') do |y|
     opts[:yaml] = y
   end
 
@@ -45,33 +45,35 @@ begin
 
   timestamp = Time.now.strftime('%Y-%m-%d.%H:%M:%S')
   query_results_file = opts[:output_results_file]
-  query_results_file ||= "/tmp/shodan-results-#{timestamp}.txt"
-  query_results_dir = File.dirname(query_results_file)
+  query_results_file ||= "/tmp/shodan-results-#{timestamp}"
 
-  raw_query_results_file = "#{query_results_dir}/shodan-results-#{timestamp}-RAW.json"
-  File.open(raw_query_results_file, 'w') do |r|
-    File.open(query_results_file, 'w') do |f|
-      queries.each do |query_line|
-        query = query_line.chomp
-        print "QUERY: '#{query}'"
-        r.puts("QUERY: '#{query}'")
-        f.puts("QUERY: '#{query}'")
-        search_results = PWN::Plugins::Shodan.search(
-          api_key: api_key,
-          query: query
-        )
-        puts " >>> Matches: #{search_results[:total]}"
-        r.puts search_results.to_json
+  raw_query_results_file = "#{query_results_file}-RAW.json"
+  raw_results_arr = []
+  File.open(query_results_file, 'w') do |f|
+    queries.each do |query_line|
+      query = query_line.chomp
+      print "QUERY: '#{query}'"
+      f.puts("QUERY: '#{query}'")
+      search_results = PWN::Plugins::Shodan.search(
+        api_key: api_key,
+        query: query
+      )
+      puts " >>> Matches: #{search_results[:total]}"
 
-        search_results[:matches].select do |m|
-          f.puts "ORG: #{m[:org]} | PUBIP: #{m[:ip_str]} #{'*' * 36}"
-          f.puts "Product: #{m[:product]}"
-          f.puts "TCP Port: #{m[:port]}"
-          f.puts "Data: #{m[:data]}\n\n\n"
-        end
+      raw_results = {}
+      raw_results[:query] = query
+      raw_results[:results] = search_results
+      raw_results_arr.push(raw_results.to_json)
+
+      search_results[:matches].select do |m|
+        f.puts "ORG: #{m[:org]} | PUBIP: #{m[:ip_str]} #{'*' * 36}"
+        f.puts "Product: #{m[:product]}"
+        f.puts "TCP Port: #{m[:port]}"
+        f.puts "Data: #{m[:data]}\n\n\n"
       end
     end
   end
+  File.write(raw_query_results_file, raw_results_arr)
 rescue SystemExit, Interrupt
   puts "\nGoodbye."
 end

data/lib/pwn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.472
+  version: 0.4.475
 platform: ruby
 authors:
 - 0day Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport