fofa 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f386c0c8e54fc37083568c58fd957a8441af9d
-  data.tar.gz: 5794ccb6b38f5a754cbcf5acac65ce81cb2a7add
+  metadata.gz: b606d3c74e7a72421fbed9e71bbfca25c6d6d04f
+  data.tar.gz: 43e5737e0f67c22e92521e7fd33f73b9d46328a0
 SHA512:
-  metadata.gz: 61ade528ad3f6f617b82e97aa2338f9c5b53c6ef095651f075a983ea3a9ee5584bc08da1a3490b0b4c716e3f803fc433830b0c5b9ca14cc52c2874c2b0424878
-  data.tar.gz: 58d8d8bbc89d8fafcc56353dfbe2f9313ce10770932f42e6c3e5fd857d912a8062b3135a6095e32ba21bfd046e1b7b2036aefba4e683895394ca9d61d4a0072f
+  metadata.gz: 2760f21dd6300a39d30e58688c08651390542ceac468fff5b0cebf500f316c761880fc944f143229ad6b8843067c6123afb3444f7d7cf3491505d7aefb17ab85
+  data.tar.gz: 0b8fccd0f3fdd6a47c67714cc366489cfd1330c04c5112021f25deb2b3f32f337192339e39da75a5d1ffab76775b87c9f2146b45a23480eee83ecd4f090325e0

data/.gitignore

@@ -0,0 +1 @@
+# Created by .ignore support plugin (hsz.mobi)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.3)
+    fofa (0.3.4)
 
 GEM
   remote: https://rubygems.org/

data/bin/fofacli

@@ -6,14 +6,15 @@ require "optparse"
 require "colorize"
 
 options = {
-	email: nil,
-	apikey: nil,
+	email: ENV['FOFA_EMAIL'],
+	apikey: ENV['FOFA_KEY'],
 	page: 1,
 	verbose: false,
 	file: nil,
 	mode: :search,
 	split_size: 100,
-	limit: 100
+	limit: 100,
+  fields: 'host'
 }
 
 ARGV.options do |opts|
@@ -23,32 +24,36 @@ ARGV.options do |opts|
 	opts.separator "Specific Options:"
 
 	opts.on('-e', '--email=EMAIL', String, 'Email of fofa user') do |val|
-        options[:email] = val
-    end
+			options[:email] = val
+	end
 
-    opts.on('-a', '--apikey=APIKEY', String, 'APIKEY of fofa user') do |val|
-        options[:apikey] = val
-    end
+	opts.on('-a', '--apikey=APIKEY', String, 'APIKEY of fofa user') do |val|
+			options[:apikey] = val
+	end
 
-    opts.on('-p', '--page=PAGE', Integer, 'Page of query result') do |val|
-        options[:page] = val.to_i
-    end
+	opts.on('-p', '--page=PAGE', Integer, 'Page of query result') do |val|
+			options[:page] = val.to_i
+	end
 
-    opts.on('-m', '--mode=MODE', String, 'Mode, default to [search], -f should be specified when [import_service] ') do |val|
-        options[:mode] = val.to_sym
-    end
+	opts.on('-m', '--mode=MODE', String, 'Mode, default to [search], -m should be specified when [import_service] ') do |val|
+			options[:mode] = val.to_sym
+	end
 
-    opts.on('-f', '--file=FILE', String, 'Used at [import_service] mode') do |val|
-        options[:file] = val
-    end
+	opts.on('-f', '--file=FILE', String, 'Used at [import_service] mode') do |val|
+			options[:file] = val
+	end
 
-		opts.on('-s', '--limit=SIZE', Integer, "Limit size to fetch, default to #{options[:limit]}") do |val|
-			options[:limit] = val.to_i
-		end
+	opts.on('-s', '--limit=SIZE', Integer, "Limit size to fetch, default to #{options[:limit]}") do |val|
+		options[:limit] = val.to_i
+	end
+
+	opts.on('-l', '--split_size=SIZE', Integer, "Used at [import_service] mode, default to #{options[:split_size]}") do |val|
+			options[:split_size] = val.to_i
+	end
 
