uv-rays 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b06f4cf86067b6a2efe196238fab6cf7dda7d7
-  data.tar.gz: 40e682d35d1bb7360012b442e08c08ca5d16f471
+  metadata.gz: 058dd2e60b392b41bd8138d396022069f087f730
+  data.tar.gz: 3ba1ec427f37ccbc321c38cd1cd6ed7021dbfaf4
 SHA512:
-  metadata.gz: e39c2e2075fe9f6a6bbd22a3142fc12f8bfbd05bf4eb51753b8851241bb1651f22faeb0e0f06731006312325541fe6bce595b5ab03bde13bed3eed7e4a8e4825
-  data.tar.gz: d69d179bb6714e4e7aeb1c21ce186891af31afbbfd7565b3380ebf1ed7b4c7a2b5719fc8e078ebc4e19594291c026ae99729b8be24649346198dd6379640a9b6
+  metadata.gz: f4d0275064097f22c4b3a955f55874ede3735dd7315bd120d2a0b01ad89c497af88523a516df2d9ac2b984295ff907fb1174b2c7c90120f266a6699278318227
+  data.tar.gz: 35110447fbce49124c2f5592d9caa35e8e17368f6a1831084213131ad3dbd106f39edae90c395ead4d3e3f7968d638e871445cb31c7a6f2b6af2650daa124b82

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

@@ -11,7 +11,7 @@ module UV
 
             attr_reader :path
             attr_reader :method
-            attr_reader :headers
+            attr_reader :headers, :options
 
 
             def cookies_hash
@@ -23,22 +23,32 @@ module UV
             end
             
 
-            def initialize(endpoint, options)
+            def initialize(endpoint, options, using_ntlm)
                 super(endpoint.loop, endpoint.loop.defer)
 
                 @options = options
                 @endpoint = endpoint
+                @ntlm_retries = using_ntlm ? 0 : nil
 
                 @path = options[:path]
                 @method = options[:method]
                 @uri = "#{endpoint.scheme}#{encode_host(endpoint.host, endpoint.port)}#{@path}"
             end
 
-            def resolve(response)
-                @defer.resolve({
-                    headers: @headers,
-                    body: response
-                })
+            def resolve(response, body)
+                if @ntlm_retries && @headers.status == 401 && @headers[:"WWW-Authenticate"] && @ntlm_retries < 3
+                    @options[:headers][:Authorization] = @endpoint.ntlm_auth_header(@headers[:"WWW-Authenticate"])
+                    @ntlm_retries += 1
+
+                    response.request = self
+                    execute(*@exec_params)
+                else
+                    @exec_params = nil
+                    @defer.resolve({
+                        headers: @headers,
+                        body: body
+                    })
+                end
             end
 
             def reject(reason)
@@ -47,6 +57,7 @@ module UV
 
             def execute(transport, error)
                 head, body = build_request, @options[:body]
+                @exec_params = [transport, error]
 
                 @endpoint.middleware.each do |m|
                     head, body = m.request(self, head, body) if m.respond_to?(:request)
@@ -79,7 +90,7 @@ module UV
 
                 if body
                     request_header << body
-                    transport.write(body).catch error
+                    transport.write(request_header).catch error
                 elsif file
                     transport.write(request_header).catch error
 

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

@@ -110,11 +110,14 @@ module UV
             end
 
             def on_message_complete(parser)
-                @request.resolve(@body)
+                req = @request
+                bod = @body
 
                 # Clean up memory
                 @request = nil
                 @body = nil
+
+                req.resolve(self, bod)
             end
 
             # We need to flush the response on disconnect if content-length is undefined

data/lib/uv-rays/http_endpoint.rb

@@ -1,3 +1,6 @@
+require 'rubyntlm'
+
+
 module UV
     class CookieJar
         def initialize
@@ -51,7 +54,7 @@ module UV
 
         def initialize(uri, options = {})
             @inactivity_timeout  = options[:inactivity_timeout] ||= 10000   # default connection inactivity (post-setup) timeout
-
+            @ntlm_creds = options[:ntlm]
 
             uri = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI::parse(uri.to_s)
             @https = uri.scheme == "https"
@@ -102,7 +105,7 @@ module UV
             options[:method] = method
 
             # Setup the request with callbacks
