intrigue_api_client 1.0.5 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7584cd1b0f64137d233048a2417c114608108778
-  data.tar.gz: 5120734394133b63b0d78993c124aadac04677ef
+  metadata.gz: 3147774f9cc7bca2a2645b1daeeabb4ec01ff203
+  data.tar.gz: af53daf2a1e68616a2527243e0bdb5b79ce7ec52
 SHA512:
-  metadata.gz: 258cae10730ec552a67c32960bcf9bcd25eb783ec6d758e3fb66b448a50d895b5f96ef34d341376639841a4a7e45a9f04c1232620070a8f78cd261bb7a37169a
-  data.tar.gz: c6914d3271b78359b6bb4ecb873e37dcbce30cf99a201fccffdba5e79592d1d31c8fe365af7f0d4c138c2a933a7acafd4c419601609a382579b1efe35e5e8be9
+  metadata.gz: e223ecfe1d3c04147f0aa31f0c6da6211f75f2de5cee64a205cccc11d79c1077e225572cbadc04cf87c8c90bb5f4ac6f999d715edc39c2ee09937134e3fef743
+  data.tar.gz: 1629e543d8203c531e65894092756437c5fe5c2d5bc5d4760a61ec83f56c39a4dcb6161208d9979ce1eba4cbf5254ba16d830c8302bac53bcf385acc75193c66

data/lib/intrigue_api_client.rb

@@ -4,7 +4,7 @@ require 'rest_client'
 
 class IntrigueApi
 
-    def initialize(uri,key="")
+    def initialize(uri="http://127.0.0.1:7777/v1",key="")
       @intrigue_basedir = File.dirname(__FILE__)
       @server_uri = uri
     end
@@ -16,50 +16,23 @@ class IntrigueApi
 
     # Show detailed about a task
     def info(task_name)
-      _get_json_result "#{@server_uri}/tasks/#{task_name}.json"
+      _get_json_result "tasks/#{task_name}.json"
     end
 
-    # start_and_background - start and background a task
-    #
-    # project_name - must exist as a valid project_name
-    # task_name - must exist as a valid task name
-    # entity_hash - symbol-based hash representing an entity: {
-    #  :type => "String"
-    #  :attributes => { :name => "intrigue.io"}
-    # }
-    # options_list - list of options:  [
-    #   {:name => "resolver", :value => "8.8.8.8" }
-    # ]
-    def start_and_background(project_name,task_name,entity_hash,options_list=nil,handler_list=nil)
-
-      payload = {
-        "project_name" => project_name,
-        "task" => task_name,
-        "options" => options_list,
-        "handlers" => handler_list,
-        "entity" => entity_hash
-      }
-
-      ### Send to the server
-      task_id = RestClient.post "#{@server_uri}/#{project_name}/task_results",
-        payload.to_json, :content_type => "application/json"
-
-      if task_id == "" # technically a nil is returned , but becomes an empty string
-        #puts "[-] Task not started. Unknown Error. Exiting"
-        return nil
-      end
-
-    task_id
+    # create a new project
+    def create_project(project_name)
+      RestClient.post "#{@server_uri}/project", { "project" => project_name }
     end
 
     # Start a task and wait for the result
-    def start(project_name,task_name,entity_hash,options_list=nil,handler_list=nil)
+    def start(project_name,task_name,entity_hash,depth=1,options_list=nil,handler_list=nil, strategy_name="disovery")
 
       # Construct the request
-      task_id = start_and_background(project_name,task_name,entity_hash,options_list,handler_list)
+      task_id = _start_and_background(project_name,task_name,entity_hash,depth,options_list,handler_list, strategy_name)
 
       if task_id == "" # technically a nil is returned , but becomes an empty string
         #puts "[-] Task not started. Unknown Error. Exiting"
+        #raise "Problem getting result"
         return nil
       end
 
@@ -68,50 +41,70 @@ class IntrigueApi
       until complete
         sleep 1
         begin
-          response = RestClient.get "#{@server_uri}/#{project_name}/task_results/#{task_id}/complete"
+          check_uri = "#{@server_uri}/#{project_name}/results/#{task_id}/complete"
+          response = RestClient.get check_uri
           complete = true if response == "true"
+
+          return nil if response == ""
+
         rescue URI::InvalidURIError => e
-          puts "[-] Invalid URI: #{uri}"
-          return
+          puts "[-] Invalid URI: #{check_uri}"
+          return nil
         end
       end
 
       ### Get the response
-      response = _get_json_result "#{project_name}/task_results/#{task_id}.json"
+      response = _get_json_result "#{project_name}/results/#{task_id}.json"
+      #puts response
 
     response
     end
 
-    # start_scan_and_background - start and background a scan
-    def start_scan_and_background(project_name,scan_type,entity_hash,options_list=nil,handler_list=nil)
+
+    private
+    # start_and_background - start and background a task
+    #
+    # project_name - must exist as a valid project_name
+    # task_name - must exist as a valid task name
+    # entity_hash - symbol-based hash representing an entity: {
+    #  :type => "String"
+    #  :attributes => { :name => "intrigue.io"}
+    # }
+    # 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)
 
       payload = {
         "project_name" => project_name,
-        "scan_type" => scan_type,
+        "task" => task_name,
         "options" => options_list,
+        "handlers" => handler_list,
         "entity" => entity_hash,
-        "handlers" => handler_list
+        "depth" => depth,
+        "strategy_name" => strategy_name
       }
 
       ### Send to the server
-      scan_id = RestClient.post "#{@server_uri}/#{project_name}/scan_results",
+      task_id = RestClient.post "#{@server_uri}/#{project_name}/results",
         payload.to_json, :content_type => "application/json"
 
-
-      if scan_id == "" # technically a nil is returned , but becomes an empty string
+      if task_id == "" # technically a nil is returned , but becomes an empty string
+        #puts "[-] Task not started. Unknown Error. Exiting"
+        #raise "Problem getting result"
         return nil
       end
 
-    scan_id
+    task_id
     end
 
-    def get_log(task_id)
-      log = _get_json_result "#{project_name}/task_results/#{task_id}/log"
+    def _get_log(task_id)
+      log = _get_json_result "#{project_name}/results/#{task_id}/log"
     end
 
-    def get_result(task_id)
+    def _get_result(task_id)
       begin
-        result = _get_json_result "#{project_name}/task_results/#{task_id}.json"
+        result = _get_json_result "#{project_name}/results/#{task_id}.json"
       rescue JSON::ParserError => e
         response = nil
       end
@@ -120,12 +113,13 @@ class IntrigueApi
 
     def _get_json_result(path)
       begin
-        JSON.parse(RestClient.get "#{@server_uri}/#{path}")
+        result = JSON.parse(RestClient.get "#{@server_uri}/#{path}")
       rescue JSON::ParserError => e
         puts "Error: #{e}"
       rescue RestClient::InternalServerError => e
         puts "Error: #{e}"
       end
+    result
     end
 
 
@@ -158,7 +152,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.0.5
+  version: 1.2.1
 platform: ruby
 authors:
 - jcran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client