uv-rays 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98ca3114c943ec05175971d81d65bdfe6572894
-  data.tar.gz: d92dcde8d7221fb14a75b6c9d8b3e38af49560bd
+  metadata.gz: f2071c1ca1785836a027d0c84859a9ab8f8fdd39
+  data.tar.gz: b82be2f6611fecd989e85693894ea4996ff16cc1
 SHA512:
-  metadata.gz: dd9826d083d991d08c12710c693e8eaefa79d74bfb479f104d0f32574dfc820fa58a48264ee5aae3f0cac84066611a381b727e9f437d01a3dd8d7ca4122d844d
-  data.tar.gz: 684db01106810c7fe628b1aaceeb917468b25d65f0114350a3fa56f08ad8543a9eea62affe92056ad4da3b8540120d2294063da7d1c29661b7679db62788b1b1
+  metadata.gz: d37fadf118df972c3a8e9ddeddc1142e36e3f45b24e67cfc21e54447b9570156e495d0bdf8181e96660b80e105e8cd075e52042f69c5e4337f8de3fa6bb24ab9
+  data.tar.gz: d962b2226429fb52d9286745881a5c2100680f5601c203780dbfe306016c1bf369ef5d26aa2bb2a4fc26cccb7f8bc7e06adce3f02cb42337602ae13f7a8e9f21

data/README.md

