fofa 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c547727d9ed816e3d644f0416cc146bf6e856914
-  data.tar.gz: 4b972ee2dc95eefadfe1233d4ab01cd912c790d1
+  metadata.gz: d1266f6e972edc71cf6f3c36c8dca778832d9340
+  data.tar.gz: 9e4c2976d711e4e43dfcd18878e6518434d5a7be
 SHA512:
-  metadata.gz: e3650e6c08280779282fd7865c912d9e2ec152ca3b8aea318e43f7a6e70014ca32308b7a38de9a45edb2b9e27434dc74fba6c9d2811f05648aea9ba7acff7863
-  data.tar.gz: 2e919a75409e0c1a6fc7ee1eba8f9c094f630c061eaabbfa2d84e56519efe98c9583040177503eb48a701f9bf18c913c0419c5d77908c4249a28a05cba5a79b3
+  metadata.gz: 077e078e08a70d059fed83f8f92cd425096172c160ab0eab71702eb9026a1328bb812a7b7cb7cbf03f1eb9e239a94258b138513bcb275f26351c088b32d8b36e
+  data.tar.gz: 892e27388b7cb3a1be9de0ec36d8b20c5c0223b1d481432218a61a6beeb86ebfcf9ddd6d464e4fb4e47fcc5994bed1ce9467981031d030ea23ce0874ec408fa9

data/Gemfile.lock

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

data/bin/fofacli

@@ -46,7 +46,7 @@ ARGV.options do |opts|
 			options[:mode] = val.to_sym
 	end
 
-	opts.on('-f', '--file=FILE', String, 'Used at [import_service] mode') do |val|
+	opts.on('-f', '--file=FILE', String, 'Used at [import_service, check_app] mode') do |val|
 			options[:file] = val
 	end
 
@@ -110,6 +110,7 @@ ARGV.options do |opts|
 	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"' -- {}@
+	opts.separator "\t fofacli -m check_app --app \"Coremail\" mail.tsinghua.edu.cn"
 
 	begin
 		opts.parse!
@@ -248,16 +249,44 @@ case options[:mode]
 		pool.wait_for_termination
   when :check_app
 		query = options[:query] || ARGV.join(' ')
-		res = Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
-				.check_app(query, {
-						category:options[:check_app_category],
-						application:options[:check_app_application],
-						all:options[:all],
-				})
-
-		res.each{|r|
-			log_record(options, r)
-		}
+		fofa = Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
+		if options[:file]
+			File.open(options[:file]){|f|
+        f.each_line{|line|
+					query = line.strip
+					res = fofa.check_app(query, {
+							category:options[:check_app_category],
+							application:options[:check_app_application],
+							all:options[:all],
+					})
+
+          if res && res.size>0
+						res.each{|r|
+							log_record(options, [query, r])
+						}
+          else
+						log_record(options, [query, nil])
+          end
+
+        }
+      }
+    else
+			res = fofa.check_app(query, {
+					category:options[:check_app_category],
+					application:options[:check_app_application],
+					all:options[:all],
+			})
+
+			if res && res.size>0
+				res.each{|r|
+					log_record(options, r)
+				}
+      else
+        $stderr.puts "[WARNING] No result!"
+      end
+
+    end
+
 
 end
 

data/lib/fofa.rb

@@ -153,30 +153,6 @@ module Fofa
       req = Net::HTTP::Get.new(uri.request_uri)
       resp = http.request(req)
       JSON.parse(resp.body)
-
-      # File.open(file) do |f|
-      #   results = []
-      #   f.each_line.lazy.each_with_index do |line, i|
-      #
-      #     line = line.strip
-      #     if m = /Discovered open port (?<port>.*?)\/tcp on (?<host>.*?)$/.match(line)
-      #       hostinfo = "#{m[:host]}:#{m[:port]}"
-      #     elsif line.include?(':')
-      #       hostinfo = line
-      #     else
-      #       hostinfo = "#{line}:#{options[:port]}"
-      #     end
-      #
-      #     results << line
-      #     if i % split_size == 0
-      #       req = Net::HTTP::Post.new(uri.request_uri)
-      #       req.body = results.join("\n")
-      #       resp = http.request(req)
-      #       puts resp if @options[:debug]
-      #       results = []
-      #     end
-      #   end
-      # end
     rescue => e
       {"error"=>"Error: #{e.to_s}"}
     end

data/lib/fofa/version.rb

@@ -1,3 +1,6 @@
+# 0.3.18
+#   add feature: check applications from file
+#
 # 0.3.17
 #   add checkapp api call
 #
@@ -28,5 +31,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.17"
+  VERSION = "0.3.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - fofa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler