fofa 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d0a961aecc981843e098178b7c3fc2c70c14f7
-  data.tar.gz: 10df9f621ee857e19eb9a31ea5c488fe71895135
+  metadata.gz: 46230a00b448e0d6fa729755b2d1b3c03c5450c5
+  data.tar.gz: 7841106b219d240133f9741f4618df11349dcede
 SHA512:
-  metadata.gz: 4c2eaf481b20f662ecac532f950c866ca7fc11d966e4a8b067ad67faca035e08d305923c6ad3a5c85025f3da7d3afc247b91461d4cbb2590cc126f26f28034b2
-  data.tar.gz: f639fd08740c4df9bcece0443a4b802d9d8df01de17c5136abe4c9fdf4b1a5b6bb09e7c6f04c3c4bd9ddd6127df39ff5aa67e98de72d550f7cf4aefc81193028
+  metadata.gz: d758ac844158fb49512e24c36587c4ff22562c5ddf33d7f5fa028d383b2dcc8d79262937917cdafe56b6481273857d98129a8ede3335072dadf04e0e494127da
+  data.tar.gz: 935ca8c4e45adf3835057f0a6bda9050e9049686ec7971de51b90e9a5e76e95207b529d299c5177b282268695c6a9b8baf97013c8a1052b4bf2183224d8dd72f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.11)
+    fofa (0.3.12)
       colorize
       concurrent-ruby
 

data/bin/fofacli

@@ -90,6 +90,7 @@ ARGV.options do |opts|
 	opts.separator "\t fofacli -e aaa@bbb.com -a xxx -s 100 domain=\"baidu.com\""
 	opts.separator "\t fofacli -e aaa@bbb.com -a xxx --query_file /tmp/fofaquery"
 	opts.separator "\t fofacli -e aaa@bbb.com -a xxx -d ip,domain,title,port,protocol -m query_ip_list -f ip.txt"
+	opts.separator %Q@\t cat vapps.txt | xargs -I{} -n 1 sh -c 'fofacli "app=$1" -d host,ip,port,country,province,city -s 1000 -o json -v > "$1.txt"' -- {}@
 	
 	begin
 		opts.parse!
@@ -125,8 +126,13 @@ def log_record(options, r)
 			else
 				puts %Q|{"id":"#{r}"}|
 			end
-		when 'csv'
-			puts r.map{|v| v}.join("\t")
+    when 'csv'
+      if r.kind_of?(Array)
+			  puts r.map{|v| v}.join("\t")
+      else
+        puts r
+      end
+
 	end
 end
 

data/lib/fofa.rb

@@ -74,7 +74,7 @@ module Fofa
         res = search(query, {page:page}.merge(options))
         if !res['error'] && res['results'].size > 0
           all_res += res['results']
-          yield(res['results'], page) if block_given?
+          yield(res['results'], page, res['size'].to_i) if block_given?
 
           if all_size && all_res.size > all_size.to_i
             all_res = all_res[0..all_size-1]

data/lib/fofa/version.rb

@@ -1,3 +1,6 @@
+# 0.3.13
+#   search_all yield with all size
+#
 # 0.3.12
 #   fofacli add -o --output-format option, support csv(defualt) and json
 #
@@ -16,5 +19,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - fofa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler