fofa 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c81fe840d8bb06a94f9eef98e78a64fe6123ec
-  data.tar.gz: fb125f15801160dfb5913a28c5d5c35967fd03ea
+  metadata.gz: 87d0a961aecc981843e098178b7c3fc2c70c14f7
+  data.tar.gz: 10df9f621ee857e19eb9a31ea5c488fe71895135
 SHA512:
-  metadata.gz: 38c5abf1d39213086b456c12d3cd2d0cd9375bf9f07710001f684142f2f41603ed45d8707c9b0f2680d0abea4c38ba64d86237d41f6b3c31c42357a626481a96
-  data.tar.gz: a4234c0480d8b7c92c91cecf21aeaa5feabb08f1abc1c45f1c3c311c20b3431dbeb9b8a42ae69aa6de0c552a7becc738eccc60dd18b55825d1ee82228fe1ceb5
+  metadata.gz: 4c2eaf481b20f662ecac532f950c866ca7fc11d966e4a8b067ad67faca035e08d305923c6ad3a5c85025f3da7d3afc247b91461d4cbb2590cc126f26f28034b2
+  data.tar.gz: f639fd08740c4df9bcece0443a4b802d9d8df01de17c5136abe4c9fdf4b1a5b6bb09e7c6f04c3c4bd9ddd6127df39ff5aa67e98de72d550f7cf4aefc81193028

data/bin/fofacli

@@ -17,7 +17,8 @@ options = {
 	limit: 1000,
   fields: 'host',
   post: false,
-  query: nil
+  query: nil,
+	format: 'csv'
 }
 
 ARGV.options do |opts|
@@ -52,6 +53,10 @@ ARGV.options do |opts|
 
 	opts.on(nil, '--size_per_page=SIZE', Integer, "API fetch size per page, default to #{options[:size_per_page]}") do |val|
 			options[:size_per_page] = val.to_i
+  end
+
+	opts.on('-o', '--output-format=FORMAT', String, "Format of output, default to #{options[:format]}, can be csv or json") do |val|
+		options[:format] = val
 	end
 
 	opts.on('-d', '--fields=FIELDS', String, "Fields to return, split with ',', default to #{options[:fields]}") do |val|
@@ -110,6 +115,21 @@ unless options[:apikey]
 	exit -1
 end
 
+def log_record(options, r)
+	case options[:format]
+		when 'json'
+			if r.kind_of?(Array)
+				puts Hash[options[:fields].split(',').zip r].to_json
+			elsif r.kind_of?(Hash)
+				puts r.to_json
+			else
+				puts %Q|{"id":"#{r}"}|
+			end
+		when 'csv'
+			puts r.map{|v| v}.join("\t")
+	end
+end
+
 case options[:mode]
 	when :search
 		if ARGV.empty? && !options[:query]
@@ -120,21 +140,25 @@ case options[:mode]
 		query = options[:query] || ARGV.join(' ')
 		puts "Query: '#{query}'"
 		if options[:page] #search one page
-			puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
+			Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
 							 .search(query, {
 									 page:options[:page],
 									 size:options[:limit],
 									 fields:options[:fields],
 									 post:options[:post]
-							 })
+							 }).each{|r|
+        log_record(options, r)
+      }
 		else
-			puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
+			Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
 							 .search_all(query, {
 									 size:options[:limit],
 									 page_size:options[:size_per_page],
 									 fields:options[:fields],
 									 post:options[:post]
-							 })
+							 }).each{|r|
+				log_record(options, r)
+			}
 		end
 
 	when :import_service
@@ -189,7 +213,7 @@ case options[:mode]
 							ip_hash.delete(k) if v.size==0
 						}
 						semaphore.acquire
-            puts ip_hash.to_json
+						log_record(options, ip_hash)
 						semaphore.release
 					end
 				end

data/lib/fofa/version.rb

@@ -1,3 +1,6 @@
+# 0.3.12
+#   fofacli add -o --output-format option, support csv(defualt) and json
+#
 # 0.3.10
 #   add query_ip_list mode
 #
@@ -13,5 +16,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - fofa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A Ruby library to interact with the FOFA API. https://fofa.so