diff options
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/redfish/firmware_utils.py | 18 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/redfish/test_firmware_utils.py | 24 |
2 files changed, 40 insertions, 2 deletions
diff --git a/ironic/drivers/modules/redfish/firmware_utils.py b/ironic/drivers/modules/redfish/firmware_utils.py index c73cb80dd..feeec2df2 100644 --- a/ironic/drivers/modules/redfish/firmware_utils.py +++ b/ironic/drivers/modules/redfish/firmware_utils.py @@ -137,8 +137,22 @@ def verify_checksum(node, checksum, file_path): :param file_path: File path for which to verify checksum :raises RedfishError: When checksum does not match """ - calculated_checksum = fileutils.compute_file_checksum( - file_path, algorithm='sha1') + if len(checksum) <= 41: + # SHA1: 40 bytes long + calculated_checksum = fileutils.compute_file_checksum( + file_path, algorithm='sha1') + elif len(checksum) <= 64: + calculated_checksum = fileutils.compute_file_checksum( + file_path, algorithm='sha256') + elif len(checksum) <= 128: + calculated_checksum = fileutils.compute_file_checksum( + file_path, algorithm='sha512') + else: + raise exception.RedfishError( + _('Unable to identify checksum to perform firmware file checksum ' + 'calculation. Please validate your input in and try again. ' + 'Received: %(checksum)s') + % {'checksum': checksum}) if checksum != calculated_checksum: raise exception.RedfishError( _('For node %(node)s firmware file %(temp_file)s checksums do not ' diff --git a/ironic/tests/unit/drivers/modules/redfish/test_firmware_utils.py b/ironic/tests/unit/drivers/modules/redfish/test_firmware_utils.py index 61bc23e48..0bbc38eba 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_firmware_utils.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_firmware_utils.py @@ -256,6 +256,30 @@ class FirmwareUtilsTestCase(base.TestCase): mock_compute_file_checksum.assert_called_with( file_path, algorithm='sha1') + @mock.patch.object(fileutils, 'compute_file_checksum', autospec=True) + def test_verify_checksum_sha256(self, mock_compute_file_checksum): + checksum = 'a' * 64 + file_path = '/tmp/bios.exe' + mock_compute_file_checksum.return_value = checksum + node = mock.Mock(uuid='9f0f6795-f74e-4b5a-850e-72f586a92435') + + firmware_utils.verify_checksum(node, checksum, file_path) + + mock_compute_file_checksum.assert_called_with( + file_path, algorithm='sha256') + + @mock.patch.object(fileutils, 'compute_file_checksum', autospec=True) + def test_verify_checksum_sha512(self, mock_compute_file_checksum): + checksum = 'a' * 128 + file_path = '/tmp/bios.exe' + mock_compute_file_checksum.return_value = checksum + node = mock.Mock(uuid='9f0f6795-f74e-4b5a-850e-72f586a92435') + + firmware_utils.verify_checksum(node, checksum, file_path) + + mock_compute_file_checksum.assert_called_with( + file_path, algorithm='sha512') + @mock.patch.object(os, 'makedirs', autospec=True) @mock.patch.object(shutil, 'copyfile', autospec=True) @mock.patch.object(os, 'link', autospec=True) |