threat_agent 1.0.0.beta.2 → 1.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a685a1dc402be9ba1ea49872c431e42373fe3918
-  data.tar.gz: ba030b2aef8d8e48766285b728b8b40e755700bc
+  metadata.gz: c559b1e76c0a281873bbe879d17806df5a5755f1
+  data.tar.gz: 38e547ecec2e570c1f5c491e895230e38f3f48cd
 SHA512:
-  metadata.gz: 55e0b60b26d6468188c4905b5286f981fa0975d85f0ad89b32b8c7c926f01f17e449cc0c303fb2b371c99c49a22466d0b9caf1c9c4d550c205b144b62638a27e
-  data.tar.gz: 4d585124a9412991cd0a02a5b732bd5e92f9db69bb8cdfeddf89c317a6f4dac9c544f335b329629b7a7b0f75dada4fc1b9519596fcf6a4006cf983054be164ee
+  metadata.gz: 2ba0700266a222fd56c45c1f4bcf41d3e1c2ec8cb00c6e9083fa6bf7035d8f36c7bd9c2128d249c98cf434c6221bb7c8d4b036d5252f28647166434dec74a9ee
+  data.tar.gz: 89ef2559c5c1d8e23c5801cb92744a3c940aa2b492957ac3794d4f237f642def57f9046c893c55c366b60bdb6e1976aaef17d48b9700ddaaaf528bf4253a7c7c

data/bin/threatagent

@@ -35,7 +35,11 @@ class ThreatAgentCLI < Thor
   subcommand :pwnxy, ThreatAgent::Tasks::Pwnxy
 end
 
+# TODO: Add a global configuration instead of independently loading it
+#       everytime?
 config = ThreatAgent::Config
+config.from_file("#{ENV['HOME']}/.threatagent")
+
 $threat_agent_client = ThreatAgent::APIClient.new(config[:key], config[:sup])
 
 ThreatAgentCLI.start(ARGV)

data/lib/threat_agent/api_client.rb

@@ -58,7 +58,12 @@ module ThreatAgent
 
       resp = Net::HTTP.get_response(uri)
       json = resp.body
-      JSON.parse(json)
+
+      if json =~ /^[{\[].*[\]}]$/
+        JSON.parse(json)
+      else
+        JSON.parse(json, { quirks_mode: true }) || { 'error' => 'An unknown error occurred' }
+      end
     end
   end
 end

data/lib/threat_agent/config.rb

@@ -13,7 +13,7 @@ module ThreatAgent
 
     # Sets the default configuration options
     configure do |config|
-      config[:endpoint] = ENV['THREAT_AGENT_ENDPOINT'] || 'https://www.threatagent.com'
+      config[:endpoint] = 'https://www.threatagent.com'
       config[:key] = ENV['THREAT_AGENT_KEY']
       config[:sup] = ENV['THREAT_AGENT_SUP']
       config[:api_version] = 'v1'

data/lib/threat_agent/tasks/pwnxy.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'cryptic'
 require 'colorize'
+require 'formatador'
 require 'json'
 require 'thor'
 require 'threat_agent'
@@ -11,30 +12,72 @@ 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'
       desc 'pwnxy info', 'List information on Pwnxy instances'
       def info
         info = $threat_agent_client.request(:pwnxy_info)
-        # TODO: Add a UI class/method.
-        $stdout.puts info
+        if options[:format].eql? 'json'
+          $stdout.puts info
+        else
+          [:encrypted, :encrypted_iv, :encrypted_key].each { |key| info.delete(key) }
+          Formatador.display_table(info)
+        end
       end
 
-      desc 'pwnxy logs [INSTANCE] [OPTIONS]', 'Show logs for a Pwnxy instance'
-      def logs(identifier = 0)
-        logs = $threat_agent_client.request(:pwnxy_logs, { p: identifier })
-        # TODO: Add a UI class/method.
-        # TODO: Return the logs to the user
+      desc 'pwnxy logs [INSTANCE] [ID] [OPTIONS]', 'Show logs for a Pwnxy instance'
+      method_option :encrypted, aliases: %w[-e], default: false, desc: 'Whether or not to decrypt the logs',type: :boolean
+      def logs(pwnxy_id = 0, id = nil)
+        id = id.to_i
+
+        logs = $threat_agent_client.request(:pwnxy_logs, { p: pwnxy_id })
         if logs.is_a?(Hash) && logs['error']
           $stderr.puts "Threat Agent API Error: #{logs['error']}".red
           exit 255 # This is an API error. Exit with an unspecific code.
         end
 
-        $stdout.puts decrypt(logs)
+        if options[:encrypted]
+          if options[:format].eql? 'json'
+            $stdout.puts (id ? logs[id] : logs).to_json
+          else
+            Formatador.display_table(id ? logs[id] : logs)
+          end
+        else
+          decrypted_logs = decrypt(logs)
+
+          if options[:format].eql? 'json'
+            $stdout.puts (id ? decrypted_logs[id] : decrypted_logs).to_json
+          else
+            # # #
+            # Figure out how to use Formatador or an equiv to make a prettier
+            # table.
+            #
+            # Formatador.display_table(id ? decrypted_logs[id] : decrypted_logs)
+            # # #
+            printable = id ? decrypted_logs[id] : decrypted_logs
+            if printable.is_a? Hash
+              printable.each do |name, value|
+                if value
+                  $stdout.puts "#{name}:", value, '---'
+                end
+              end
+            elsif printable.is_a? Array
+              printable.each do |element|
+                printable.each do |name, value|
+                  if value
+                    $stdout.puts "#{name}:", value, '---'
+                  end
+                end
+              end
+            else
+              $stdout.puts printable.to_s
+            end
+          end
+        end
       end
 
       no_commands do
         def decrypt(logs)
-          keypair = Cryptic::Keypair.new(ThreatAgent::Config[:private_key])
-          private_key = keypair.private_key
+          private_key = OpenSSL::PKey::RSA.new(ThreatAgent::Config[:private_key])
 
           logs.map do |log|
             cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
@@ -44,7 +87,9 @@ module ThreatAgent
 
             decrypted_data = cipher.update(Base64.decode64(log['encrypted_data']))
             decrypted_data << cipher.final
-          end.to_json
+
+            JSON.parse(decrypted_data) || {}
+          end
         end
       end
     end

data/lib/threat_agent/version.rb

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

data/threat_agent.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'colorize'
   spec.add_dependency 'cryptic'
+  spec.add_dependency 'formatador'
   spec.add_dependency 'json'
   spec.add_dependency 'mixlib-config'
   spec.add_dependency 'redcarpet'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: threat_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Erran Carey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement