connect_client 0.2.2 → 0.3.1

data/lib/connect_client/http/event_endpoint.rb

@@ -1,132 +1,136 @@
-require 'json'
-require_relative '../event_push_response'
-
-module ConnectClient
-  module Http
-    class EventEndpoint
-      def initialize(config)
-        headers = {
-          "Content-Type" => "application/json", 
-          "Accept" => "application/json",
-          "Accept-Encoding" => "identity",
-          "X-Api-Key" => config.api_key,
-          "X-Project-Id" => config.project_id
-        }
-
-        if config.async
-          @http = Async.new config.base_url, headers
-        else
-          @http = Sync.new config.base_url, headers
-        end
-
-      end
-
-      def push(collection_name, event)
-        path_uri_part = "/events/#{collection_name}"
-
-        @http.send path_uri_part, event.data.to_json, event
-      end
-
-      def push_batch(events_by_collection)
-        path_uri_part = "/events"
-
-        @http.send path_uri_part, events_by_collection.to_json, events_by_collection
-      end
-    end
-
-    private 
-
-    class Sync
-      def initialize(base_url, headers)
-        require 'uri'
-        require 'net/http'
-        require 'net/https'
-        
-        @headers = headers
-        @connect_uri = URI.parse(base_url)
-        @http = Net::HTTP.new(@connect_uri.host, @connect_uri.port)
-        setup_ssl if @connect_uri.scheme == 'https'
-      end
-
-      def send(path, body, events)
-        response = @http.post(path, body, @headers)
-        ConnectClient::EventPushResponse.new response.code, response['Content-Type'], response.body, events
-      end
-
-      private
-
-      def setup_ssl
-        @http.use_ssl = true
-        @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        @http.verify_depth = 5
-        @http.ca_file = File.expand_path("../../../../data/cacert.pem", __FILE__)        
-      end
-    end
-
-    class Async
-
-      def initialize(base_url, headers)
-        require 'em-http-request'
-        require_relative 'deferred_http_response'
-
-        @headers = headers
-        @base_url = base_url.chomp('/')
-      end
-
-      def send(path, body, events)
-        raise AsyncHttpError unless defined?(EventMachine) && EventMachine.reactor_running?
-
-        use_syncrony = defined?(EM::Synchrony)
-
-        if use_syncrony
-          send_using_synchrony(path, body, events)
-        else
-          send_using_deferred(path, body, events)
-        end
-      end
-
-      def send_using_deferred(path, body, events)
-        deferred = DeferredHttpResponse.new
-        url_string = "#{@base_url}#{path}".chomp('/')
-        http = EventMachine::HttpRequest.new(url_string).post(:body => body, :head => @headers)
-        http_callback = Proc.new do
-          begin
-            response = create_response http, events
-            deferred.succeed response
-          rescue => error
-            deferred.fail error
-          end
-        end
-
-        http.callback &http_callback
-        http.errback &http_callback
-
-        deferred
-      end
-
-      def send_using_synchrony(path, body, events)
-        url_string = "#{@base_url}#{path}".chomp('/')
-        http = EventMachine::HttpRequest.new(url_string).
-                post(:body => body, :head => @headers)
-
-        create_response http, events
-      end
-
-      def create_response(http_reponse, events)
-        status = http_reponse.response_header.status
-        content_type = http_reponse.response_header['Content-Type']
-        if (http_reponse.error.to_s.empty?)
-          ConnectClient::EventPushResponse.new status, content_type, http_reponse.response, events
-        else
-          ConnectClient::EventPushResponse.new status, content_type, http_reponse.error, events
-        end
-      end
-    end
-
-    class AsyncHttpError < StandardError
-      def message
-        "An EventMachine loop must be running to send an async http request via 'em-http-request'"
-      end
-    end
-  end
+require 'json'
+require 'cgi'
+require_relative '../event_push_response'
+
+module ConnectClient
+  module Http
+    class EventEndpoint
+      def initialize(config)
+        headers = {
+          "Content-Type" => "application/json", 
+          "Accept" => "application/json",
+          "Accept-Encoding" => "identity",
+          "X-Api-Key" => config.api_key,
+          "X-Project-Id" => config.project_id
+        }
+
+        if config.async
+          @http = EmHttp.new config.base_url, headers
+        else
+          @http = NetHttp.new config.base_url, headers
+        end
+
+      end
+
+      def push(collection_name, event)
+        path_uri_part = "/events/#{CGI.escape(collection_name.to_s)}"
+
+        @http.push_events path_uri_part, event.data.to_json, event
+      end
+
+      def push_batch(events_by_collection)
+        path_uri_part = "/events"
+
+        @http.push_events path_uri_part, events_by_collection.to_json, events_by_collection
+      end
+    end
+
+    private 
+
+    class NetHttp
+      def initialize(base_url, headers)
+        require 'uri'
+        require 'net/http'
+        require 'net/https'
+        
+        @headers = headers
+        @connect_uri = URI.parse(base_url)
+        @http = Net::HTTP.new(@connect_uri.host, @connect_uri.port)
+        setup_ssl if @connect_uri.scheme == 'https'
+      end
+
+      def push_events(path, body, events)
+        response = @http.post(path, body, @headers)
+        ConnectClient::EventPushResponse.new response.code, response['Content-Type'], response.body, events
+      end
+
+      private
+
+      def setup_ssl
+        root_ca = "#{ConnectClient::gem_root}/data/cacert.pem"
+        standard_depth = 5
+
+        @http.use_ssl = true
+        @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        @http.verify_depth = standard_depth
+        @http.ca_file = root_ca
+      end
+    end
+
+    class EmHttp
+
+      def initialize(base_url, headers)
+        require 'em-http-request'
+        require_relative 'deferred_http_response'
+
+        @headers = headers
+        @base_url = base_url.chomp('/')
+      end
+
+      def push_events(path, body, events)
+        raise AsyncHttpError unless defined?(EventMachine) && EventMachine.reactor_running?          
+
+        use_syncrony = defined?(EM::Synchrony)
+
+        if use_syncrony
+          push_events_using_synchrony(path, body, events)
+        else
+          push_events_using_deferred(path, body, events)
+        end
+      end
+
+      def push_events_using_deferred(path, body, events)
+        deferred = DeferredHttpResponse.new
+        url_string = "#{@base_url}#{path}".chomp('/')
+        http = EventMachine::HttpRequest.new(url_string).post(:body => body, :head => @headers)
+        http_callback = Proc.new do
+          begin
+            response = create_response http, events
+            deferred.succeed response
+          rescue => error
+            deferred.fail error
+          end
+        end
+
+        http.callback &http_callback
+        http.errback &http_callback
+
+        deferred
+      end
+
+      def push_events_using_synchrony(path, body, events)
+        url_string = "#{@base_url}#{path}".chomp('/')
+        http = EventMachine::HttpRequest.new(url_string).
+                post(:body => body, :head => @headers)
+
+        create_response http, events
+      end
+
+      def create_response(http_reponse, events)
+        status = http_reponse.response_header.status
+        content_type = http_reponse.response_header['Content-Type']
+        if (http_reponse.error.to_s.empty?)
+          ConnectClient::EventPushResponse.new status, content_type, http_reponse.response, events
+        else
+          ConnectClient::EventPushResponse.new status, content_type, http_reponse.error, events
+        end
+      end
+    end
+
+    class AsyncHttpError < StandardError
+      def message
+        "You have tried to push events asynchronously without an event machine event loop running. The easiest way to do this is by passing a block to EM.run"
+      end
+    end
+  end
 end

