intrigue_api_client 1.2.1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3147774f9cc7bca2a2645b1daeeabb4ec01ff203
-  data.tar.gz: af53daf2a1e68616a2527243e0bdb5b79ce7ec52
+  metadata.gz: 8991b5360d09dddedc617f5bad8045366bf10390
+  data.tar.gz: 9ae6d67e2f361eac8a9a6e70dc78678aafb0de4e
 SHA512:
-  metadata.gz: e223ecfe1d3c04147f0aa31f0c6da6211f75f2de5cee64a205cccc11d79c1077e225572cbadc04cf87c8c90bb5f4ac6f999d715edc39c2ee09937134e3fef743
-  data.tar.gz: 1629e543d8203c531e65894092756437c5fe5c2d5bc5d4760a61ec83f56c39a4dcb6161208d9979ce1eba4cbf5254ba16d830c8302bac53bcf385acc75193c66
+  metadata.gz: 1fc13fb3ad3c4fa38c10634aace5b4260ea10bcb6d11ab56ddaecb5715502776108c9c98a4e2896b697234cec383daa15afe7a433214651b6565afa9d9427e6d
+  data.tar.gz: 988996a44ad909f85b160b3f421f435b0bf14c5dc27c98870badde1b3af542d68ada233b88f2907f9a275301baf7407f940c06e51a69d68abee4ca50bf603847

data/lib/intrigue_api_client.rb

@@ -4,6 +4,10 @@ require 'rest_client'
 
 class IntrigueApi
 
+    def self.version
+      "1.2.4"
+    end
+
     def initialize(uri="http://127.0.0.1:7777/v1",key="")
       @intrigue_basedir = File.dirname(__FILE__)
       @server_uri = uri
@@ -24,16 +28,24 @@ class IntrigueApi
       RestClient.post "#{@server_uri}/project", { "project" => project_name }
     end
 
+    def background(project_name,task_name,entity_hash,depth=1,options_list=nil,handler_list=nil, strategy_name=nil, auto_enrich=true)
+      # Construct the request
+      task_id = _start_and_background(project_name,task_name,entity_hash,depth,options_list,handler_list, strategy_name, auto_enrich)
+    end
+
+
     # Start a task and wait for the result
-    def start(project_name,task_name,entity_hash,depth=1,options_list=nil,handler_list=nil, strategy_name="disovery")
+    def start(project_name,task_name,entity_hash,depth=1,options_list=nil,handler_list=nil, strategy_name=nil, auto_enrich=true)
 
       # Construct the request
-      task_id = _start_and_background(project_name,task_name,entity_hash,depth,options_list,handler_list, strategy_name)
+      task_id = _start_and_background(project_name,task_name,entity_hash,depth,options_list,handler_list, strategy_name, auto_enrich)
 
       if task_id == "" # technically a nil is returned , but becomes an empty string
         #puts "[-] Task not started. Unknown Error. Exiting"
-        #raise "Problem getting result"
+        raise "Problem getting result"
         return nil
+      else
+        #puts "[+] Got Task ID: #{task_id}"
       end
 
       ### XXX - wait to collect the response
@@ -41,21 +53,21 @@ class IntrigueApi
       until complete
         sleep 1
         begin
+
           check_uri = "#{@server_uri}/#{project_name}/results/#{task_id}/complete"
+          #puts "[+] Checking: #{check_uri}"
           response = RestClient.get check_uri
           complete = true if response == "true"
-
-          return nil if response == ""
+          #return nil if response == ""
 
         rescue URI::InvalidURIError => e
-          puts "[-] Invalid URI: #{check_uri}"
+          #puts "[-] Invalid URI: #{check_uri}"
           return nil
         end
       end
 
       ### Get the response
       response = _get_json_result "#{project_name}/results/#{task_id}.json"
-      #puts response
 
     response
     end
@@ -73,7 +85,7 @@ class IntrigueApi
     # options_list - list of options:  [
     #   {:name => "resolver", :value => "8.8.8.8" }
     # ]
-    def _start_and_background(project_name,task_name,entity_hash,depth,options_list,handler_list, strategy_name)
+    def _start_and_background(project_name,task_name,entity_hash,depth,options_list,handler_list, strategy_name, auto_enrich)
 
       payload = {
         "project_name" => project_name,
@@ -82,7 +94,8 @@ class IntrigueApi
         "handlers" => handler_list,
         "entity" => entity_hash,
         "depth" => depth,
-        "strategy_name" => strategy_name
+        "strategy_name" => strategy_name,
+        "auto_enrich" => auto_enrich
       }
 
       ### Send to the server
@@ -115,9 +128,9 @@ class IntrigueApi
       begin
         result = JSON.parse(RestClient.get "#{@server_uri}/#{path}")
       rescue JSON::ParserError => e
-        puts "Error: #{e}"
+        #puts "Error: #{e}"
       rescue RestClient::InternalServerError => e
-        puts "Error: #{e}"
+        #puts "Error: #{e}"
       end
     result
     end
@@ -152,7 +165,7 @@ x =  Intrigue.new
 
 x.start "example", entity_hash, options_list
 id  = x.start "search_bing", entity_hash, options_list
-puts x._get_log id
-puts x._get_result id
+#puts x._get_log id
+#puts x._get_result id
 
 =end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intrigue_api_client
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.4
 platform: ruby
 authors:
 - jcran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: API client for intrigue-core