diff options
-rw-r--r-- | lib/mixlib/authentication/digester.rb | 4 | ||||
-rw-r--r-- | lib/mixlib/authentication/signedheaderauth.rb | 2 | ||||
-rw-r--r-- | spec/mixlib/authentication/digester_spec.rb | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/mixlib/authentication/digester.rb b/lib/mixlib/authentication/digester.rb index 8628d53..f826b4c 100644 --- a/lib/mixlib/authentication/digester.rb +++ b/lib/mixlib/authentication/digester.rb @@ -27,9 +27,7 @@ module Mixlib def hash_file(f, digest = OpenSSL::Digest::SHA1) digester = digest.new buf = "" - while f.read(16384, buf) - digester.update buf - end + digester.update buf while f.read(16384, buf) ::Base64.encode64(digester.digest).chomp end diff --git a/lib/mixlib/authentication/signedheaderauth.rb b/lib/mixlib/authentication/signedheaderauth.rb index ab8d989..855fd80 100644 --- a/lib/mixlib/authentication/signedheaderauth.rb +++ b/lib/mixlib/authentication/signedheaderauth.rb @@ -274,7 +274,7 @@ module Mixlib def server_api_version key = (self[:headers] || {}).keys.select do |k| - k.downcase == "x-ops-server-api-version" + k.casecmp("x-ops-server-api-version").zero? end.first if key self[:headers][key] diff --git a/spec/mixlib/authentication/digester_spec.rb b/spec/mixlib/authentication/digester_spec.rb index fd3eb41..4688d5c 100644 --- a/spec/mixlib/authentication/digester_spec.rb +++ b/spec/mixlib/authentication/digester_spec.rb @@ -7,14 +7,14 @@ describe Mixlib::Authentication::Digester do let(:test_string) { "hello" } let(:test_string_checksum) { "qvTGHdzF6KLavt4PO0gs2a6pQ00=" } - describe '#hash_file' do + describe "#hash_file" do it "should default to use SHA1" do expect(described_class.hash_file(StringIO.new(test_string))).to( eq(test_string_checksum)) end end - describe '#hash_string' do + describe "#hash_string" do it "should default to use SHA1" do expect(described_class.hash_string(test_string)).to( eq(test_string_checksum)) |