diff options
| author | Dan Smith <dansmith@redhat.com> | 2022-11-09 07:33:37 -0800 |
|---|---|---|
| committer | Dan Smith <dansmith@redhat.com> | 2022-11-17 07:10:17 -0800 |
| commit | 323e9f5f93c99121c6ee34e711fb4fd1d191e430 (patch) | |
| tree | 1bfe7039389c5d3120e8178aba7878345955e6f1 | |
| parent | 5fbf47378e70537c73394408e69e94449aba1bec (diff) | |
| download | glance-323e9f5f93c99121c6ee34e711fb4fd1d191e430.tar.gz | |
Fix unintentional exception inspecting VMDK
It looks like a raise statement was left in the virtual_size property
handler for VMDK, which should have been converted to a log at some
point. All the other inspectors return zero for virtual_size if the
format does not match or they are unable to parse the data. This
converts that raise to a log, and adds a test to make sure we make it
far enough in the processing of the complex VMDK format to ensure that
behavior.
Closes-Bug: #1983279
Change-Id: I0352ab6b2c00055de094ac5902b8d50941d06dcf
(cherry picked from commit 199722a65a88f9c28b554b180ec36415ed3a51ac)
(cherry picked from commit 07f98747a2d4bf65f44348603ecba639d602db4d)
| -rwxr-xr-x | glance/common/format_inspector.py | 2 | ||||
| -rw-r--r-- | glance/tests/unit/common/test_format_inspector.py | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/glance/common/format_inspector.py b/glance/common/format_inspector.py index fbd20273b..351c300dd 100755 --- a/glance/common/format_inspector.py +++ b/glance/common/format_inspector.py @@ -567,7 +567,7 @@ class VMDKInspector(FileInspector): else: vmdktype = b'formatnotfound' if vmdktype != b'monolithicSparse': - raise ImageFormatError('Unsupported VMDK format %s' % vmdktype) + LOG.warning('Unsupported VMDK format %s', vmdktype) return 0 # If we have the descriptor, we definitely have the header diff --git a/glance/tests/unit/common/test_format_inspector.py b/glance/tests/unit/common/test_format_inspector.py index 4b29c19b3..d229d094f 100644 --- a/glance/tests/unit/common/test_format_inspector.py +++ b/glance/tests/unit/common/test_format_inspector.py @@ -153,6 +153,24 @@ class TestFormatInspectors(test_utils.BaseTestCase): def test_vdi_invalid(self): self._test_format_with_invalid_data('vdi') + def test_vmdk_invalid_type(self): + fmt = format_inspector.get_inspector('vmdk')() + wrapper = format_inspector.InfoWrapper(open(__file__, 'rb'), fmt) + while True: + chunk = wrapper.read(32) + if not chunk: + break + + wrapper.close() + + fake_rgn = mock.MagicMock() + fake_rgn.complete = True + fake_rgn.data = b'foocreateType="someunknownformat"bar' + + with mock.patch.object(fmt, 'has_region', return_value=True): + with mock.patch.object(fmt, 'region', return_value=fake_rgn): + self.assertEqual(0, fmt.virtual_size) + class TestFormatInspectorInfra(test_utils.BaseTestCase): def _test_capture_region_bs(self, bs): |