data/lib/connect_client/security/filtered_key_generation.rb

@@ -0,0 +1,41 @@
+require 'openssl'
+
+module ConnectClient
+  module Security
+    def self.generate_filtered_key(key_json, master_key)
+      key = master_key
+      key = Digest::SHA256.digest(key) if(key.kind_of?(String) && 32 != key.bytesize)
+      aes = OpenSSL::Cipher.new('AES-256-CBC')
+      iv = aes.random_iv
+      aes.encrypt
+      aes.key = key
+      aes.iv = iv
+      encrypted = aes.update(key_json) + aes.final
+
+      "#{bin_to_hex(iv)}-#{bin_to_hex(encrypted)}"
+    end
+
+    def self.generate_key_json(filtered_key, master_key)
+      iv_and_data = filtered_key.split('-')      
+      iv = hex_to_bin(iv_and_data[0])
+      encrypted_key_json = hex_to_bin(iv_and_data[1])
+
+      key = master_key
+      key = Digest::SHA256.digest(key) if(key.kind_of?(String) && 32 != key.bytesize)
+      iv = Digest::MD5.digest(iv) if(iv.kind_of?(String) && 16 != iv.bytesize)
+      aes = OpenSSL::Cipher.new('AES-256-CBC')      
+      aes.decrypt
+      aes.key = key
+      aes.iv = iv
+      aes.update(encrypted_key_json) + aes.final
+    end
+
+    def self.bin_to_hex(binary_string)
+      binary_string.unpack("H*").first.to_s.upcase
+    end
+
+    def self.hex_to_bin(hex_string)
+      hex_string.scan(/../).map { |x| x.hex }.pack('c*')
+    end
+  end
+end

