webmock 1.24.0 → 1.24.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.24.1
+
+  * HTTPClient adapter supports reading basic authentication credentials directly from Authorization header.
+
+    Thanks to [Michiel Karnebeek](https://github.com/mkarnebeek)
+
 ## 1.24.0
 
   * Enabled support for Curb > 0.8.6

data/README.md

@@ -1034,6 +1034,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Alexey Zapparov
 * Pablo Brasero
 * Cedric Pimenta
+* Michiel Karnebeek
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -172,9 +172,6 @@ if defined?(::HTTPClient)
     uri.port = req.header.request_uri.port
     uri = uri.omit(:userinfo)
 
-    auth = www_auth.basic_auth
-    auth.challenge(req.header.request_uri, nil)
-
     @request_filter.each do |filter|
       filter.filter_request(req)
     end
@@ -186,11 +183,9 @@ if defined?(::HTTPClient)
     end
     headers = headers_from_session(uri).merge(headers)
 
-    if (auth_cred = auth.get(req)) && auth.scheme == 'Basic'
-      userinfo = WebMock::Util::Headers.decode_userinfo_from_header(auth_cred)
-      userinfo = WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo)
-      headers.reject! {|k,v| k =~ /[Aa]uthorization/ && v =~ /^Basic / } #we added it to url userinfo
-      uri.userinfo = userinfo
+    if auth_cred = auth_cred_from_www_auth(req) || auth_cred_from_headers(headers)
+      remove_authorization_header headers
+      uri.userinfo = userinfo_from_auth_cred auth_cred
     end
 
     signature = WebMock::RequestSignature.new(
@@ -208,6 +203,38 @@ if defined?(::HTTPClient)
     signature
   end
 
+  def userinfo_from_auth_cred auth_cred
+    userinfo = WebMock::Util::Headers.decode_userinfo_from_header(auth_cred)
+    WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo)
+  end
+
+  def remove_authorization_header headers
+    headers.reject! do |k, v|
+      next unless k =~ /[Aa]uthorization/
+      if v.is_a? Array
+        v.reject! { |v| v =~ /^Basic / }
+        v.length == 0
+      elsif v.is_a? String
+        v =~ /^Basic /
+      end
+    end
+  end
+
+  def auth_cred_from_www_auth(req)
+    auth = www_auth.basic_auth
+    auth.challenge(req.header.request_uri, nil)
+    auth.get(req) if auth.scheme == 'Basic'
+  end
+
+  def auth_cred_from_headers(headers)
+    headers.each do |k,v|
+      next unless k =~ /[Aa]uthorization/
+      return v if v.is_a?(String) && v =~ /^Basic /
+      v.each { |v| return v if v =~ /^Basic / } if v.is_a? Array
+    end
+    nil
+  end
+
   def webmock_responses
     @webmock_responses ||= Hash.new do |hash, request_signature|
       hash[request_signature] = WebMock::StubRegistry.instance.response_for_request(request_signature)

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.24.0' unless defined?(::WebMock::VERSION)
+  VERSION = '1.24.1' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -186,4 +186,12 @@ describe "HTTPClient" do
       expect(@response.body).to eq body
     end
   end
+
+  context 'credentials' do
+    it 'are detected when manually specifying Authorization header' do
+      stub_request(:get, 'username:password@www.example.com').to_return(:status => 200)
+      headers = {'Authorization' => 'Basic dXNlcm5hbWU6cGFzc3dvcmQ='}
+      expect(http_request(:get, 'http://www.example.com/', {:headers => headers}).status).to eql('200')
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 117
   prerelease: 
   segments: 
   - 1
   - 24
-  - 0
-  version: 1.24.0
+  - 1
+  version: 1.24.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-19 00:00:00 +01:00
+date: 2016-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency