ats 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb27ec01faf12a9d4ccf0ca36588f91b72305ce29c6dc6034fe9089f546bc53
-  data.tar.gz: 941b422bf5a5e71ca0004dc6ad9b2d516a54b83db255fcb24e292844fe130322
+  metadata.gz: '04740022192a62e2fb065b8873ca75ccddc84f969ba9afc6177e5411eb2173eb'
+  data.tar.gz: 35ecaa6040870a7bc06f6ec2e5ffcecf1e6927ec2f52e1596104bf61d5a04424
 SHA512:
-  metadata.gz: 165b94fb99a63af982466640a85abddcef4e32a2a23369e88371e09f19f8be124249b7891e542228f408ed292b09bf3acd11f3614f72aa3bf5695228a9e958da
-  data.tar.gz: 78d3cfecdebf5b0e0ec64aac27319c2670e3fb98d46f6b6e4ed770d64b6e67d0dfa957e22988c0a1e918e670ac918af42fe288b81d981bf0a00b7ddbdbd1c416
+  metadata.gz: 2ccd500eebb79298b5e7bac5d775a2a658e943d1e575d6e5d96ce1c602e5b953a3bd00d6ff1653193b4062ae058ccacfe7dcd42f0214531ef3eef8bb987c2aef
+  data.tar.gz: b7c47c5c1f64a8786f209de07d73f00eb3e14e4b74248f215bd963dccdabac33676e2740e36f2110153a440ea779ffa5867cfc8cdef4ac013e713b1e9db07fb9

data/ats-cli.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_dependency 'thor', '~> 0.20'
+  spec.add_dependency 'net-hippie', '0.1.8'
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/ats.rb

@@ -1,11 +1,11 @@
 require 'base64'
 require 'json'
 require 'logger'
+require 'net/hippie'
 require 'net/http'
 require 'yaml'
 
 require 'ats/configuration'
-require 'ats/http_api'
 require 'ats/version'
 
 require 'ats/amp4e/api'

data/lib/ats/amp4e/api.rb

@@ -7,14 +7,16 @@ module ATS
         'User-Agent' => "RubyGems/ATS #{ATS::VERSION}",
       }.freeze
 
-      attr_reader :http, :port, :host, :scheme, :client_id, :client_secret
+      attr_reader :http, :port, :host, :scheme
+      attr_reader :bearer_token, :client_id, :client_secret
 
       def initialize(configuration:, debug: false)
-        @http = HttpAPI.new(headers: HEADERS, debug: debug)
+        @http = Net::Hippie::Client.new(headers: HEADERS, verify_mode: debug ? OpenSSL::SSL::VERIFY_NONE : nil)
         @configuration = configuration
         @port = configuration[:port]
         @scheme = configuration[:scheme]
         @host = configuration[:host]
+        @bearer_token = configuration[:bearer_token]
         @client_id = configuration[:client_id]
         @client_secret = configuration[:client_secret]
       end
@@ -48,7 +50,11 @@ module ATS
       end
 
       def headers
-        { AUTHORIZATION: "Basic #{Base64.strict_encode64("#{client_id}:#{client_secret}")}" }
+        if bearer_token
+          { AUTHORIZATION: "Bearer #{bearer_token}" }
+        else
+          { AUTHORIZATION: "Basic #{Base64.strict_encode64("#{client_id}:#{client_secret}")}" }
+        end
       end
     end
   end

data/lib/ats/cli/command.rb

@@ -26,6 +26,7 @@ module ATS
 
       def configuration
         ATS.configure do |x|
+          Net::Hippie.logger = Logger.new('/dev/null') unless options['debug']
           x.debug = options['debug']
         end
       end

data/lib/ats/shiro/api.rb

@@ -10,7 +10,7 @@ module ATS
       attr_reader :http, :port, :host, :scheme, :bearer_token
 
       def initialize(configuration:, debug: false)
-        @http = HttpAPI.new(headers: HEADERS, debug: debug)
+        @http = Net::Hippie::Client.new(headers: HEADERS, verify_mode: debug ? OpenSSL::SSL::VERIFY_NONE : nil)
         @configuration = configuration
         @port = configuration[:port]
         @scheme = configuration[:scheme]

data/lib/ats/threat_grid/api.rb

@@ -9,7 +9,7 @@ module ATS
       attr_reader :http, :port, :host, :scheme, :api_key
 
       def initialize(configuration:, debug: false)
-        @http = HttpAPI.new(headers: HEADERS, debug: debug)
+        @http = Net::Hippie::Client.new(headers: HEADERS, verify_mode: debug ? OpenSSL::SSL::VERIFY_NONE : nil)
         @configuration = configuration
         @port = configuration[:port]
         @scheme = configuration[:scheme]

data/lib/ats/version.rb

@@ -1,3 +1,3 @@
 module ATS
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ats
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - mokha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: net-hippie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +118,6 @@ files:
 - lib/ats/cli/threat_grid/users.rb
 - lib/ats/cli/threat_grid/whoami.rb
 - lib/ats/configuration.rb
-- lib/ats/http_api.rb
 - lib/ats/shiro/api.rb
 - lib/ats/shiro/tokens.rb
 - lib/ats/threat_grid/api.rb

data/lib/ats/http_api.rb

@@ -1,79 +0,0 @@
-require 'openssl'
-
-module ATS
-  class HttpAPI
-    def initialize(headers: {}, debug: false)
-      @default_headers = headers
-      @debug = debug
-    end
-
-    def execute(uri, request)
-      http_for(uri).request(request)
-    end
-
-    def get(uri, headers: {}, body: {})
-      request = get_for(uri, headers: headers, body: body)
-      response = execute(uri, request)
-      if block_given?
-        yield request, response
-      else
-        response
-      end
-    end
-
-    def post(uri, headers: {}, body: {})
-      request = post_for(uri, headers: headers, body: body)
-      response = execute(uri, request)
-      if block_given?
-        yield request, response
-      else
-        response
-      end
-    end
-
-    def put(uri, headers: {}, body: {})
-      request = put_for(uri, headers: headers, body: body)
-      response = execute(uri, request)
-      if block_given?
-        yield request, response
-      else
-        response
-      end
-    end
-
-    private
-
-    def http_for(uri)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.read_timeout = 30
-      http.use_ssl = uri.scheme == "https"
-      if debug?
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        http.set_debug_output(ATS.logger)
-      end
-      http
-    end
-
-    def post_for(uri, headers: {}, body: {})
-      Net::HTTP::Post.new(uri.path, @default_headers.merge(headers)).tap do |x|
-        x.body = JSON.generate(body)
-      end
-    end
-
-    def put_for(uri, headers: {}, body: {})
-      Net::HTTP::Put.new(uri.path, @default_headers.merge(headers)).tap do |x|
-        x.body = JSON.generate(body)
-      end
-    end
-
-    def get_for(uri, headers: {}, body: {})
-      Net::HTTP::Get.new(uri.path, @default_headers.merge(headers)).tap do |x|
-        x.body = JSON.generate(body)
-      end
-    end
-
-    def debug?
-      @debug
-    end
-  end
-end