fofa 0.3.17 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c547727d9ed816e3d644f0416cc146bf6e856914
-  data.tar.gz: 4b972ee2dc95eefadfe1233d4ab01cd912c790d1
+SHA256:
+  metadata.gz: 4ba6286e4654e1e55b8b07ba1996edfb64b61139eb9957f03a7e73a35ae93e4a
+  data.tar.gz: 0b0c0daa6a59f9c602b5e72c19cf35f539cef73d0a0609d8090d73dd9ecc1676
 SHA512:
-  metadata.gz: e3650e6c08280779282fd7865c912d9e2ec152ca3b8aea318e43f7a6e70014ca32308b7a38de9a45edb2b9e27434dc74fba6c9d2811f05648aea9ba7acff7863
-  data.tar.gz: 2e919a75409e0c1a6fc7ee1eba8f9c094f630c061eaabbfa2d84e56519efe98c9583040177503eb48a701f9bf18c913c0419c5d77908c4249a28a05cba5a79b3
+  metadata.gz: 137d9c7252fd91dff2f6ac7d61f01fa43bca086bb716912c8e694aebaca9817970051708e29726f8c0c16920b7bf11e9b4b66334758ee826b24f5d907b2008fa
+  data.tar.gz: 0716e3e28ce190378a25aae007308d395ee651fa4ac02dd1ba29d36482f084f69b1a298d362dd4180bc7d6d34b7618db49efc2f598c683287977f45ccc9cad27

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.16)
+    fofa (0.4.20)
       colorize
       concurrent-ruby
 
@@ -38,4 +38,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.15.1
+   1.16.4

data/bin/fofacli

@@ -21,7 +21,8 @@ options = {
 	format: 'csv',
 	check_app_category: nil,
   check_app_application: nil,
-	check_app_all: false
+	check_app_all: false,
+	task_id: nil
 }
 
 ARGV.options do |opts|
@@ -42,12 +43,16 @@ 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] ') do |val|
+	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|
 			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, ip_tags] mode') do |val|
 			options[:file] = val
+  end
+
+	opts.on('-t', '--task_id=ID', Integer, 'Used at [ip_tags] mode') do |val|
+		options[:task_id] = val.to_i
 	end
 
 	opts.on('-s', '--limit=SIZE', Integer, "Limit size to fetch, default to #{options[:limit]}") do |val|
@@ -80,7 +85,7 @@ ARGV.options do |opts|
 	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
+  end
 	
 	opts.separator "Common Options:"
 
@@ -97,9 +102,14 @@ ARGV.options do |opts|
 		options[:verbose] = true
   end
 
+	opts.on( "-V", "--version", "Display version" ) do
+    puts "Version: #{Fofa::VERSION}"
+    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
+  end
 
 
 
@@ -110,6 +120,9 @@ 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 -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"
 
 	begin
 		opts.parse!
@@ -139,17 +152,17 @@ def log_record(options, r)
 	case options[:format]
 		when 'json'
 			if r.kind_of?(Array)
-				puts Hash[options[:fields].split(',').zip r].to_json
+				STDOUT.puts Hash[options[:fields].split(',').zip r].to_json
 			elsif r.kind_of?(Hash)
-				puts r.to_json
+				STDOUT.puts r.to_json
 			else
-				puts %Q|{"id":"#{r}"}|
+				STDOUT.puts %Q|{"id":"#{r}"}|
 			end
     when 'csv'
       if r.kind_of?(Array)
-			  puts r.map{|v| v}.join("\t")
+				STDOUT.puts r.map{|v| v}.join("\t")
       else
-        puts r
+				STDOUT.puts r
       end
 
 	end
@@ -163,7 +176,7 @@ case options[:mode]
 			exit -1
 		end
 		query = options[:query] || ARGV.join(' ')
