fofa 0.4.21 → 0.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba6286e4654e1e55b8b07ba1996edfb64b61139eb9957f03a7e73a35ae93e4a
-  data.tar.gz: 0b0c0daa6a59f9c602b5e72c19cf35f539cef73d0a0609d8090d73dd9ecc1676
+  metadata.gz: e19e36559d8749989cb0c93e56bbcd33ce8c28c5cf1da6923e48206c12b897c3
+  data.tar.gz: a94b322821b82a56ac996701aa199dfd3ebbeb90165fd57226244ac0148be626
 SHA512:
-  metadata.gz: 137d9c7252fd91dff2f6ac7d61f01fa43bca086bb716912c8e694aebaca9817970051708e29726f8c0c16920b7bf11e9b4b66334758ee826b24f5d907b2008fa
-  data.tar.gz: 0716e3e28ce190378a25aae007308d395ee651fa4ac02dd1ba29d36482f084f69b1a298d362dd4180bc7d6d34b7618db49efc2f598c683287977f45ccc9cad27
+  metadata.gz: 1de683c6f0e5a8c9752c4a14ad70dee53da5824ded7e36f32155f2b57e381789038f51a6d661225dfb230573413b03b815a7fc441acfb5d445a0f6489ddb18cc
+  data.tar.gz: 5e23cc12d117ea88456fe1ea15a1f6c177ef780370ffd8420c859af10007fa544c36b7fb07ef26b3fb914082f108e5795d4be00eef98f362982a29df6f2d1e60

data/Gemfile.lock

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

data/bin/fofacli

@@ -19,9 +19,6 @@ options = {
   post: false,
   query: nil,
 	format: 'csv',
-	check_app_category: nil,
-  check_app_application: nil,
-	check_app_all: false,
 	task_id: nil
 }
 
@@ -43,11 +40,11 @@ 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, query_ip_list, check_app, ip_tags] ') do |val|
+	opts.on('-m', '--mode=MODE', String, 'Mode, default to [search], -m should be specified when [import_service, query_ip_list, stats, ip_tags] ') do |val|
 			options[:mode] = val.to_sym
 	end
 
-	opts.on('-f', '--file=FILE', String, 'Used at [import_service, check_app, ip_tags] mode') do |val|
+	opts.on('-f', '--file=FILE', String, 'Used at [import_service, ip_tags] mode') do |val|
 			options[:file] = val
   end
 
@@ -77,16 +74,6 @@ ARGV.options do |opts|
 		options[:post] = true
   end
 
-	opts.on('-l', "--application=APPLICATION", String, "Application to check, only used in check_app mode." ) do |val|
-		options[:check_app_application] = val
-		options[:mode] = :check_app
-  end
-
-	opts.on('-g', "--category=CATEGORY", String, "Category to check, only used in check_app mode." ) do |val|
-		options[:check_app_category] = val
-		options[:mode] = :check_app
-  end
-	
 	opts.separator "Common Options:"
 
 	opts.on( nil, "--post", "POST query mode." ) do
@@ -107,12 +94,6 @@ ARGV.options do |opts|
     exit(0)
 	end
 
-	opts.on( nil, "--check_app_all", "Check all applications, only used in check_app mode." ) do
-		options[:check_app_all] = true
-  end
-
-
-
 	opts.separator ""
 	opts.separator "For example:"
 	opts.separator "\t fofacli -e aaa@bbb.com -a xxx domain=\"baidu.com\""
@@ -120,7 +101,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"
+	opts.separator "\t fofacli -m stats --fields domain app=\"drupal\" | jq"
 	opts.separator "\t fofacli -e aaa@bbb.com -a xxx -m ip_tags -f ./ip.txt"
 	opts.separator "\t fofacli -e aaa@bbb.com -a xxx -m ip_tags -t 1"
 
@@ -259,45 +240,19 @@ case options[:mode]
     } #File
 		pool.shutdown
 		pool.wait_for_termination
-  when :check_app
+  when :stats
 		query = options[:query] || ARGV.join(' ')
 		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
+		res = fofa.stats(query, {
+      fields: options[:fields],
+		})
 
-        }
-      }
-    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
+		if res && res.size>0
+      $stdout.puts Hash[res].to_json
+		else
+			$stderr.puts "[WARNING] No result!"
+		end
 
-    end
 	when :ip_tags
 		fofa = Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
     if options[:task_id]

data/lib/fofa/version.rb

@@ -1,3 +1,6 @@
+# 0.4.22
+#   add state api, remove chech_app api
+#
 # 0.4.21
 #   split result to stdout
 #
@@ -40,5 +43,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.4.21"
+  VERSION = "0.4.22"
 end

data/lib/fofa.rb

@@ -132,21 +132,19 @@ module Fofa
       {"error"=>"Error: #{e.to_s}"}
     end
 
-    # Check applications of asset
+    # Fetch fids from query
     #
     # Example:
-    #   >> Fofa::API.new(email,apikey).checkapp("mail.tsinghua.edu.cn", category:"邮件系统")
+    #   >> Fofa::API.new(email,apikey).stats("domain=baidu.com", fields:"fid")
     #   => ["Coremail"]
     #
     # Arguments:
-    #   host: (String) Category name
-    #   options: (Hash) category: Category name, application: Application name, all: return all applications or break when match first
-    def check_app(host, options={})
-      options = {all:false}.merge(options)
-      url = "#{@api_server}/api/v1/search/checkapp?key=#{@apikey}&email=#{@email}&host=#{host}"
-      url += "&all=#{options[:all]}" if options[:all]
-      url += "&application=#{URI.escape(options[:application])}" if options[:application]
-      url += "&category=#{URI.escape(options[:category])}" if options[:category]
+    #   query: (String) fofa query string
+    #   options: (Hash) fields: can be return multiple fields, like fid,host and so on
+    def stats(query, options={})
+      options = {fields:"fid"}.merge(options)
+      url = "#{@api_server}/api/v1/search/stats?key=#{@apikey}&email=#{@email}&qbase64=#{Base64.encode64(query)}"
+      url += "&fields=#{options[:fields]}" if options[:fields]
       puts url if @options[:debug]
       uri = URI.parse(url)
       http = http_new(uri)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.4.22
 platform: ruby
 authors:
 - fofa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler