threatstack 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aed12a775d43b98bc2776069f65c0819ada51bbf
-  data.tar.gz: dcf402416927ce1904bfc7d30ebd85c175063751
+  metadata.gz: 187538b81d44fb05e61ceed262abe656e82a2a4d
+  data.tar.gz: 4bf4c21c0ea8af3cc10f96044427763f5800b3c3
 SHA512:
-  metadata.gz: 2a9cd8bdd9f8855b92d55740196fbeca5437f50641ef4654bbbc4320ba7884d0a470d75fd67b37c52bc0db0764249e5d81dd0eb7adbbc1bc08db684bb571d42c
-  data.tar.gz: 525cd3784586441ab50946c21863c366bb0a9d2fc39eb5b849df4462536ed1960b700ae15ff2ad14a8941f880bced24d3ca4de86bda3e5abab015cb74721a13d
+  metadata.gz: 628ec3682dac755b55796c97fca8611786ea5a90fdf1412bf18f7081a1f30b47ae4e37ae836ce017ee5e23834086b5d1e3a5a446409d2e1a26d1341f8fa64c4e
+  data.tar.gz: 5746ae5b1648fd66e077b81a15f9341d8a5c18e38560fe455e900e820012f14d4b4bcf39a46316c2acd9f9612b8535c80aa5f77b489d06e84b1ea877d01fe447

data/lib/threatstack/client.rb

@@ -1,67 +1,66 @@
 require 'open-uri'
 require 'httparty'
-require 'threatstack/alert/response'
-require 'threatstack/alert/alert'
-require 'threatstack/agent/response'
-require 'threatstack/agent/agent'
-require 'threatstack/policy/response'
-require 'threatstack/policy/policy'
-require 'threatstack/organization/response'
-require 'threatstack/log/response'
+require 'threatstack/response'
+require 'threatstack/entities/agent'
+require 'threatstack/entities/alert'
+require 'threatstack/entities/log'
+require 'threatstack/entities/organization'
+require 'threatstack/entities/policy'
 
 module Threatstack
   class ThreatstackError < StandardError; end
 
   class Client
-    THREATSTACK_API = 'https://app.threatstack.com/api/v1'
+    THREATSTACK_API = 'https://app.threatstack.com/api'.freeze
 
-    attr_reader :token, :org_id
+    attr_reader :token, :org_id, :api_version
 
-    def initialize(token)
+    def initialize(token, api_version = 'v1')
+      @api_version = api_version
       @token = token
     end
 
-    def alerts(params = {})
-      response = do_request(:get, 'alerts', params)
-      Alert::Response.new(response).alerts
-    end
-
-    def alert(alert_id, params = {})
-      raise ThreatstackError, "Must specify alert id" unless alert_id
-      response = do_request(:get, "alerts/#{alert_id}", params)
-      Alert::Alert.new(response)
-    end
-
     def agents(params = {})
       response = do_request(:get, 'agents', params)
-      Agent::Response.new(response).agents
+      Response.new(:agent, response).agents
     end
 
     def agent(agent_id, params = {})
       raise ThreatstackError, "Must specify agent id" unless agent_id
       response = do_request(:get, "agents/#{agent_id}", params)
-      Agent::Agent.new(response)
+      Agent.new(response)
+    end
+
+    def alerts(params = {})
+      response = do_request(:get, 'alerts', params)
+      Response.new(:alert, response).alerts
+    end
+
+    def alert(alert_id, params = {})
+      raise ThreatstackError, "Must specify alert id" unless alert_id
+      response = do_request(:get, "alerts/#{alert_id}", params)
+      Alert.new(response)
     end
 
     def policies(params = {})
       response = do_request(:get, 'policies', params)
-      Policy::Response.new(response).policies
+      Response.new(:policy, response).policies
     end
 
     def policy(policy_id, params = {})
       raise ThreatstackError, "Must specify policy id" unless policy_id
       response = do_request(:get, "policies/#{policy_id}", params)
-      Policy::Policy.new(response)
+      Policy.new(response)
     end
 
     def organizations(params = {})
       response = do_request(:get, 'organizations', params)
-      Organization::Response.new(response).organizations
+      Response.new(:organization, response).organizations
     end
 
     def logs(params = {})
       response = do_request(:get, 'logs', params)
-      Log::Response.new(response).logs
+      Response.new(:log, response).logs
     end
 
     def search(query, params = {})
@@ -84,7 +83,7 @@ module Threatstack
       params[:fields] = params[:fields].join(',') if params[:fields]&.is_a?(Array)
 
       query = params.each_pair.map { |k, v| "#{k}=#{v}" }.join('&')
-      uri = "#{THREATSTACK_API}/#{path}"
+      uri = "#{THREATSTACK_API}/#{api_version}/#{path}"
       uri += "?#{URI::encode(query)}" if params.any?
       uri
     end

data/lib/threatstack/entities/agent.rb

@@ -0,0 +1,7 @@
+require 'threatstack/serializable'
+
+module Threatstack
+  class Agent
+    include Serializable
+  end
+end

data/lib/threatstack/entities/alert.rb

@@ -0,0 +1,20 @@
+require 'threatstack/entities/event'
+require 'threatstack/entities/rule'
+require 'threatstack/serializable'
+
+module Threatstack
+  class Alert
+    include Serializable
+    attributes :latest_events, :rule
+
+    def latest_events
+      raw['latest_events'].map do |event|
+        Event.new(event)
+      end
+    end
+
+    def rule
+      Rule.new(raw['rule'])
+    end
+  end
+end

data/lib/threatstack/entities/event.rb

@@ -0,0 +1,13 @@
+require 'threatstack/entities/user_identity'
+require 'threatstack/serializable'
+
+module Threatstack
+  class Event
+    include Serializable
+    attributes :user_identity
+
+    def user_identity
+      UserIdentity.new(raw['userIdentity'])
+    end
+  end
+end

data/lib/threatstack/{log → entities}/log.rb

@@ -1,9 +1,7 @@
 require 'threatstack/serializable'
 
 module Threatstack
-  module Log
-    class Log
-      include Serializable
-    end
+  class Log
+    include Serializable
   end
 end

data/lib/threatstack/entities/organization.rb

@@ -0,0 +1,7 @@
+require 'threatstack/serializable'
+
+module Threatstack
+  class Organization
+    include Serializable
+  end
+end

data/lib/threatstack/entities/policy.rb

@@ -0,0 +1,12 @@
+require 'threatstack/entities/rule'
+
+module Threatstack
+  class Policy
+    include Serializable
+    attributes :rules
+
+    def rules
+      raw['alert_policy'].map{ |r| Rule.new(r) }
+    end
+  end
+end

data/lib/threatstack/entities/rule.rb

@@ -0,0 +1,12 @@
+require 'threatstack/serializable'
+
+module Threatstack
+  class Rule
+    include Serializable
+    attributes :original_rule
+
+    def original_rule
+      Rule.new(raw['original_rule'])
+    end
+  end
+end

data/lib/threatstack/entities/user_identity.rb

@@ -0,0 +1,32 @@
+require 'threatstack/serializable'
+
+module Threatstack
+  class UserIdentity
+    include Serializable
+    attributes :user_name, :session_context, :invoked_by, :account_id, :access_key_id, :principal_id
+
+    def user_name
+      raw['userName']
+    end
+
+    def session_context
+      raw['sessionContext']
+    end
+
+    def invoked_by
+      raw['invokedBy']
+    end
+
+    def account_id
+      raw['accountId']
+    end
+
+    def access_key_id
+      raw['accessKeyId']
+    end
+
+    def principal_id
+      raw['principalId']
+    end
+  end
+end

data/lib/threatstack/response.rb

@@ -0,0 +1,41 @@
+require 'threatstack/entities/agent'
+require 'threatstack/entities/alert'
+require 'threatstack/entities/log'
+require 'threatstack/entities/organization'
+require 'threatstack/entities/policy'
+
+module Threatstack
+  class InvalidEntity < StandardError; end
+  class Response
+    attr_reader :entity, :raw
+    def initialize(entity, raw)
+      @raw = raw
+      @entity = entity
+    end
+
+    def agents
+      raise InvalidEntity unless entity == :agent
+      raw.map{ |a| Agent.new(a) }
+    end
+
+    def alerts
+      raise InvalidEntity unless entity == :alert
+      raw.map{ |a| Alert.new(a) }
+    end
+
+    def logs
+      raise InvalidEntity unless entity == :log
+      raw.map{ |a| Log.new(a) }
+    end
+
+    def organizations
+      raise InvalidEntity unless entity == :organization
+      raw.map{ |a| Organization.new(a) }
+    end
+
+    def policies
+      raise InvalidEntity unless entity == :policy
+      raw.map{ |a| Policy.new(a) }
+    end
+  end
+end

data/lib/threatstack/version.rb

@@ -1,3 +1,3 @@
 module Threatstack
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: threatstack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Canty
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,20 +96,16 @@ files:
 - bin/console
 - bin/setup
 - lib/threatstack.rb
-- lib/threatstack/agent/agent.rb
-- lib/threatstack/agent/response.rb
-- lib/threatstack/alert/alert.rb
-- lib/threatstack/alert/event.rb
-- lib/threatstack/alert/response.rb
-- lib/threatstack/alert/rule.rb
-- lib/threatstack/alert/user_identity.rb
 - lib/threatstack/client.rb
-- lib/threatstack/log/log.rb
-- lib/threatstack/log/response.rb
-- lib/threatstack/organization/organization.rb
-- lib/threatstack/organization/response.rb
-- lib/threatstack/policy/policy.rb
-- lib/threatstack/policy/response.rb
+- lib/threatstack/entities/agent.rb
+- lib/threatstack/entities/alert.rb
+- lib/threatstack/entities/event.rb
+- lib/threatstack/entities/log.rb
+- lib/threatstack/entities/organization.rb
+- lib/threatstack/entities/policy.rb
+- lib/threatstack/entities/rule.rb
+- lib/threatstack/entities/user_identity.rb
+- lib/threatstack/response.rb
 - lib/threatstack/serializable.rb
 - lib/threatstack/version.rb
 - threatstack-0.1.0.gem
@@ -134,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Threatstack API integration for Ruby

data/lib/threatstack/agent/agent.rb

@@ -1,9 +0,0 @@
-require 'threatstack/agent/agent'
-
-module Threatstack
-  module Agent
-    class Agent
-      include Serializable
-    end
-  end
-end

data/lib/threatstack/agent/response.rb

@@ -1,16 +0,0 @@
-require 'threatstack/agent/agent'
-
-module Threatstack
-  module Agent
-    class Response
-      attr_reader :raw
-      def initialize(raw)
-        @raw = raw
-      end
-
-      def agents
-        raw.map{ |a| Agent.new(a) }
-      end
-    end
-  end
-end

data/lib/threatstack/alert/alert.rb

@@ -1,22 +0,0 @@
-require 'threatstack/alert/event'
-require 'threatstack/alert/rule'
-require 'threatstack/serializable'
-
-module Threatstack
-  module Alert
-    class Alert
-      include Serializable
-      attributes :latest_events, :rule
-
-      def latest_events
-        raw['latest_events'].map do |event|
-          Event.new(event)
-        end
-      end
-
-      def rule
-        Rule.new(raw['rule'])
-      end
-    end
-  end
-end

data/lib/threatstack/alert/event.rb

@@ -1,15 +0,0 @@
-require 'threatstack/alert/user_identity'
-require 'threatstack/serializable'
-
-module Threatstack
-  module Alert
-    class Event
-      include Serializable
-      attributes :user_identity
-
-      def user_identity
-        UserIdentity.new(raw['userIdentity'])
-      end
-    end
-  end
-end

data/lib/threatstack/alert/response.rb

@@ -1,15 +0,0 @@
-require 'threatstack/alert/alert'
-require 'threatstack/serializable'
-
-module Threatstack
-  module Alert
-    class Response
-      include Serializable
-      attributes :alerts
-      
-      def alerts
-        raw.map{ |a| Alert.new(a) }
-      end
-    end
-  end
-end

data/lib/threatstack/alert/rule.rb

@@ -1,13 +0,0 @@
-require 'threatstack/serializable'
-module Threatstack
-  module Alert
-    class Rule
-      include Serializable
-      attributes :original_rule
-
-      def original_rule
-        Rule.new(raw['original_rule'])
-      end
-    end
-  end
-end

data/lib/threatstack/alert/user_identity.rb

@@ -1,34 +0,0 @@
-require 'threatstack/serializable'
-
-module Threatstack
-  module Alert
-    class UserIdentity
-      include Serializable
-      attributes :user_name, :session_context, :invoked_by, :account_id, :access_key_id, :principal_id
-
-      def user_name
-        raw['userName']
-      end
-
-      def session_context
-        raw['sessionContext']
-      end
-
-      def invoked_by
-        raw['invokedBy']
-      end
-
-      def account_id
-        raw['accountId']
-      end
-
-      def access_key_id
-        raw['accessKeyId']
-      end
-
-      def principal_id
-        raw['principalId']
-      end
-    end
-  end
-end

data/lib/threatstack/log/response.rb

@@ -1,14 +0,0 @@
-require 'threatstack/log/log'
-
-module Threatstack
-  module Log
-    class Response
-      include Serializable
-      attributes :logs
-
-      def logs
-        raw.map{ |a| Log.new(a) }
-      end
-    end
-  end
-end

data/lib/threatstack/organization/organization.rb

@@ -1,10 +0,0 @@
-require 'threatstack/organization/organization'
-require 'threatstack/serializable'
-
-module Threatstack
-  module Organization
-    class Organization
-      include Serializable
-    end
-  end
-end

data/lib/threatstack/organization/response.rb

@@ -1,15 +0,0 @@
-require 'threatstack/organization/organization'
-require 'threatstack/serializable'
-
-module Threatstack
-  module Organization
-    class Response
-      include Serializable
-      attributes :organizations
-
-      def organizations
-        raw.map{ |a| Organization.new(a) }
-      end
-    end
-  end
-end

data/lib/threatstack/policy/policy.rb

@@ -1,15 +0,0 @@
-require 'threatstack/policy/policy'
-require 'threatstack/alert/rule'
-
-module Threatstack
-  module Policy
-    class Policy
-      include Serializable
-      attributes :rules
-
-      def rules
-        raw['alert_policy'].map{ |r| Threatstack::Alert::Rule.new(r) }
-      end
-    end
-  end
-end

data/lib/threatstack/policy/response.rb

@@ -1,15 +0,0 @@
-require 'threatstack/policy/policy'
-require 'threatstack/serializable'
-
-module Threatstack
-  module Policy
-    class Response
-      include Serializable
-      attributes :policies
-
-      def policies
-        raw.map{ |a| Policy.new(a) }
-      end
-    end
-  end
-end