@@ -50,3 +50,14 @@ reactor {
 }
 
 ```
+
+# Integrations
+
+UV-Rays works with many existing GEMs by integrating into common HTTP abstraction libraries
+
+* [Faraday](https://github.com/lostisland/faraday)
+* [HTTPI](https://github.com/savonrb/httpi)
+* [Handsoap](https://github.com/unwire/handsoap)
+
+
+

data/lib/faraday/adapter/libuv.rb

@@ -34,6 +34,15 @@ module Faraday
           opts[:inactivity_timeout] = (req[:timeout] * 1000) if req[:timeout]
         end
 
+        if proxy = env[:request][:proxy]
+          opts[:proxy] = {
+            host: proxy[:uri].host,
+            port: proxy[:uri].port,
+            username: proxy[:user],
+            password: proxy[:password]
+          }
+        end
+
         error = nil
         thread = reactor
         if thread.running?

data/lib/httpi/adapter/libuv.rb

@@ -21,6 +21,15 @@ class HTTPI::Adapter::Libuv < HTTPI::Adapter::Base
             body: @request.body
         }
 
+        if proxy = @request.proxy
+            req[:proxy] = {
+                host: proxy.host,
+                port: proxy.port,
+                username: proxy.user,
+                password: proxy.password
+            }
+        end
+
         # Apply authentication settings
         auth = @request.auth
         type = auth.type

data/lib/uv-rays/http/encoding.rb

@@ -44,8 +44,7 @@ module UV
 
             def encode_request(method, uri, query)
                 query = encode_query(uri, query)
-
-                HTTP_REQUEST_HEADER % [method.to_s.upcase, query]
+                String.new(HTTP_REQUEST_HEADER % [method.to_s.upcase, query])
             end
 
             def encode_query(uri, query)

data/lib/uv-rays/http/request.rb

@@ -33,6 +33,7 @@ module UV
 
                 @host = endpoint.host
                 @port = endpoint.port
+                @http_proxy = endpoint.http_proxy? ? endpoint.proxy : nil
                 @encoded_host = endpoint.encoded_host
 
                 path = options[:path]
@@ -46,6 +47,7 @@ module UV
                 @cookiejar = endpoint.cookiejar
                 @middleware = endpoint.middleware
                 @uri = "#{endpoint.scheme}://#{@encoded_host}#{@path}"
+                @path = @uri if @http_proxy
                 endpoint = nil
 
                 @options = options
@@ -139,7 +141,10 @@ module UV
                     head['content-type'] = 'application/x-www-form-urlencoded'
                 end
 
-                request_header = encode_request(method, path, query)
+                request_header = encode_request(method, @path, query)
+                if @http_proxy && (@http_proxy[:username] || @http_proxy[:password])
+                    request_header << encode_auth('Proxy-Authorization', [@http_proxy[:username], @http_proxy[:password]])
+                end
                 request_header << encode_headers(head)
                 request_header << CRLF
 

data/lib/uv-rays/http_endpoint.rb

@@ -33,33 +33,76 @@ module UV
         end
     end # CookieJar
 
+    # HTTPS Proxy - connect to proxy
+    # CONNECT #{target_host}:#{target_port} HTTP/1.0\r\n"
+    # Proxy-Authorization: Basic #{encoded_credentials}\r\n
+    # \r\n
+    # Parse response =~ %r{\AHTTP/1\.[01] 200 .*\r\n\r\n}m
+    # use_tls
+    # send requests as usual
+
+    # HTTP Proxy - connect to proxy
+    # GET #{url_with_host} HTTP/1.1\r\n"
+    # Proxy-Authorization: Basic #{encoded_credentials}\r\n
+    # \r\n
+
     class HttpEndpoint
         class Connection < OutboundConnection
-            def initialize(host, port, tls, client)
+            def initialize(host, port, tls, proxy, client)
+                @target_host = host
                 @client = client
                 @request = nil
-                super(host, port)
 
-                if tls
-                    opts = {host_name: host}.merge(client.tls_options)
-                    use_tls(opts)
+                if proxy
+                    super(proxy[:host], proxy[:port])
+                    connect_send_handshake(host, port, proxy) if tls
+                else
+                    super(host, port)
+                    start_tls if tls
                 end
             end
 
+            def start_tls
+                opts = {host_name: @target_host}.merge(@client.tls_options)
+                use_tls(opts)
+            end
+
+            def connect_send_handshake(target_host, target_port, proxy)
+                @negotiating = true
+                header = String.new("CONNECT #{target_host}:#{target_port} HTTP/1.0\r\n")
+                if proxy[:username] || proxy[:password]
+                    encoded_credentials = Base64.strict_encode64([proxy[:username], proxy[:password]].join(":"))
+                    header << "Proxy-Authorization: Basic #{encoded_credentials}\r\n"
+                end
+                header << "\r\n"
+                write(header)
+            end
+
             attr_accessor :request, :reason
 
-            def on_read(data, *args) # user to define
-                @client.data_received(data)
+            def on_read(data, *args)
+                if @negotiating
+                    @negotiating = false
+                    if data =~ %r{\AHTTP/1\.[01] 200 .*\r\n\r\n}m
+                        start_tls
+                        @client.connection_ready
+                    else
+                        @reason = "Unexpected response from proxy: #{data}"
+                        close_connection
+                    end
+                else
+                    @client.data_received(data)
+                end
             end
 
             def post_init(*args)
             end
 
-            def on_connect(transport) # user to define
-                @client.connection_ready
+            def on_connect(transport)
+                @client.connection_ready unless @negotiating
             end
 
-            def on_close # user to define
+            def on_close
                 @client.connection_closed(@request, @reason)
             ensure
                 @request = nil
@@ -100,6 +143,7 @@ module UV
 
             default_port = uri.port == uri.default_port
             @encoded_host = default_port ? @host : "#{@host}:#{@port}"
+            @proxy = @options[:proxy]
 
             @scheme = uri.scheme
             @tls = @scheme == 'https'
@@ -110,7 +154,7 @@ module UV
 
         attr_accessor :inactivity_timeout
         attr_reader :tls_options, :port, :host, :tls, :scheme, :encoded_host
-        attr_reader :cookiejar, :middleware, :thread
+        attr_reader :cookiejar, :middleware, :thread, :proxy
 
 
         def get(options = {});     request(:get,     options); end
@@ -191,6 +235,10 @@ module UV
             close_connection
         end
 
+        def http_proxy?
+            @proxy && !@tls
+        end
+
 
         private
 
@@ -211,7 +259,7 @@ module UV
 
         def new_connection
             if @queue.length > 0 && @connection.nil?
-                @connection = Connection.new(@host, @port, @tls, self)
+                @connection = Connection.new(@host, @port, @tls, @proxy, self)
                 start_timer
             end
             @connection

data/lib/uv-rays/scheduler.rb

@@ -259,7 +259,7 @@ module UV
         # @param schedule [String] a standard CRON job line.
         # @param callback [Proc] a block or method to execute when the event triggers
         # @return [::UV::Repeat]
-        def cron(schedule, callback = nil, timezone: nil , &block)
+        def cron(schedule, callback = nil, timezone: nil, &block)
             callback ||= block
             ms = Scheduler.parse_cron(schedule, timezone: timezone)
             event = Repeat.new(self, ms)

data/lib/uv-rays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UV
-    VERSION = '2.2.2'
+    VERSION = '2.3.0'
 end

data/spec/http_endpoint_spec.rb

@@ -186,7 +186,7 @@ describe UV::HttpEndpoint do
 			@reactor.stop
 			@general_failure << "test timed out"
 		end
-		@timeout.start(5000)
+		@timeout.start(10000)
 
 		@request_failure = proc { |err|
 			@general_failure << err
@@ -579,4 +579,58 @@ describe UV::HttpEndpoint do
 			expect(@error2).to eq(:connection_failure)
 		end
 	end
+
+=begin
+	describe 'proxy support' do
+		it "should work with a HTTP proxy server" do
+			@reactor.run { |reactor|
+				server = UV::HttpEndpoint.new 'http://www.whatsmyip.org', {
+					#inactivity_timeout: 1000,
+					proxy: {
+						host: '212.47.252.49',
+						port: 3128
+					}
+				}
+
+				@response = nil
+
+				request = server.get(:path => '/', headers: {accept: 'text/html'})
+				request.then(proc { |response|
+					@response = response
+					@reactor.stop
+				}, proc { |error|
+					@error = error
+				})
+			}
+
+			expect(@general_failure).to eq([])
+			expect(@response.status).to eq(200)
+		end
+
+		it "should work with a HTTPS proxy server" do
+			@reactor.run { |reactor|
+				server = UV::HttpEndpoint.new 'https://www.google.com.au', {
+					#inactivity_timeout: 1000,
+					proxy: {
+						host: '212.47.252.49',
+						port: 3128
+					}
+				}
+
+				@response = nil
+
+				request = server.get(:path => '/', headers: {accept: 'text/html'})
+				request.then(proc { |response|
+					@response = response
+					@reactor.stop
+				}, proc { |error|
+					@error = error
+				})
+			}
+
+			expect(@general_failure).to eq([])
+			expect(@response.status).to eq(200)
+		end
+	end
+=end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Abstractions for working with Libuv