diff options
| author | Joseph Larionov <30190605+decoyjoe@users.noreply.github.com> | 2022-11-01 12:37:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 15:37:58 -0400 |
| commit | c4ce765dc71a2ad1762ce5c43f0e245a17909378 (patch) | |
| tree | e4fac5f2b105844d97673e60e983c77649bfda9f /lib | |
| parent | 117e74ccbd1a00b6fca7da4687a68feb995b7977 (diff) | |
| download | chef-c4ce765dc71a2ad1762ce5c43f0e245a17909378.tar.gz | |
Bugfix: checksum validation (#13210)
* Add a case-insensitive helper to determine if two checksums match
* Use case-insensitive checksum match helper for checksum validation
This fixes a bug where checksum validation fails because the two
checksums are in different letter cases. The existing checksum
validation logic was using case sensitive equality checks.
Signed-off-by: Joseph Larionov <jlarionov@webmd.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/mixin/checksum.rb | 6 | ||||
| -rw-r--r-- | lib/chef/provider/file.rb | 4 | ||||
| -rw-r--r-- | lib/chef/provider/package/windows.rb | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/chef/mixin/checksum.rb b/lib/chef/mixin/checksum.rb index 083e524d63..10ecac0b36 100644 --- a/lib/chef/mixin/checksum.rb +++ b/lib/chef/mixin/checksum.rb @@ -31,6 +31,12 @@ class Chef checksum.slice(0, 6) end + + def checksum_match?(ref_checksum, diff_checksum) + return false if ref_checksum.nil? || diff_checksum.nil? + + ref_checksum.casecmp?(diff_checksum) + end end end end diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb index 4ac86a6c8a..02611af4eb 100644 --- a/lib/chef/provider/file.rb +++ b/lib/chef/provider/file.rb @@ -336,7 +336,7 @@ class Chef end def do_validate_content - if new_resource.checksum && tempfile && ( new_resource.checksum != tempfile_checksum ) + if new_resource.checksum && tempfile && !checksum_match?(new_resource.checksum, tempfile_checksum) raise Chef::Exceptions::ChecksumMismatch.new(short_cksum(new_resource.checksum), short_cksum(tempfile_checksum)) end @@ -450,7 +450,7 @@ class Chef def contents_changed? logger.trace "calculating checksum of #{tempfile.path} to compare with #{current_resource.checksum}" - tempfile_checksum != current_resource.checksum + !checksum_match?(tempfile_checksum, current_resource.checksum) end def tempfile diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb index 4350eb6d12..5581469062 100644 --- a/lib/chef/provider/package/windows.rb +++ b/lib/chef/provider/package/windows.rb @@ -38,7 +38,7 @@ class Chef def define_resource_requirements if new_resource.checksum requirements.assert(:install) do |a| - a.assertion { new_resource.checksum == checksum(source_location) } + a.assertion { checksum_match?(new_resource.checksum, checksum(source_location)) } a.failure_message Chef::Exceptions::Package, "Checksum on resource (#{short_cksum(new_resource.checksum)}) does not match checksum on content (#{short_cksum(source_location)})" end end |