mixlib-authentication 1.4.0.rc.0 → 1.4.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4af0553c29d4d0ee53f281ab38ef8ed7097ba8f9
-  data.tar.gz: 198e0ae73d73b4d5c3f39e61dd30bab6822c1031
+  metadata.gz: 07bcb6ac6bcde43d7a76debec94ba82dce31126b
+  data.tar.gz: e524d4f67e7834f75f1e0b02ac5678120aa92533
 SHA512:
-  metadata.gz: 5613f35e48e2142c25614b39c114b9ed7412a5039eea64141bed4087408c51f4242a11b954a9d0393a85b1ecdd850dc505d2267c21eb8c3737af6a795873d4c8
-  data.tar.gz: 071de33850bcf8120424ef0ee26e4d6013fd96fabff92c10dd69caf2da521b890d8433809080b8e86a0022f111c83edb6e47c334ed44517bb3811db856c6e8a0
+  metadata.gz: a76554da7dbe898d3a123786d5edb4e4cddf476f2fedb74bfd1621b0000806f9fef907726cd16dd04c0bb2c59187eddf2a6a25b327af3598006f756665bad817
+  data.tar.gz: 4d18f87f8557dd0fa82fd67f387749d1d228d2c9cda0c747fe3aad5f2cae834940bb57d09df35ce66747fdbcb6b2392a1b02994665bbe128dc04b95030da92aa

data/lib/mixlib/authentication/digester.rb

@@ -17,13 +17,14 @@
 #
 
 require 'mixlib/authentication'
+require 'openssl'
 
 module Mixlib
   module Authentication
     class Digester
       class << self
 
-        def hash_file(digest, f)
+        def hash_file(f, digest=OpenSSL::Digest::SHA1)
           digester = digest.new
           buf = ""
           while f.read(16384, buf)
@@ -36,7 +37,7 @@ module Mixlib
         #
         # ====Parameters
         #
-        def hash_string(digest, str)
+        def hash_string(str, digest=OpenSSL::Digest::SHA1)
           ::Base64.encode64(digest.digest(str)).chomp
         end
 

data/lib/mixlib/authentication/signatureverification.rb

@@ -214,11 +214,11 @@ module Mixlib
           # we hash the body.
           if file_param
             Mixlib::Authentication::Log.debug "Digesting file_param: '#{file_param.inspect}'"
-            @hashed_body = digester.hash_file(digest, file_param)
+            @hashed_body = digester.hash_file(file_param, digest)
           else
             body = request.raw_post
             Mixlib::Authentication::Log.debug "Digesting body: '#{body}'"
-            @hashed_body = digester.hash_string(digest, body)
+            @hashed_body = digester.hash_string(body, digest)
           end
         end
         @hashed_body

data/lib/mixlib/authentication/signedheaderauth.rb

@@ -177,9 +177,9 @@ module Mixlib
         # always sign the entire request body, using the expanded multipart
         # body in the case of a file being include.
         @hashed_body ||= if self.file && self.file.respond_to?(:read)
-                           digester.hash_file(digest, self.file)
+                           digester.hash_file(self.file, digest)
                          else
-                           digester.hash_string(digest, self.body)
+                           digester.hash_string(self.body, digest)
                          end
       end
 
@@ -206,7 +206,7 @@ module Mixlib
         else
           [
             "Method:#{http_method.to_s.upcase}",
-            "Hashed Path:#{digester.hash_string(digest, canonical_path)}",
+            "Hashed Path:#{digester.hash_string(canonical_path, digest)}",
             "X-Ops-Content-Hash:#{hashed_body(digest)}",
             "X-Ops-Timestamp:#{canonical_time}",
             "X-Ops-UserId:#{canonical_x_ops_user_id}"
@@ -218,7 +218,7 @@ module Mixlib
         case proto_version
         when "1.1"
           # and 1.2 if that ever gets implemented
-          digester.hash_string(digest, user_id)
+          digester.hash_string(user_id, digest)
         else
           # versions 1.0 and 1.3
           user_id

data/lib/mixlib/authentication/version.rb

@@ -16,6 +16,6 @@
 
 module Mixlib
   module Authentication
-    VERSION = '1.4.0.rc.0'
+    VERSION = '1.4.0.rc.1'
   end
 end

data/spec/mixlib/authentication/digester_spec.rb

@@ -0,0 +1,24 @@
+require 'mixlib/authentication/digester'
+
+describe Mixlib::Authentication::Digester do
+  context 'backcompat' do
+    # The digester API should really have been private,
+    # however oc-chef-pedant uses it.
+    let(:test_string) { 'hello' }
+    let(:test_string_checksum) { 'qvTGHdzF6KLavt4PO0gs2a6pQ00=' }
+
+    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
+      it 'should default to use SHA1' do
+        expect(described_class.hash_string(test_string)).to(
+          eq(test_string_checksum))
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-authentication
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc.0
+  version: 1.4.0.rc.1
 platform: ruby
 authors:
 - Opscode, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -101,6 +101,7 @@ files:
 - lib/mixlib/authentication/signedheaderauth.rb
 - lib/mixlib/authentication/version.rb
 - mixlib-authentication.gemspec
+- spec/mixlib/authentication/digester_spec.rb
 - spec/mixlib/authentication/http_authentication_request_spec.rb
 - spec/mixlib/authentication/mixlib_authentication_spec.rb
 - spec/spec_helper.rb