-            request = Http::Request.new(self, options)
+            request = Http::Request.new(self, options, @ntlm_creds)
             request.then(proc { |result|
                 @waiting_response = nil
 
@@ -212,6 +215,13 @@ module UV
             @response.request = @staging_request
             @staging_request = nil
 
+            if @ntlm_creds
+                opts = @waiting_response.options
+                opts[:headers] ||= {}
+                opts = opts[:headers]
+                opts[:Authorization] = ntlm_auth_header
+            end
+
             @timer.again if @inactivity_timeout > 0
             @waiting_response.execute(@transport, proc { |err|
                 @transport.close
@@ -242,7 +252,30 @@ module UV
             reqs.each do |request|
                 request.reject(:close_connection)
             end
-            super(after_writing)
+            super(after_writing) if @transport
+        end
+
+        def ntlm_auth_header(challenge = nil)
+            if @ntlm_auth && challenge.nil?
+                return @ntlm_auth
+            elsif challenge
+                scheme, param_str = parse_ntlm_challenge_header(challenge)
+                if param_str.nil?
+                    @ntlm_auth = nil
+                    return ntlm_auth_header(creds)
+                else
+                    t2 = Net::NTLM::Message.decode64(param_str)
+                    t3 = t2.response(@ntlm_creds, ntlmv2: true)
+                    @ntlm_auth = "NTLM #{t3.encode64}"
+                    return @ntlm_auth
+                end
+            else
+                domain = @ntlm_creds[:domain]
+                t1 = Net::NTLM::Message::Type1.new()
+                t1.domain = domain if domain
+                @ntlm_auth = "NTLM #{t1.encode64}"
+                return @ntlm_auth
+            end
         end
 
 
@@ -257,5 +290,11 @@ module UV
         def stop_timer
             @timer.stop unless @timer.nil?
         end
+
+        def parse_ntlm_challenge_header(challenge)
+            scheme, param_str = challenge.scan(/\A(\S+)(?:\s+(.*))?\z/)[0]
+            return nil if scheme.nil?
+            return scheme, param_str
+        end
     end
 end

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
 end

data/spec/http_endpoint_spec.rb

@@ -20,6 +20,33 @@ module HttpServer
 	end
 end
 
+module NTLMServer
+	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: NTLM TlRMTVNTUAACAAAAEgASADgAAAAFgokCuEPycVw6htsAAAAAAAAAAK4ArgBKAAAABgOAJQAAAA9SAEEAQgBPAE4ARQBUAE8AQwACABIAUgBBAEIATwBOAEUAVABPAEMAAQAUAFMAWQBQAFYAMQA5ADkAMAA1ADUABAAcAG8AYwAuAHIAYQBiAG8AbgBlAHQALgBjAG8AbQADADIAUwBZAFAAVgAxADkAOQAwADUANQAuAG8AYwAuAHIAYQBiAG8AbgBlAHQALgBjAG8AbQAFABYAcgBhAGIAbwBuAGUAdAAuAGMAbwBtAAcACACcZNzCwkbRAQAAAAA=\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\ny")
+		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)
@@ -201,4 +228,40 @@ describe UV::HttpEndpoint do
 			expect(@response2[:headers].keep_alive).to eq(false)
 		end
 	end
+
+	describe 'NTLM auth support' do
+		it "should perform NTLM 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', 3250, NTLMServer
+				server = UV::HttpEndpoint.new 'http://127.0.0.1:3250', ntlm: {
+					user: 'username',
+					password: 'password',
+					domain: 'domain'
+				}
+
+				request = server.get(path: '/')
+				request.then(proc { |response|
+					@response = response
+					tcp.close
+					@loop.stop
+				}, @request_failure)
+			}
+
+			expect(@general_failure).to eq([])
+			expect(@response[:headers][:"Content-type"]).to eq('text/html')
+			expect(@response[:headers].http_version).to eq('1.1')
+			expect(@response[:headers].status).to eq(200)
+			expect(@response[:headers].cookies).to eq({})
+			expect(@response[:headers].keep_alive).to eq(true)
+			expect(@response[:body]).to eq('y')
+		end
+	end
 end

data/uv-rays.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
     gem.add_runtime_dependency     'ipaddress'
     gem.add_runtime_dependency     'addressable'
     gem.add_runtime_dependency     'http-parser', '>= 1.0.4'
+    gem.add_runtime_dependency     'rubyntlm'
 
     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.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: rubyntlm
+  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