fofa 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1266f6e972edc71cf6f3c36c8dca778832d9340
-  data.tar.gz: 9e4c2976d711e4e43dfcd18878e6518434d5a7be
+SHA256:
+  metadata.gz: bfc764bb2b5c3d56f6dfd68ac14a74478a7d19c4e14c72bec35b1d3f547fb7aa
+  data.tar.gz: 8c52a5488290a45f3c074fcdccca99bef75685e91d42fe554268eb886cad36f3
 SHA512:
-  metadata.gz: 077e078e08a70d059fed83f8f92cd425096172c160ab0eab71702eb9026a1328bb812a7b7cb7cbf03f1eb9e239a94258b138513bcb275f26351c088b32d8b36e
-  data.tar.gz: 892e27388b7cb3a1be9de0ec36d8b20c5c0223b1d481432218a61a6beeb86ebfcf9ddd6d464e4fb4e47fcc5994bed1ce9467981031d030ea23ce0874ec408fa9
+  metadata.gz: 67ba297c2bba208e41d01700549cb396de980fb3937e932e01699ee90ce0185d2e9f6daac48fd9366ac919adbc883cd3377686ec5b5fff15e5b44c2ff594e381
+  data.tar.gz: c998095f14e85ceeb262b4f6b3b02c102d3a75dd0d2c0088c6b0402b7e8b968e0311a950261c91c45719d80fb02d3e5910da3106d1c8470dd1ab04eba3eaf03a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.17)
+    fofa (0.3.19)
       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, check_app] 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:"
 
@@ -99,7 +104,7 @@ ARGV.options do |opts|
 
 	opts.on( nil, "--check_app_all", "Check all applications, only used in check_app mode." ) do
 		options[:check_app_all] = true
-	end
+  end
 
 
 
@@ -111,6 +116,8 @@ ARGV.options do |opts|
 	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!
@@ -285,8 +292,48 @@ case options[:mode]
         $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.rb

@@ -157,6 +157,66 @@ module Fofa
       {"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)
+
+      resp = http.request(req)
+      JSON.parse(resp.body)
+    rescue => e
+      $stderr.puts "[WARNING]: #{e.to_s}"
+      {"error"=>"Error: #{e.to_s}"}
+    end
+
     private
     def http_new(uri)
       http = Net::HTTP.new(uri.host, uri.port)

data/lib/fofa/version.rb

@@ -1,3 +1,6 @@
+# 0.3.19
+#   add feature: ip_tags, tag_info
+#
 # 0.3.18
 #   add feature: check applications from file
 #
@@ -31,5 +34,5 @@
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.18"
+  VERSION = "0.3.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - fofa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2020-06-29 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,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: A Ruby library to interact with the FOFA API. https://fofa.so
 test_files: []