instrumental_agent 0.12.7 → 0.13.0

data/spec/test.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICkzCCAfwCCQDzjnx2K+MAEDANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
+VVMxEDAOBgNVBAgTB0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEfMB0G
+A1UEChMWRXhwZWN0ZWQgQmVoYXZpb3IsIExMQzEVMBMGA1UECxMMSW5zdHJ1bWVu
+dGFsMR0wGwYDVQQDExRpbnN0cnVtZW50YWxhcHAudGVzdDAeFw0xNTA3MTUxODMz
+NTlaFw0xODA3MTQxODMzNTlaMIGNMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHSW5k
+aWFuYTEVMBMGA1UEBxMMSW5kaWFuYXBvbGlzMR8wHQYDVQQKExZFeHBlY3RlZCBC
+ZWhhdmlvciwgTExDMRUwEwYDVQQLEwxJbnN0cnVtZW50YWwxHTAbBgNVBAMTFGlu
+c3RydW1lbnRhbGFwcC50ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDW
+LiEUeH0RWIQR9iVXiUiGk9dYmjJloyrKUSZrOHt7b5Y0bHVI9t/tRVf01DyPyL63
+C8JEthMkdLDfsmgezSbNyTt4tMqAQmVEjxuCgZXnXeWlumXyfEjSMmuzaa1r5/WW
+602ibA2dN6CV7BpqWXLmvNX/C8kRmD1xPcJJ9T/jcwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4GBAMiApS8danJ6AZgk9e6bhXBYFEME6PbIiY3yg8db2fC1gwEIb9TG59Mm
+34NWn4xo8csw6zpcca3+FpPwpAQ8hy/gmktbliSg7QzAgLIt+1XFYSKODP7BQL91
+Y85vWi4FJglY3JnwGyArCAGzpoB8+M4XtMbfbE+TQv/KjYcIi/yi
+-----END CERTIFICATE-----

data/spec/test.csr

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBzjCCATcCAQAwgY0xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdJbmRpYW5hMRUw
+EwYDVQQHEwxJbmRpYW5hcG9saXMxHzAdBgNVBAoTFkV4cGVjdGVkIEJlaGF2aW9y
+LCBMTEMxFTATBgNVBAsTDEluc3RydW1lbnRhbDEdMBsGA1UEAxMUaW5zdHJ1bWVu
+dGFsYXBwLnRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYuIRR4fRFY
+hBH2JVeJSIaT11iaMmWjKspRJms4e3tvljRsdUj23+1FV/TUPI/IvrcLwkS2EyR0
+sN+yaB7NJs3JO3i0yoBCZUSPG4KBledd5aW6ZfJ8SNIya7NprWvn9ZbrTaJsDZ03
+oJXsGmpZcua81f8LyRGYPXE9wkn1P+NzAgMBAAGgADANBgkqhkiG9w0BAQUFAAOB
+gQCLnXrjbbuwIQpLnNetdSyo8BKs4zfpxodH1d2m3rBB1ZO8oaguVnTJ7qCsX58+
+iCbjl7mBgjiT7kMTilqmREAU+Uw1Dfhlz3xvdw4pDkEvxNlkPqVC9j6aeLY9ED+p
+nVKrILe79oWwF8BG86Zh/aFw6792pIxQnZ27lBE/ztU6ww==
+-----END CERTIFICATE REQUEST-----

data/spec/test.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDWLiEUeH0RWIQR9iVXiUiGk9dYmjJloyrKUSZrOHt7b5Y0bHVI
+9t/tRVf01DyPyL63C8JEthMkdLDfsmgezSbNyTt4tMqAQmVEjxuCgZXnXeWlumXy
+fEjSMmuzaa1r5/WW602ibA2dN6CV7BpqWXLmvNX/C8kRmD1xPcJJ9T/jcwIDAQAB
+AoGAOHnHbT9sMyO1B4txQ0jG3/2h3hIi0dwZj2mgiMtG/EBrSf2DW68FUupjDALe
+yUc0ys2F91pPZ+CBNysy+1Q7M7KTqk0XLFjokIKWt8EQ4FB3t+UCFtK5PLdqWjqx
+ygZnj5n0fTtDyU2t2omO78AhL+m4AVRvGn55K7Aq8OgnMkkCQQDzimBLa9TZ+D0f
+UQhkjEuNpMJ7yx8UyIJBo8oT6vbWUcUJaTjBJ8fACKsJs+WjMOlvUxB5pyubAjDn
+b0fh9XuvAkEA4SM5USgiBaXRztGvst8Sd9usYLEjW6YvXqt5U3LG9STdOOStOQ1g
+8tBICxKT9Fvan+w2yEkr1+AobCaUdyoxfQJBAJ5424IYT6/qJTO8kd6DoCIyJM9S
+9A2dD41Q3Ayr5yS8np8qFeEyVntx6IHuyq2vBScIgP74NZqvCU1/juHM0EcCQGw2
+7xz4SmomixN7LJWwrYLZHyEW4+Twm0JI77dRqxo4DvGC0VRj/t6XiJlx45YH9Kz7
+8FUS/rTz9NoPLTueF00CQQDnObuc/Wn6p8tcg4iOoZz/NcBdqd/GIIcI7D8WJubv
+d77dOAhilAxypMjmIr+YfKlb13sLDWwufx4urAIGZJ9S
+-----END RSA PRIVATE KEY-----