-		puts "Query: '#{query}'"
+		STDERR.puts "Query: '#{query}'"
 		if options[:page] #search one page
 			Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
 							 .search(query, {
@@ -205,7 +218,7 @@ case options[:mode]
 		require 'concurrent'
 		semaphore = Concurrent::Semaphore.new(1)
 		pool = Concurrent::FixedThreadPool.new(10)
-    $stdout.sync = true
+    $STDOUT.sync = true
     File.open(options[:file]){|f|
       fields = options[:fields].split(',')
       f.each_line{|line|
@@ -248,16 +261,84 @@ 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
+	when :ip_tags
+		fofa = Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
+    if options[:task_id]
+			task_id = options[:task_id]
+    else
+			unless options[:file]
+				puts "File not specified.".red
+				puts ARGV.options
+				exit -1
+			end
+			puts "Import ip and get tags from '#{options[:file]}'"
+			result = fofa.ip_tags(options[:file])
+			if result['error']
+				puts result
+				exit -1
+      end
+			puts result
+			task_id = result['task_id']
+    end
+
+    if task_id
+      get_info = -> (fofa, id) { fofa.tag_info(id) }
+      puts "Checking progress!"
+      sleep(2)
+
+      loop do
+				info = get_info.call(fofa, task_id)
+				if info['error']
+					puts info
+					break
+        elsif info['progress'].to_i == 100
+					puts "state: #{info['state']}; progress: #{info['progress']}."
+					puts info['download_url']
+					break
+        else
+          puts "state: #{info['state']}; progress: #{info['progress']}."
+          sleep(10)
+				end
+      end
+
+    end
 
 end
 

data/lib/fofa/version.rb

@@ -1,3 +1,15 @@
+# 0.4.21
+#   split result to stdout
+#
+# 0.4.20
+#   add -V option, and ip_tags method need to upgrade major version
+#
+# 0.3.19
+#   add feature: ip_tags, tag_info
+#
+# 0.3.18
+#   add feature: check applications from file
+#
 # 0.3.17
 #   add checkapp api call
 #
@@ -28,5 +40,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.17"
+  VERSION = "0.4.21"
 end

data/lib/fofa.rb

@@ -153,31 +153,67 @@ module Fofa
       req = Net::HTTP::Get.new(uri.request_uri)
       resp = http.request(req)
       JSON.parse(resp.body)
+    rescue => e
+      {"error"=>"Error: #{e.to_s}"}
+    end
+
+    # Import ip and get tags
+    #
+    # Example:
+    #   >> Fofa::API.new(email,apikey).ip_tags('./ips.txt')
+    #   => {"task_id"=>1}
+    #
+    # Arguments:
+    #   file: (String) ip file
+    def ip_tags(file)
+      url = "#{@api_server}/api/v1/ip_tags?key=#{@apikey}&email=#{@email}"
+      puts url if @options[:debug]
+
+      # Token used to terminate the file in the post body. Make sure it is not
+      # present in the file you're uploading.
+      # You might want to use `SecureRandom` class to generate this random strings
+      boundary = "AaB03x"
+      uri = URI.parse(url)
+
+      post_body = []
+      post_body << "--#{boundary}\r\n"
+      post_body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{File.basename(file)}\"\r\n"
+      post_body << "Content-Type: text/plain\r\n"
+      post_body << "\r\n"
+      post_body << File.read(file)
+      post_body << "\r\n--#{boundary}--\r\n"
+
+      http = http_new(uri)
+      req = Net::HTTP::Post.new(uri.request_uri)
+      req.body = post_body.join
+      req["Content-Type"] = "multipart/form-data, boundary=#{boundary}"
+
+      resp = http.request(req)
+      puts resp if @options[:debug]
+      JSON.parse(resp.body)
+    rescue => e
+      {"error"=>"Error: #{e.to_s}"}
+    end
+
+    # Check ip_tags's task state, progress, and download_url
+    #
+    # Example:
+    #   >> Fofa::API.new(email,apikey).tag_info(1)
+    #   => {"state"=>"success", "progress"=>100, "download_url"=>"https://host/xxx/56af409c1c55762a7b9e9a39a801f80d.json"}
+    #
+    # Arguments:
+    #   task_id: (Integer) task id
+    def tag_info(task_id)
+      url = "#{@api_server}/api/v1/ip_tags/info?key=#{@apikey}&email=#{@email}&task_id=#{task_id}"
+      puts url if @options[:debug]
+      uri = URI.parse(url)
+      http = http_new(uri)
+      req = Net::HTTP::Get.new(uri.request_uri)
 
-      # 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
+      resp = http.request(req)
+      JSON.parse(resp.body)
     rescue => e
+      $stderr.puts "[WARNING]: #{e.to_s}"
       {"error"=>"Error: #{e.to_s}"}
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.4.21
 platform: ruby
 authors:
 - fofa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,7 @@ homepage: https://fofa.so
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.7
+signing_key:
 specification_version: 4
 summary: A Ruby library to interact with the FOFA API. https://fofa.so
 test_files: []