data/lib/connect_client/version.rb

@@ -1,3 +1,3 @@
 module ConnectClient
-  VERSION = "0.2.2"
+  VERSION = "0.3.1"
 end

data/spec/connect_client/client_spec.rb

@@ -1,69 +1,69 @@
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'connect_client/client'
-require 'connect_client/event_push_response'
-require 'connect_client/configuration'
-require 'securerandom'
-
-describe ConnectClient::Client do
-  before do  
-    @client = ConnectClient::Client.new (ConnectClient::Configuration.new)
-    @async_client = ConnectClient::Client.new (ConnectClient::Configuration.new '', '', true)
-    @sample_event = { id: SecureRandom.uuid, timestamp: Time.now.utc.iso8601, name: 'sample' }
-    @sample_events = [@sample_event]
-    @sample_events_reponse = '{"sample": [{"success": true}]}'
-    @sample_collection = 'sample'
-    @sample_collection_sym = :sample
-  end
-
-  it "should get a push response back when pushing a single event to a collection passed by string" do
-    stub_request(:post, "https://api.getconnect.io/events/#{@sample_collection}").
-      with(:body => @sample_event).
-      to_return(:status => 200, :body => "", :headers => { 'Content-Type'=>'application/json' })
-
-    response = @client.push @sample_collection, @sample_event
-
-    response.must_be_instance_of ConnectClient::EventPushResponse
-  end
-
-  it "should get a push response back when pushing a single event to a collection passed by symbol" do
-    stub_request(:post, "https://api.getconnect.io/events/#{@sample_collection}").
-      with(:body => @sample_event).
-      to_return(:status => 200, :body => "", :headers => { 'Content-Type'=>'application/json' })
-
-    response = @client.push @sample_collection_sym, @sample_event
-
-    response.must_be_instance_of ConnectClient::EventPushResponse
-  end
-
-  it "should get a push response back when pushing multiple events to a collection passed by string" do
-    stub_request(:post, "https://api.getconnect.io/events").
-      with(:body => { @sample_collection.to_sym => @sample_events }).
-      to_return(:status => 200, :body => @sample_events_reponse, :headers => { 'Content-Type'=>'application/json' })
-
-    response = @client.push @sample_collection, @sample_events
-
-    response.must_be_instance_of ConnectClient::EventPushResponse
-  end
-
-  it "should get a push response back when pushing multiple events to a collection passed by symbol" do
-    stub_request(:post, "https://api.getconnect.io/events").
-      with(:body => { @sample_collection_sym => @sample_events }).
-      to_return(:status => 200, :body => @sample_events_reponse, :headers => { 'Content-Type'=>'application/json' })
-
-    response = @client.push @sample_collection_sym, @sample_events
-
-    response.must_be_instance_of ConnectClient::EventPushResponse
-  end
-
-  it "should get a push response back when pushing batches" do
-    batch = { @sample_collection.to_sym => @sample_events }
-    stub_request(:post, "https://api.getconnect.io/events").
-      with(:body => batch).
-      to_return(:status => 200, :body => @sample_events_reponse, :headers => { 'Content-Type'=>'application/json' })
-
-    response = @client.push batch
-    response.must_be_instance_of ConnectClient::EventPushResponse
-  end
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'webmock/minitest'
+require 'connect_client/client'
+require 'connect_client/event_push_response'
+require 'connect_client/configuration'
+require 'securerandom'
+
+describe ConnectClient::Client do
+  before do  
+    @client = ConnectClient::Client.new (ConnectClient::Configuration.new)
+    @async_client = ConnectClient::Client.new (ConnectClient::Configuration.new '', '', true)
+    @sample_event = { id: SecureRandom.uuid, timestamp: Time.now.utc.iso8601, name: 'sample' }
+    @sample_events = [@sample_event]
+    @sample_events_reponse = '{"sample": [{"success": true}]}'
+    @sample_collection = 'sample'
+    @sample_collection_sym = :sample
+  end
+
+  it "should get a push response back when pushing a single event to a collection passed by string" do
+    stub_request(:post, "https://api.getconnect.io/events/#{@sample_collection}").
+      with(:body => @sample_event).
+      to_return(:status => 200, :body => "", :headers => { 'Content-Type'=>'application/json' })
+
+    response = @client.push @sample_collection, @sample_event
+
+    response.must_be_instance_of ConnectClient::EventPushResponse
+  end
+
+  it "should get a push response back when pushing a single event to a collection passed by symbol" do
+    stub_request(:post, "https://api.getconnect.io/events/#{@sample_collection}").
+      with(:body => @sample_event).
+      to_return(:status => 200, :body => "", :headers => { 'Content-Type'=>'application/json' })
+
+    response = @client.push @sample_collection_sym, @sample_event
+
+    response.must_be_instance_of ConnectClient::EventPushResponse
+  end
+
+  it "should get a push response back when pushing multiple events to a collection passed by string" do
+    stub_request(:post, "https://api.getconnect.io/events").
+      with(:body => { @sample_collection.to_sym => @sample_events }).
+      to_return(:status => 200, :body => @sample_events_reponse, :headers => { 'Content-Type'=>'application/json' })
+
+    response = @client.push @sample_collection, @sample_events
+
+    response.must_be_instance_of ConnectClient::EventPushResponse
+  end
+
+  it "should get a push response back when pushing multiple events to a collection passed by symbol" do
+    stub_request(:post, "https://api.getconnect.io/events").
+      with(:body => { @sample_collection_sym => @sample_events }).
+      to_return(:status => 200, :body => @sample_events_reponse, :headers => { 'Content-Type'=>'application/json' })
+
+    response = @client.push @sample_collection_sym, @sample_events
+
+    response.must_be_instance_of ConnectClient::EventPushResponse
+  end
+
+  it "should get a push response back when pushing batches" do
+    batch = { @sample_collection.to_sym => @sample_events }
+    stub_request(:post, "https://api.getconnect.io/events").
+      with(:body => batch).
+      to_return(:status => 200, :body => @sample_events_reponse, :headers => { 'Content-Type'=>'application/json' })
+
+    response = @client.push batch
+    response.must_be_instance_of ConnectClient::EventPushResponse
+  end
 end