elastomer-client 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3abce6a0da503d9a912b1f444cfb1911aa230db717c703d3eba42d31122295f
-  data.tar.gz: 5ad2807d576cf3a48665217ad8601a531d308de10a1264ee63b131779014bdda
+  metadata.gz: 4cee8096020bd24f8d94aa4fc6f6f03f561a308091bb13c1fc30540ef98d69b8
+  data.tar.gz: 343bddae6131f036c3c713d328b2be6a378c7b708d82a926a1f610adbc8963cd
 SHA512:
-  metadata.gz: 8c390f6c7fb21ae298beacd9eac8d471a897b7e6f53a642c4db2024b011f1f8b07118edcb0e3df6ce217509a86a05735c51424c46eb7bda537c8d4e213512c71
-  data.tar.gz: b4ff217cd41090457e10cbb70b0beabfc5f672745d626afe4552f618ddb69367ff070691cc0743f00325ef06e8808e03a5c1509ff7da3e0e9fb9bcf1b983d8d8
+  metadata.gz: 61af8e5f289d5cae59239bf8fda64087ee722cef979f0898b56e10d5559830fc0fec403ee4dbabe1fd80b07849adf64ac9be6e654da40a94d02a7b808eb4cf99
+  data.tar.gz: 9b4f0d10dc3ec6664de87832108736e1963f0ff0da5caf84d730683dde6251a27a16c35e1e9642ed05dcbeb93bc1ee7913e796536fa8351ad87627300fc5c616

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.2.1 (2019-08-27)
+- Ignore basic_auth unless username and password are present
+
 ## 3.2.0 (2019-08-22)
 - Add config based basic and token auth to `Elastomer::Client#connection`
 - Filter `Elastomer::Client#inspect` output to hide basic and token auth info,

data/lib/elastomer/client.rb

@@ -147,10 +147,10 @@ module Elastomer
         conn.options[:timeout]      = read_timeout
         conn.options[:open_timeout] = open_timeout
 
-        if @token_auth.present?
+        if token_auth?
           conn.token_auth(@token_auth)
-        elsif @basic_auth.present?
-          conn.basic_auth(@basic_auth.fetch(:username), @basic_auth.fetch(:password))
+        elsif basic_auth?
+          conn.basic_auth(@basic_auth[:username], @basic_auth[:password])
         end
 
         if @adapter.is_a?(Array)
@@ -483,6 +483,23 @@ module Elastomer
       end.join(", ")
       "<##{self.class}:#{self.object_id.to_s(16)} #{public_vars}>"
     end
+
+    private
+
+    def token_auth?
+      present_for_auth?(@token_auth)
+    end
+
+    def basic_auth?
+      @basic_auth.is_a?(Hash) &&
+        present_for_auth?(@basic_auth[:username]) &&
+        present_for_auth?(@basic_auth[:password])
+    end
+
+    # Cheap implementation of ActiveSupport's Object#present?
+    def present_for_auth?(object)
+      object.respond_to?(:empty?) ? !object.empty? : !!object
+    end
   end  # Client
 end  # Elastomer
 

data/lib/elastomer/version.rb

@@ -1,5 +1,5 @@
 module Elastomer
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 
   def self.version
     VERSION

data/test/client_test.rb

@@ -119,6 +119,38 @@ describe Elastomer::Client do
       assert basic_auth_spy.has_been_called_with?("my_user", "my_secret_password")
     end
 
+    it "ignores basic authentication if password is missing" do
+      client_params = $client_params.merge(basic_auth: {
+        username: "my_user"
+      })
+      client = Elastomer::Client.new client_params
+
+      connection = Faraday::Connection.new
+      basic_auth_spy = Spy.on(connection, :basic_auth).and_return(nil)
+
+      Faraday.stub(:new, $client_params[:url], connection) do
+        client.ping
+      end
+
+      refute basic_auth_spy.has_been_called?
+    end
+
+    it "ignores basic authentication if username is missing" do
+      client_params = $client_params.merge(basic_auth: {
+        password: "my_secret_password"
+      })
+      client = Elastomer::Client.new client_params
+
+      connection = Faraday::Connection.new
+      basic_auth_spy = Spy.on(connection, :basic_auth).and_return(nil)
+
+      Faraday.stub(:new, $client_params[:url], connection) do
+        client.ping
+      end
+
+      refute basic_auth_spy.has_been_called?
+    end
+
     it "can use token authentication" do
       client_params = $client_params.merge(token_auth: "my_secret_token")
       client = Elastomer::Client.new client_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastomer-client
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Tim Pease
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable