fofa 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f7d62fe77e1389d972aa534eeb8e820140edfd
-  data.tar.gz: 7ccb4489b6c43316f1340595203616eb21f96d05
+  metadata.gz: ec762cac0cbe6e4e4ee3870f74c23bd428c57ceb
+  data.tar.gz: ea73a0e0ba7d6739966f10b4d67ab5a7a65a9017
 SHA512:
-  metadata.gz: e2efc067981fde4bbeec5b1dcda5ca7148ebab4716c85e4bb017f8a26d3551c719ace01ca85221e1c2bd9e58b1f359de8a434b255721e39772ab82c87f6c6ea3
-  data.tar.gz: e6730bcdf797391f4f6ffd1a4d36f0c8289d3b9167fafaf895183340980055545413251c2763d3fd8c1f77c362555dbe80a4c2bf9e47f3d4e31765eef4e0cde4
+  metadata.gz: 6f4dc47c12e9a2e667a72c7110199da7309174024c18fe794294527340205338e26f7bbf5a275c8a38387ff1af12ca10fb455b6e2518b89e700a8fa5f8232c80
+  data.tar.gz: 325524afc95a5713f61ace3cbd2b7f5d6837d82e36c39d538d7336a9e5a8797432deca8b4d9decf6a4c333ad3108f74ee8d790de4f6335fee1527887bca326f9

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in fofa.gemspec
 gemspec
 
-gem 'colorize'
+gem 'colorize'
+gem 'concurrent-ruby'

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.9)
+    fofa (0.3.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     colorize (0.8.1)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.2.5)
     rake (10.5.0)
     rspec (3.5.0)
@@ -29,6 +30,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.12)
   colorize
+  concurrent-ruby
   fofa!
   rake (~> 10.0)
   rspec (~> 3.0)

data/bin/fofacli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "fofa"
+require_relative "../lib/fofa"
 require "optparse"
 require "colorize"
 
@@ -38,7 +38,7 @@ ARGV.options do |opts|
 			options[:page] = val.to_i
 	end
 
-	opts.on('-m', '--mode=MODE', String, 'Mode, default to [search], -m should be specified when [import_service] ') do |val|
+	opts.on('-m', '--mode=MODE', String, 'Mode, default to [search], -m should be specified when [import_service, query_ip_list] ') do |val|
 			options[:mode] = val.to_sym
 	end
 
@@ -84,6 +84,7 @@ ARGV.options do |opts|
 	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"
+	opts.separator "\t fofacli -e aaa@bbb.com -a xxx -d ip,domain,title,port,protocol -m query_ip_list -f ip.txt"
 	
 	begin
 		opts.parse!
@@ -110,39 +111,91 @@ unless options[:apikey]
 end
 
 case options[:mode]
-when :search
-	if ARGV.empty? && !options[:query]
-		puts "Fofa query not specified.".red
-		puts ARGV.options
-		exit -1
-	end
-	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],
-								 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],
-								 post:options[:post]
-             })
-  end
-
-when :import_service
-	unless options[:file]
-		puts "File not specified.".red
-		puts ARGV.options
-		exit -1
-	end
-	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]})
+	when :search
+		if ARGV.empty? && !options[:query]
+			puts "Fofa query not specified.".red
+			puts ARGV.options
+			exit -1
+		end
+		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],
+									 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],
+									 post:options[:post]
+							 })
+		end
+
+	when :import_service
+		unless options[:file]
+			puts "File not specified.".red
+			puts ARGV.options
+			exit -1
+		end
+		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]})
+  when :query_ip_list
+		unless options[:file]
+			puts "File not specified.".red
+			puts ARGV.options
+			exit -1
+    end
+		puts "Query information from '#{options[:file]}'"
+		fofa = Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
+		require 'concurrent'
+		semaphore = Concurrent::Semaphore.new(1)
+		pool = Concurrent::FixedThreadPool.new(10)
+    $stdout.sync = true
+    File.open(options[:file]){|f|
+      fields = options[:fields].split(',')
+      f.each_line{|line|
+				pool.post do
+					ip = line.strip
+					ip_hash = {'obj'=>ip, 'exists'=>false}
+					fields.each{|key|
+						ip_hash[key] = []
+					}
+					fofa.search_all(%Q|ip="#{ip}"|, {
+							size:options[:limit],
+							page_size:options[:size_per_page],
+							fields:options[:fields],
+							post:options[:post]
+					}).each{|a|
+						ip_hash['exists'] = true
+						a.each_with_index { |value, index|
+							if value && value.size>0
+								unless (fields[index] == 'domain' && value=~/\d*\.\d*\.\d*\.\d*/)
+									ip_hash[fields[index]] << value
+									ip_hash[fields[index]].uniq!
+								end
+
+							end
+						}
+					}
+					if ip_hash['exists']
+						ip_hash.delete('exists')
+						ip_hash.each{|k,v|
+							ip_hash.delete(k) if v.size==0
+						}
+						semaphore.acquire
+            puts ip_hash.to_json
+						semaphore.release
+					end
+				end
+      }
+    } #File
+		pool.shutdown
+		pool.wait_for_termination
 end
 

data/lib/fofa/version.rb

@@ -1,3 +1,6 @@
+# 0.3.10
+#   add query_ip_list mode
+#
 # 0.3.9
 #   add post option to fix '414 Request-URI Too Large'
 #
@@ -10,5 +13,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

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