pwn 0.4.473 → 0.4.476

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800a4481ec352e62a264e69979b18283eac032c9b4b4fa34a8785a6dd046bc7c
-  data.tar.gz: ee5c3d0a5bf0ef7347ea27cd54fd4ebd851039509e94b6ae3464bd28100126ef
+  metadata.gz: 8ef8af0c110613df805e43c7194ba3c2583c7e18b1d6c0a214f693a3d8b5d8f8
+  data.tar.gz: 646b090115b4f9180d26f14222d1fea8ad57b31b083e38ae71ffeaa44aa62273
 SHA512:
-  metadata.gz: 1a6784dc075ec9dabae9bea756f0cbd16fea0494a5445e09a9cf7402aa652f207ee140430c1dc9c689bffdbb62ec1983cc9cca2bb5b6aa366fe4b52cfa60bccd
-  data.tar.gz: 5115ddcd05d4c3a2526727386e6b0a53a9fb8f5155dc4495d4e473bc7372517611d17fd06b9229a330c1cee907a7683b5a309c78e51c07339ef68a14c3dda30f
+  metadata.gz: cab4b7f4c5a4e4c1b03a4f2d79ab502a9a4472589631485b3022ef59396d75b143f4c58b9e82a78f508f00cabe4108f218edc95483f67ae992f31f3965d5d4e5
+  data.tar.gz: 2fc157515f103b9869314c6fead5d88c5de7464e472ef2555e29d97f38558f0c2962ec4ac7166e7d8654e2be75bdbf85e08ee3d09f18e4c186c6c96959b8c51a

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

data/bin/pwn_shodan_search

@@ -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)
+
+      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.to_json)
 rescue SystemExit, Interrupt
   puts "\nGoodbye."
 end

data/lib/pwn/version.rb

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

metadata

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