intrigue_api_client 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76b53c88f4271cda1f176a5117a3e7368e2441d
-  data.tar.gz: a100ef2677cc519610ac2e6b323b862bdd7f86f4
+  metadata.gz: 7584cd1b0f64137d233048a2417c114608108778
+  data.tar.gz: 5120734394133b63b0d78993c124aadac04677ef
 SHA512:
-  metadata.gz: e7ef5b0786e8c6931562ca74b5dd600a4406ea6d5115dbbe7bf08b0aaa2e5e15ee9f21ef500eff9b9edf6b86418a6cdf51255b59babb6a604fe85d8493d21746
-  data.tar.gz: 669d9ba0b1bb52e981e6f36ed5c73103cd4dc54552367ab915725c87799a85c03a2b9b2d75c3fe9e5531b49fab0123109293879bc2351d37e99927e8838c15b6
+  metadata.gz: 258cae10730ec552a67c32960bcf9bcd25eb783ec6d758e3fb66b448a50d895b5f96ef34d341376639841a4a7e45a9f04c1232620070a8f78cd261bb7a37169a
+  data.tar.gz: c6914d3271b78359b6bb4ecb873e37dcbce30cf99a201fccffdba5e79592d1d31c8fe365af7f0d4c138c2a933a7acafd4c419601609a382579b1efe35e5e8be9

data/lib/intrigue_api_client.rb

@@ -6,33 +6,28 @@ class IntrigueApi
 
     def initialize(uri,key="")
       @intrigue_basedir = File.dirname(__FILE__)
-      @server_uri = ENV.fetch("INTRIGUE_API", uri)
+      @server_uri = uri
     end
 
     # List all tasks
     def list
-      tasks_hash = JSON.parse(RestClient.get("#{@server_uri}/tasks.json"))
+      _get_json_result "tasks.json"
     end
 
     # Show detailed about a task
     def info(task_name)
-
-      begin
-        task_info = JSON.parse(RestClient.get("#{@server_uri}/tasks/#{task_name}.json"))
-      rescue RestClient::InternalServerError => e
-        raise "Invalid Task Called"
-      end
-
+      _get_json_result "#{@server_uri}/tasks/#{task_name}.json"
     end
 
     # start_and_background - start and background a task
     #
-    # entity_hash = {
+    # 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 = [
+    # 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)
@@ -46,7 +41,7 @@ class IntrigueApi
       }
 
       ### Send to the server
-      task_id = RestClient.post "#{@server_uri}/task_results",
+      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
@@ -57,7 +52,7 @@ class IntrigueApi
     task_id
     end
 
-    # start Start a task and wait for the result
+    # Start a task and wait for the result
     def start(project_name,task_name,entity_hash,options_list=nil,handler_list=nil)
 
       # Construct the request
@@ -71,10 +66,10 @@ class IntrigueApi
       ### XXX - wait to collect the response
       complete = false
       until complete
-        sleep 3
+        sleep 1
         begin
-          uri = "#{@server_uri}/task_results/#{task_id}/complete"
-          complete = true if(RestClient.get(uri) == "true")
+          response = RestClient.get "#{@server_uri}/#{project_name}/task_results/#{task_id}/complete"
+          complete = true if response == "true"
         rescue URI::InvalidURIError => e
           puts "[-] Invalid URI: #{uri}"
           return
@@ -82,27 +77,12 @@ class IntrigueApi
       end
 
       ### Get the response
-      begin
-      response = JSON.parse(RestClient.get "#{@server_uri}/task_results/#{task_id}.json")
-      rescue JSON::ParserError => e
-        #puts "Error parsing JSON: #{e}"
-        #puts  "response: #{response}"
-        response = nil
-      end
+      response = _get_json_result "#{project_name}/task_results/#{task_id}.json"
 
     response
     end
 
     # start_scan_and_background - start and background a scan
-    #
-    # entity_hash = {
-    #  :type => "String"
-    #  :details => { :name => "intrigue.io"}
-    # }
-    #
-    # options_list = [
-    #   {:name => "resolver", :value => "8.8.8.8" }
-    # ]
     def start_scan_and_background(project_name,scan_type,entity_hash,options_list=nil,handler_list=nil)
 
       payload = {
@@ -114,12 +94,11 @@ class IntrigueApi
       }
 
       ### Send to the server
-      scan_id = RestClient.post "#{@server_uri}/scan_results",
+      scan_id = RestClient.post "#{@server_uri}/#{project_name}/scan_results",
         payload.to_json, :content_type => "application/json"
 
 
       if scan_id == "" # technically a nil is returned , but becomes an empty string
-        #puts "[-] Task not started. Unknown Error. Exiting"
         return nil
       end
 
@@ -127,18 +106,28 @@ class IntrigueApi
     end
 
     def get_log(task_id)
-      log = RestClient.get "#{@server_uri}/task_results/#{task_id}/log"
+      log = _get_json_result "#{project_name}/task_results/#{task_id}/log"
     end
 
     def get_result(task_id)
       begin
-        result = JSON.parse(RestClient.get "#{@server_uri}/task_results/#{task_id}.json")
+        result = _get_json_result "#{project_name}/task_results/#{task_id}.json"
       rescue JSON::ParserError => e
         response = nil
       end
     result
     end
 
+    def _get_json_result(path)
+      begin
+        JSON.parse(RestClient.get "#{@server_uri}/#{path}")
+      rescue JSON::ParserError => e
+        puts "Error: #{e}"
+      rescue RestClient::InternalServerError => e
+        puts "Error: #{e}"
+      end
+    end
+
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intrigue_api_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - jcran