skylight 0.0.2 → 0.0.5

data/lib/skylight/vendor/excon/ssl_socket.rb

@@ -0,0 +1,100 @@
+module Skylight
+  module Vendor
+    module Excon
+      class SSLSocket < Socket
+
+        def initialize(data = {})
+          @data = data
+          check_nonblock_support
+
+          super
+
+          # create ssl context
+          ssl_context = OpenSSL::SSL::SSLContext.new
+
+          if @data[:ssl_verify_peer]
+            # turn verification on
+            ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+            if @data[:ssl_ca_path]
+              ssl_context.ca_path = @data[:ssl_ca_path]
+            elsif @data[:ssl_ca_file]
+              ssl_context.ca_file = @data[:ssl_ca_file]
+            end
+          else
+            # turn verification off
+            ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+
+          if @data.has_key?(:client_cert) && @data.has_key?(:client_key)
+            ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@data[:client_cert]))
+            ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@data[:client_key]))
+          end
+
+          if @data[:proxy]
+            request = 'CONNECT ' << @data[:host] << ':' << @data[:port] << Excon::HTTP_1_1
+            request << 'Host: ' << @data[:host] << ':' << @data[:port] << Excon::CR_NL
+
+            if @data[:proxy][:password] || @data[:proxy][:user]
+              auth = ['' << @data[:proxy][:user].to_s << ':' << @data[:proxy][:password].to_s].pack('m').delete(Excon::CR_NL)
+              request << "Proxy-Authorization: Basic " << auth << Excon::CR_NL
+            end
+
+            request << 'Proxy-Connection: Keep-Alive' << Excon::CR_NL
+
+            request << Excon::CR_NL
+
+            # write out the proxy setup request
+            @socket.write(request)
+
+            # eat the proxy's connection response
+            Excon::Response.parse(@socket, { :expects => 200, :method => "CONNECT" })
+          end
+
+          # convert Socket to OpenSSL::SSL::SSLSocket
+          @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
+          @socket.sync_close = true
+          @socket.connect
+
+          # Server Name Indication (SNI) RFC 3546
+          if @socket.respond_to?(:hostname=)
+            @socket.hostname = @data[:host]
+          end
+
+          # verify connection
+          if @data[:ssl_verify_peer]
+            @socket.post_connection_check(@data[:host])
+          end
+
+          @socket
+        end
+
+        def connect
+          check_nonblock_support
+          super
+        end
+
+        def read(max_length=nil)
+          check_nonblock_support
+          super
+        end
+
+        def write(data)
+          check_nonblock_support
+          super
+        end
+
+        private
+
+        def check_nonblock_support
+          # backwards compatability for things lacking nonblock
+          if !DEFAULT_NONBLOCK && @data[:nonblock]
+            $stderr.puts("Excon nonblock is not supported by your OpenSSL::SSL::SSLSocket")
+            @data[:nonblock] = false
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/skylight/vendor/excon/standard_instrumentor.rb

@@ -0,0 +1,19 @@
+module Skylight
+  module Vendor
+    module Excon
+      class StandardInstrumentor
+        def self.instrument(name, params = {}, &block)
+          if params.has_key?(:headers) && params[:headers].has_key?('Authorization')
+            params = params.dup
+            params[:headers] = params[:headers].dup
+            params[:headers]['Authorization'] = REDACTED
+          end
+          $stderr.puts("#{name}  #{params.inspect}")
+          if block_given?
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/skylight/version.rb

@@ -1,3 +1,3 @@
 module Skylight
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'
 end

data/lib/skylight/worker.rb

@@ -181,19 +181,20 @@ module Skylight
     end
 
     def http_post(body)
-      req = http_request(body.bytesize)
-      req.body = body
+      hdrs = {}
+      hdrs[CONTENT_TYPE]  = body.bytesize
+      hdrs[AUTHORIZATION] = config.authentication_token
+      hdrs[CONTENT_TYPE]  = APPLICATION_JSON
 
-      debug "Posting report to server"
-      http = Net::HTTP.new config.host, config.port
-      http.use_ssl = true if config.ssl?
+      if config.deflate?
+        hdrs[CONTENT_ENCODING] = GZIP
+      end
 
-      http.start do |http|
-        resp = http.request req
+      debug "Posting report to server"
+      res = Excon.post(post_url, :headers => hdrs, :body => body)
 
-        unless resp.code == '200'
-          debug "Server responded with #{resp.code}"
-        end
+      unless res.status == 200
+        debug "Server responded with #{res.status}"
       end
 
       true
@@ -204,23 +205,23 @@ module Skylight
       end
     end
 
-    def http_request(length)
-      hdrs = {}
+    DEFAULT_PORT = {
+      'http'  => 80,
+      'https' => 443
+    }
 
-      hdrs[CONTENT_LENGTH] = length.to_s
-      hdrs[AUTHORIZATION]  = config.authentication_token
-      hdrs[CONTENT_TYPE]   = APPLICATION_JSON
+    def post_url
+      @post_url ||=
+        begin
+          proto = config.ssl?? 'https' : 'http'
+          host  = config.host
 
-      if config.deflate?
-        hdrs[CONTENT_ENCODING] = GZIP
-      end
+          if DEFAULT_PORT[proto] != config.port
+            host << ":#{config.port}"
+          end
 
-      Net::HTTPGenericRequest.new \
-        'POST',   # Request method
-        true,     # There is a request body
-        true,     # There is a response body
-        ENDPOINT, # Endpoint
-        hdrs
+          "#{proto}://#{host}#{ENDPOINT}"
+        end
     end
 
     def debug(msg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -55,6 +55,19 @@ files:
 - lib/skylight/util/queue.rb
 - lib/skylight/util/uniform_sample.rb
 - lib/skylight/util/uuid.rb
+- lib/skylight/vendor/excon.rb
+- lib/skylight/vendor/excon/cacert.pem
+- lib/skylight/vendor/excon/connection.rb
+- lib/skylight/vendor/excon/constants.rb
+- lib/skylight/vendor/excon/errors.rb
+- lib/skylight/vendor/excon/middlewares/base.rb
+- lib/skylight/vendor/excon/middlewares/expects.rb
+- lib/skylight/vendor/excon/middlewares/instrumentor.rb
+- lib/skylight/vendor/excon/middlewares/mock.rb
+- lib/skylight/vendor/excon/response.rb
+- lib/skylight/vendor/excon/socket.rb
+- lib/skylight/vendor/excon/ssl_socket.rb
+- lib/skylight/vendor/excon/standard_instrumentor.rb
 - lib/skylight/version.rb
 - lib/skylight/worker.rb
 - README.md