uv-rays 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ce972cd6ea7be66d23ff808f002069f3cb415a
-  data.tar.gz: 4bffabf548b5202db3d07639a23ff9c4a110374e
+  metadata.gz: 47bdebc71e47d424d3e778931cc693ccbc0607fc
+  data.tar.gz: 41b8f4ea19d9333a5c767383607b9368f2a6f593
 SHA512:
-  metadata.gz: 38a0cae2dd632d27afe0b7283a41087495ad42ed44ffc0b72b938262983a51c6660404ebcd7ea4a9103a55dabd40b0af15924f0934275c93d6cf41207c563270
-  data.tar.gz: a0ed6205afdda3bd31dda92e218d6d1d52d9c92114ba95c9bd3355a5c51f6e691907fc48b54c35d53d25ccc98550243cc190f5a3134f01ac65f1ec47e64a4636
+  metadata.gz: d6dc0c3c3e1bf6d395bcf15244e9bee66f510866a66e44c8e4c99a79760d7f2f5da221237ece5c7a726b81a7f4c808f1e958890e0390ba5cd33ea935c8f9113b
+  data.tar.gz: ede1b848ca18a236c093ec49723b457f4cd33aeffda61e561fe22099dcb1478e4ead18850131819d4e74bbcac6aa95fac129bcf6d3946555539461bbd9f64a75

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

@@ -1,4 +1,7 @@
+require 'uri'
+require 'cgi'
 require 'rubyntlm'
+require 'net/http/digest_auth'
 
 module UV
     module Http
@@ -29,10 +32,12 @@ module UV
                 @options = options
                 @endpoint = endpoint
                 @ntlm_creds = options[:ntlm]
+                @digest_creds = options[:digest]
+                @challenge_retries = 0
 
                 @path = options[:path]
                 @method = options[:method]
-                @uri = "#{endpoint.scheme}#{encode_host(endpoint.host, endpoint.port)}#{@path}"
+                @uri = "#{endpoint.scheme}://#{encode_host(endpoint.host, endpoint.port)}#{@path}"
 
                 @error = proc { |reason| reject(reason) }
             end
@@ -40,17 +45,34 @@ module UV
 
 
             def resolve(response, parser = nil)
-                if response.status == 401 && @ntlm_creds && @ntlm_retries == 0 && response[:"WWW-Authenticate"]
-                    @options[:headers][:Authorization] = ntlm_auth_header(response[:"WWW-Authenticate"])
-                    @ntlm_retries += 1
-
-                    execute(@transport)
-                    false
-                else
-                    @transport = nil
-                    @defer.resolve(response)
-                    true
+                if response.status == 401 && @challenge_retries == 0 && response[:"WWW-Authenticate"]
+                    challenge = response[:"WWW-Authenticate"]
+
+                    begin
+                        if @ntlm_creds && challenge[0..3] == 'NTLM'
+                            @options[:headers] ||= {}
+                            @options[:headers][:Authorization] = ntlm_auth_header(challenge)
+                            @challenge_retries += 1
+
+                            execute(@transport)
+                            return false
+                        elsif @digest_creds && challenge[0..5] == 'Digest'
+                            @options[:headers] ||= {}
+                            @options[:headers][:Authorization] = digest_auth_header(challenge)
+                            @challenge_retries += 1
+
+                            execute(@transport)
+                            return false
+                        end
+                    rescue => e
+                        reject e
+                        true
+                    end
                 end
+
+                @transport = nil
+                @defer.resolve(response)
+                true
             end
 
             def reject(reason)
@@ -68,7 +90,12 @@ module UV
                 @transport = transport
 
                 @endpoint.middleware.each do |m|
-                    head, body = m.request(self, head, body) if m.respond_to?(:request)
+                    begin
+                        head, body = m.request(self, head, body) if m.respond_to?(:request)
+                    rescue => e
+                        reject e
+                        return
+                    end
                 end
 
                 body = body.is_a?(Hash) ? form_encode_body(body) : body
@@ -191,7 +218,6 @@ module UV
                         return @ntlm_auth
                     end
                 else
-                    @ntlm_retries = 0
                     domain = @ntlm_creds[:domain]
                     t1 = Net::NTLM::Message::Type1.new()
                     t1.domain = domain if domain
@@ -205,6 +231,15 @@ module UV
                 return nil if scheme.nil?
                 return scheme, param_str
             end
+
+            def digest_auth_header(challenge)
+                uri = URI.parse @uri
+                uri.userinfo = "#{CGI::escape(@digest_creds[:user])}:#{CGI::escape(@digest_creds[:password])}"
+
+                digest_auth = Net::HTTP::DigestAuth.new
+                auth = digest_auth.auth_header uri, challenge, method.to_s.upcase
+                auth
+            end
         end
     end
 end

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
 end

data/spec/http_endpoint_spec.rb

@@ -47,6 +47,33 @@ module NTLMServer
 	end
 end
 
+module DigestServer
+	def post_init
+		@parser = ::HttpParser::Parser.new(self)
+        @state = ::HttpParser::Parser.new_instance
+        @state.type = :request
+
+        @req = 0
+	end
+
+	def on_message_complete(parser)
+		if @req == 0
+			@state = ::HttpParser::Parser.new_instance
+			write("HTTP/1.1 401 Unauthorized\r\nWWW-Authenticate: Digest realm=\"testrealm@host.com\",qop=\"auth,auth-int\",nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\",opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"\r\nContent-type: text/html\r\nContent-length: 0\r\n\r\n")
+		else
+			write("HTTP/1.1 200 OK\r\nContent-type: text/html\r\nContent-length: 1\r\n\r\nd")
+		end
+		@req += 1
+	end
+
+	def on_read(data, connection)
+		if @parser.parse(@state, data)
+            p 'parse error'
+            p @state.error
+        end
+	end
+end
+
 module OldServer
 	def post_init
 		@parser = ::HttpParser::Parser.new(self)
@@ -336,7 +363,7 @@ describe UV::HttpEndpoint do
 		end
 	end
 
-	describe 'NTLM auth support' do
+	describe 'Auth support' do
 		it "should perform NTLM auth transparently" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
@@ -370,6 +397,39 @@ describe UV::HttpEndpoint do
 			expect(@response.keep_alive).to eq(true)
 			expect(@response.body).to eq('y')
 		end
+
+		it "should perform Digest auth transparently" do
+			@loop.run { |logger|
+				logger.progress do |level, errorid, error|
+					begin
+						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+					rescue Exception
+						@general_failure << 'error in logger'
+					end
+				end
+
+				tcp = UV.start_server '127.0.0.1', 3252, DigestServer
+				server = UV::HttpEndpoint.new 'http://127.0.0.1:3252', digest: {
+					user: 'Mufasa',
+					password: 'Circle Of Life'
+				}
+
+				request = server.get(path: '/dir/index.html')
+				request.then(proc { |response|
+					@response = response
+					tcp.close
+					@loop.stop
+				}, @request_failure)
+			}
+
+			expect(@general_failure).to eq([])
+			expect(@response[:"Content-type"]).to eq('text/html')
+			expect(@response.http_version).to eq('1.1')
+			expect(@response.status).to eq(200)
+			expect(@response.cookies).to eq({})
+			expect(@response.keep_alive).to eq(true)
+			expect(@response.body).to eq('d')
+		end
 	end
 
 	describe 'when things go wrong' do

data/uv-rays.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
     gem.add_runtime_dependency     'addressable'
     gem.add_runtime_dependency     'http-parser', '>= 1.0.4'
     gem.add_runtime_dependency     'rubyntlm'
+    gem.add_runtime_dependency     'net-http-digest_auth'
 
     gem.add_development_dependency 'rspec', '>= 2.14'
     gem.add_development_dependency 'rake', '>= 10.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-digest_auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Abstractions for working with Libuv