data/spec/test_server.rb

@@ -1,3 +1,5 @@
+require 'openssl'
+
 class TestServer
   attr_accessor :host, :port, :connect_count, :commands
 
@@ -6,12 +8,17 @@ class TestServer
       :listen => true,
       :authenticate => true,
       :response => true,
+      :secure => false
     }
     @options = default_options.merge(options)
 
+    dir = File.expand_path(File.dirname(__FILE__))
+    @certificate = OpenSSL::X509::Certificate.new(File.open(File.join(dir, "test.crt")))
+    @key = OpenSSL::PKey::RSA.new(File.open(File.join(dir, "test.key")))
     @connect_count = 0
     @connections = []
     @commands = []
+    @mutex = Mutex.new
     @host = 'localhost'
     @main_thread = nil
     @client_threads = []
@@ -23,25 +30,33 @@ class TestServer
   def listen
     @port ||= 10001
     @server = TCPServer.new(@port)
+    if @options[:secure]
+      context = OpenSSL::SSL::SSLContext.new
+      context.cert = @certificate
+      context.key = @key
+      context.set_params(:verify_mode => OpenSSL::SSL::VERIFY_NONE)
+      @server = OpenSSL::SSL::SSLServer.new(@server, context)
+    end
     @main_thread = Thread.new do
       begin
         # puts "listening"
         loop do
           client = @server.accept
+          if @options[:secure]
+            client.sync_close = true
+          end
           @connections << client
           @connect_count += 1
-          @fd_to_thread[client.to_i] = Thread.new(client) do |socket|
-            # puts "connection received"
+          @fd_to_thread[fd_for_socket(client)] = Thread.new(client) do |socket|
             loop do
               begin
-                command = ""
-                while (c = socket.read(1)) != "\n"
-                  command << c unless c.nil?
-                end
+                command = socket.gets.to_s.chomp.strip
                 if !command.empty?
-                  # puts "got: #{command}"
-                  commands << command
-                  if %w[hello authenticate].include?(command.split(' ')[0])
+                  @mutex.synchronize do
+                    commands << command
+                  end
+                  cmd, _ = command.split
+                  if %w[hello authenticate].include?(cmd)
                     if @options[:response]
                       if @options[:authenticate]
                         socket.puts "ok"
@@ -51,12 +66,14 @@ class TestServer
                     end
                   end
                 end
+              rescue EOFError
+                retry
               rescue Exception => e
                 break
               end
             end
           end
-          @client_threads << @fd_to_thread[client.to_i]
+          @client_threads << @fd_to_thread[fd_for_socket(client)]
         end
       rescue Exception => err
         unless @stopping
@@ -90,13 +107,32 @@ class TestServer
     end
   end
 
+  def fd_for_socket(socket)
+    case socket
+    when OpenSSL::SSL::SSLSocket
+      socket.io.to_i
+    else
+      socket.to_i
+    end
+  end
+
   def disconnect_all
-    @connections.each { |c| 
-      if (thr = @fd_to_thread[c.to_i])
+    @connections.each { |c|
+      fd = fd_for_socket(c)
+      if (thr = @fd_to_thread[fd])
         thr.kill
       end
-      @fd_to_thread.delete(c.to_i)
-      c.close rescue false 
+      @fd_to_thread.delete(fd)
+      begin
+        if c.respond_to?(:sync_close=)
+          c.sync_close = true
+        end
+        c.flush
+        c.close
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.join("\n")
+      end
     }
     @connections = []
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.13.0
 platform: ruby
 authors:
 - Elijah Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -55,62 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: growl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Track anything.
 email:
 - support@instrumentalapp.com
@@ -127,6 +71,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- certs/equifax.ca.pem
+- certs/geotrust.ca.pem
+- certs/rapidssl.ca.pem
 - instrumental_agent.gemspec
 - lib/instrumental/agent.rb
 - lib/instrumental/capistrano.rb
@@ -135,8 +82,11 @@ files:
 - lib/instrumental_agent.rb
 - spec/agent_spec.rb
 - spec/spec_helper.rb
+- spec/test.crt
+- spec/test.csr
+- spec/test.key
 - spec/test_server.rb
-homepage: http://github.com/fastestforward/instrumental_agent
+homepage: http://github.com/expectedbehavior/instrumental_agent
 licenses:
 - MIT
 metadata: {}
@@ -156,11 +106,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Agent for reporting data to instrumentalapp.com
 test_files:
 - spec/agent_spec.rb
 - spec/spec_helper.rb
+- spec/test.crt
+- spec/test.csr
+- spec/test.key
 - spec/test_server.rb