threat_agent 1.0.0.beta.3 → 1.0.0.beta.4

data/bin/threatagent

@@ -38,7 +38,10 @@ end
 # TODO: Add a global configuration instead of independently loading it
 #       everytime?
 config = ThreatAgent::Config
-config.from_file("#{ENV['HOME']}/.threatagent")
+
+if File.exists?("#{ENV['HOME']}/.threatagent")
+  config.from_file("#{ENV['HOME']}/.threatagent")
+end
 
 $threat_agent_client = ThreatAgent::APIClient.new(config[:key], config[:sup])
 

data/lib/threat_agent/api_client.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'net/http'
+require 'net/https'
 require 'threat_agent'
 
 module ThreatAgent
@@ -55,9 +55,12 @@ module ThreatAgent
 
       api_endpoint = "#{config[:endpoint]}/api/#{config[:api_version]}/"
       uri = URI("#{api_endpoint}#{action}?#{encoded_params}")
+      request = Net::HTTP::Get.new(uri.to_s)
+      response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme.eql?('https')) do |http|
+                   http.request(request)
+                 end
 
-      resp = Net::HTTP.get_response(uri)
-      json = resp.body
+      json = response.body
 
       if json =~ /^[{\[].*[\]}]$/
         JSON.parse(json)

data/lib/threat_agent/tasks/pwnxy.rb

@@ -12,7 +12,7 @@ module ThreatAgent
     #
     # @author Erran Carey <me@errancarey.com>
     class Pwnxy < Thor
-      class_option :format, aliases: %w[-f], default: :readable, desc: 'The format to display data in'
+      class_option :format, aliases: %w[-f], default: 'json', desc: 'The format to display data in'
       desc 'pwnxy info', 'List information on Pwnxy instances'
       def info
         info = $threat_agent_client.request(:pwnxy_info)
@@ -77,7 +77,8 @@ module ThreatAgent
 
       no_commands do
         def decrypt(logs)
-          private_key = OpenSSL::PKey::RSA.new(ThreatAgent::Config[:private_key])
+          keypair = Cryptic::Keypair.new(ThreatAgent::Config[:private_key])
+          private_key = keypair.private_key
 
           logs.map do |log|
             cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')

data/lib/threat_agent/version.rb

@@ -1,4 +1,4 @@
 module ThreatAgent
   # The version of the ThreatAgent gem
-  VERSION = '1.0.0.beta.3'
+  VERSION = '1.0.0.beta.4'
 end

data/threat_agent.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'colorize'
-  spec.add_dependency 'cryptic'
+  spec.add_dependency 'cryptic', '>= 1.0.0.beta.11'
   spec.add_dependency 'formatador'
   spec.add_dependency 'json'
   spec.add_dependency 'mixlib-config'

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: threat_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.3
+  version: 1.0.0.beta.4
+  prerelease: 6
 platform: ruby
 authors:
 - Erran Carey
@@ -13,118 +14,135 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cryptic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.beta.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.beta.11
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,43 +158,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem to interface with the Threat Agent API
@@ -212,26 +237,30 @@ files:
 homepage: http://developer.threatagent.com
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -539623594503375679
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Interact with apps from the Threat Agent website
 test_files:
 - spec/default_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c559b1e76c0a281873bbe879d17806df5a5755f1
-  data.tar.gz: 38e547ecec2e570c1f5c491e895230e38f3f48cd
-SHA512:
-  metadata.gz: 2ba0700266a222fd56c45c1f4bcf41d3e1c2ec8cb00c6e9083fa6bf7035d8f36c7bd9c2128d249c98cf434c6221bb7c8d4b036d5252f28647166434dec74a9ee
-  data.tar.gz: 89ef2559c5c1d8e23c5801cb92744a3c940aa2b492957ac3794d4f237f642def57f9046c893c55c366b60bdb6e1976aaef17d48b9700ddaaaf528bf4253a7c7c