-    opts.on('-s', '--split_size=SIZE', Integer, "Used at [import_service] mode, default to #{options[:split_size]}") do |val|
-        options[:split_size] = val.to_i
-    end
+	opts.on('-d', '--fields=FIELDS', String, "Fields to return, split with ',', default to #{options[:fields]}") do |val|
+		options[:fields] = val
+	end
 	
 	opts.separator "Common Options:"
 	
@@ -65,8 +70,9 @@ ARGV.options do |opts|
 		opts.parse!
 	rescue OptionParser::InvalidOption => e
 		puts e
-  		options.query += e.args
-	rescue 
+    options.query += e.args
+  rescue => e
+    puts e
 		puts opts
 		exit
 	end
@@ -93,7 +99,7 @@ when :search
 	end
 	query = ARGV.join(' ')
 	puts "Query: '#{query}'"
-	puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]}).search(query, {page:options[:page], size:options[:limit]})
+	puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]}).search(query, {page:options[:page], size:options[:limit], fields:options[:fields]})
 when :import_service
 	unless options[:file]
 		puts "File not specified.".red
@@ -101,6 +107,6 @@ when :import_service
 		exit -1
 	end
 	puts "Import server from '#{options[:file]}'"
-	puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]}).import_service(options[:file], {split_size:options[:split_size]})
+	puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]}).import_service(options[:file], {split_size:options[:split_size], fields:options[:fields]})
 end
 

data/build.sh

@@ -0,0 +1,3 @@
+rm fofa-*.gem
+gem build fofa.gemspec
+gem push fofa-*.gem

data/lib/fofa.rb

@@ -8,22 +8,26 @@ module Fofa
   	def initialize(email, apikey, options={})
   		@options = {debug:false}.merge options
   		@api_server = ENV['FOFA_API_SERVER'] || 'https://fofa.so'
-  		@email = email
-  		@apikey = apikey
+  		@email = email || ENV['FOFA_EMAIL']
+  		@apikey = apikey || ENV['FOFA_KEY']
   	end
 
   	# Search page results from fofa
   	#
-  	# Example:
+  	# Example 1:
   	#   >> Fofa::API.new(email,apikey).search("host==baidu.com")
-  	#   => {size:1, results:['1.1.1.1:80']}
+  	#   => {size:1, results:['1.1.1.1']}
+    #
+    # Example 2:
+    #   >> Fofa::API.new(email,apikey).search("host==baidu.com", fields:'host,title,ip')
+    #   => {size:1, results:[['1.1.1.1:81', 'title', '1.1.1.1']]}
   	#
   	# Arguments:
   	#   query: (String) fofa query string
   	#   options: (Hash) page(default 1, only fetch one page), size(defualt 100)
   	def search(query, options={})
-        options = {page:1,size:100}.merge(options)
-    		url = "#{@api_server}/api/v1/search/all?key=#{@apikey}&email=#{@email}&q=#{URI.escape(query)}&page=#{options[:page]}&size=#{options[:size]}"
+        options = {page:1, size:100, fields:'host'}.merge(options)
+    		url = "#{@api_server}/api/v1/search/all?key=#{@apikey}&email=#{@email}&q=#{URI.escape(query)}&page=#{options[:page]}&size=#{options[:size]}&fields=#{options[:fields]}"
     		puts url if @options[:debug]
     		uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)

data/lib/fofa/version.rb

@@ -1,3 +1,5 @@
+# 0.3.5
+#   add fields
 module Fofa
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - fofa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -69,6 +70,7 @@ files:
 - bin/console
 - bin/fofacli
 - bin/setup
+- build.sh
 - fofa.gemspec
 - lib/fofa.rb
 - lib/fofa/version.rb
@@ -92,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby library to interact with the FOFA API. https://fofa.so