fofa 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b78658d768160754f6f32ebd1eb38f9c9a1f90
-  data.tar.gz: 3b9634e71a8b0d1911e3febef7956ab384ccf6a3
+  metadata.gz: 49f7d62fe77e1389d972aa534eeb8e820140edfd
+  data.tar.gz: 7ccb4489b6c43316f1340595203616eb21f96d05
 SHA512:
-  metadata.gz: edc85325d980675819fb60ae281d4286eaf39576c787fb96a8fc5f43093a14a9c1f6c2a2caa788f60d9da45252f7f1653e972b552e0aa626cf78ebb83ac13dee
-  data.tar.gz: 06e0b7ab86fcaa6bd7608d5039cc983baeda3bc7075bbc804deefe3fcf28400d20185ae23160b343a56b453d04be5f6cc6256ab0ac2705b57f0ef47acdf4a6a4
+  metadata.gz: e2efc067981fde4bbeec5b1dcda5ca7148ebab4716c85e4bb017f8a26d3551c719ace01ca85221e1c2bd9e58b1f359de8a434b255721e39772ab82c87f6c6ea3
+  data.tar.gz: e6730bcdf797391f4f6ffd1a4d36f0c8289d3b9167fafaf895183340980055545413251c2763d3fd8c1f77c362555dbe80a4c2bf9e47f3d4e31765eef4e0cde4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.7)
+    fofa (0.3.9)
 
 GEM
   remote: https://rubygems.org/

data/bin/fofacli

@@ -15,7 +15,9 @@ options = {
 	split_size: 100,
   size_per_page: 100,
 	limit: 1000,
-  fields: 'host'
+  fields: 'host',
+  post: false,
+  query: nil
 }
 
 ARGV.options do |opts|
@@ -48,28 +50,40 @@ ARGV.options do |opts|
 		options[:limit] = val.to_i
   end
 
-  opts.on('-s', '--limit=SIZE', Integer, "Limit size to fetch, default to #{options[:limit]}") do |val|
-    options[:limit] = val.to_i
-  end
-
 	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('-d', '--fields=FIELDS', String, "Fields to return, split with ',', default to #{options[:fields]}") do |val|
 		options[:fields] = val
+  end
+
+	opts.on('-q', '--query_file=FILE_PATH', String, "POST Query file when large search string") do |val|
+		raise "File not exist of #{val}" unless File.exists? val
+    options[:query] = File.read(val).strip
+		options[:post] = true
 	end
 	
 	opts.separator "Common Options:"
+
+	opts.on( nil, "--post", "POST query mode." ) do
+		options[:post] = true
+	end
 	
 	opts.on( "-h", "--help", "Show this message." ) do
 		puts opts
 		exit
-	end
+  end
 
 	opts.on( "-v", "--verbose", "Verbose mode." ) do
 		options[:verbose] = true
-	end
+  end
+
+	opts.separator ""
+	opts.separator "For example:"
+	opts.separator "\t fofacli -e aaa@bbb.com -a xxx domain=\"baidu.com\""
+	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"
 	
 	begin
 		opts.parse!
@@ -97,26 +111,28 @@ end
 
 case options[:mode]
 when :search
-	if ARGV.empty?
+	if ARGV.empty? && !options[:query]
 		puts "Fofa query not specified.".red
 		puts ARGV.options
 		exit -1
 	end
-	query = ARGV.join(' ')
+	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]})
              .search(query, {
                  page:options[:page],
                  size:options[:limit],
-                 fields:options[:fields]
+                 fields:options[:fields],
+								 post:options[:post]
              })
   else
     puts 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]
+                 fields:options[:fields],
+								 post:options[:post]
              })
   end
 
@@ -126,7 +142,7 @@ when :import_service
 		puts ARGV.options
 		exit -1
 	end
-	puts "Import server from '#{options[:file]}'"
+	puts "Import service from '#{options[:file]}'"
 	puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]}).import_service(options[:file], {split_size:options[:split_size], fields:options[:fields]})
 end
 

data/lib/fofa.rb

@@ -27,14 +27,23 @@ module Fofa
   	#   options: (Hash) page(default 1, only fetch one page), size(defualt 100)
   	def search(query, options={})
         options = {page:1, size:100, fields:'host'}.merge(options)
-    		url = "#{@api_server}/api/v1/search/all?key=#{@apikey}&email=#{@email}&q=#{URI.escape(query)}&page=#{options[:page]}&size=#{options[:size]}&fields=#{options[:fields]}"
-    		puts url if @options[:debug]
+
+    		url = "#{@api_server}/api/v1/search/all?key=#{@apikey}&email=#{@email}&page=#{options[:page]}&size=#{options[:size]}&fields=#{options[:fields]}"
+    		url += "&q=#{URI.escape(query)}" unless options[:post]
+        puts url if @options[:debug]
     		uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         if uri.scheme == 'https'
           http.use_ssl = true
         end
-        req = Net::HTTP::Get.new(uri.request_uri)
+
+        if options[:post]
+          req = Net::HTTP::Post.new(uri.request_uri)
+          req.body = query
+        else
+          req = Net::HTTP::Get.new(uri.request_uri)
+        end
+
         resp = http.request(req)
         JSON.parse(resp.body)
     rescue => e
@@ -74,6 +83,7 @@ module Fofa
 
           break if all_res.size >= res['size'].to_i
         else
+          raise res['errmsg'] if res['errmsg']
           break
         end
       end

data/lib/fofa/version.rb

@@ -1,3 +1,6 @@
+# 0.3.9
+#   add post option to fix '414 Request-URI Too Large'
+#
 # 0.3.8
 #   fix N+1 API request to N
 #
@@ -7,5 +10,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

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