MANIFEST.in | 11 11 + 0 - 0 !
1 file changed, 11 insertions(+)

 install missed files

doc/source/conf.py | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 remove sphinxcontrib.rsvgconverter from doc conf.py

etc/nova/api-paste.ini | 15 10 + 5 - 0 !
1 file changed, 10 insertions(+), 5 deletions(-)

 [patch] add a /healthcheck url

This is useful for operators to configure HAProxy and
for monitoring.

nova/tests/unit/virt/libvirt/test_utils.py | 43 40 + 3 - 0 !
nova/virt/libvirt/utils.py | 67 59 + 8 - 0 !
2 files changed, 99 insertions(+), 11 deletions(-)

 [patch] libvirt: add encryption support to qemu-img create command
 This adds handling of options needed for qemu-img create to generate
 encrypted images.

nova/tests/unit/virt/libvirt/test_utils.py | 1 1 + 0 - 0 !
nova/tests/unit/virt/test_images.py | 31 31 + 0 - 0 !
nova/virt/images.py | 9 9 + 0 - 0 !
3 files changed, 41 insertions(+)

 [patch 1/3] reject qcow files with data-file attributes

nova/conf/workarounds.py | 10 10 + 0 - 0 !
nova/image/format_inspector.py | 889 889 + 0 - 0 !
nova/tests/unit/virt/libvirt/test_utils.py | 44 42 + 2 - 0 !
nova/tests/unit/virt/test_images.py | 136 132 + 4 - 0 !
nova/virt/images.py | 49 47 + 2 - 0 !
5 files changed, 1120 insertions(+), 8 deletions(-)

 [patch] check images with format_inspector for safety

It has been asserted that we should not be calling qemu-img info
on untrusted files. That means we need to know if they have a
backing_file, data_file or other unsafe configuration *before* we use
qemu-img to probe or convert them.

This grafts glance's format_inspector module into nova/images so we
can use it to check the file early for safety. The expectation is that
this will be moved to oslo.utils (or something) later and thus we will
just delete the file from nova and change our import when that happens.

NOTE: This includes whitespace changes from the glance version of
format_inspector.py because of autopep8 demands.

Bug: #2059809

nova/image/format_inspector.py | 68 59 + 9 - 0 !
nova/tests/unit/virt/libvirt/test_driver.py | 7 5 + 2 - 0 !
nova/tests/unit/virt/libvirt/test_imagebackend.py | 45 41 + 4 - 0 !
nova/tests/unit/virt/libvirt/test_utils.py | 40 37 + 3 - 0 !
nova/virt/libvirt/imagebackend.py | 15 15 + 0 - 0 !
nova/virt/libvirt/utils.py | 28 28 + 0 - 0 !
6 files changed, 185 insertions(+), 18 deletions(-)

 [patch] additional qemu safety checking on base images

There is an additional way we can be fooled into using a qcow2 file
with a data-file, which is uploading it as raw to glance and then
booting an instance from it. Because when we go to create the
ephemeral disk from a cached base image, we've lost the information
about the original source's format, we probe the image's file type
without a strict format specified. If a qcow2 file is listed in
glance as a raw, we won't notice it until it is too late.

This brings over another piece of code (proposed against) glance's
format inspector which provides a safe format detection routine. This
patch uses that to detect the format of and run a safety check on the
base image each time we go to use it to create an ephemeral disk
image from it.

This also detects QED files and always marks them as unsafe as we do
not support that format at all. Since we could be fooled into
downloading one and passing it to qemu-img if we don't recognize it,
we need to detect and reject it as unsafe.

nova/tests/unit/virt/libvirt/test_utils.py | 25 23 + 2 - 0 !
nova/virt/libvirt/utils.py | 2 2 + 0 - 0 !
2 files changed, 25 insertions(+), 2 deletions(-)

 [patch] fix vmdk_allowed_types checking

This restores the vmdk_allowed_types checking in create_image()
that was unintentionally lost by tightening the
qemu-type-matches-glance code in the fetch patch recently. Since we
are still detecting the format of base images without metadata, we
would have treated a vmdk file that claims to be raw as raw in fetch,
but then read it like a vmdk once it was used as a base image for
something else.

Bug: #2059809

nova/tests/unit/image/test_format_inspector.py | 517 517 + 0 - 0 !
1 file changed, 517 insertions(+)

 cve-2024-40767: port format inspector tests from glance
 This commit is a direct port of the format inspector
 unit tests from glance as of commit
 0d8e79b713bc31a78f0f4eac14ee594ca8520999
 .
 the only changes to the test are as follows
 .
 "from glance.common import format_inspector" was updated to
 "from nova.image import format_inspector"
 .
 "from glance.tests import utils as test_utils"
 was replaced with "from nova import test"
 .
 "test_utils.BaseTestCase" was replaced with "test.NoDBTestCase"
 .
 "glance-unittest-formatinspector-" was replaced with
 "nova-unittest-formatinspector-"
 .
 This makes the test funtional in nova.
 .
 TestFormatInspectors requries qemu-img to be installed on the
 host which would be a new depency for executing unit tests.
 to avoid that we skip TestFormatInspectors if qemu-img
 is not installed.
 TestFormatInspectorInfra and TestFormatInspectorsTargeted
 do not have a qemu-img dependency so
 no changes to the test assertions were required.

nova/tests/unit/image/test_format_inspector.py | 72 63 + 9 - 0 !
1 file changed, 63 insertions(+), 9 deletions(-)

 cve-2024-40767: reproduce iso regression with deep format inspection
 This change adds a reproducer for the regression in iso
 file support when
 workarounds.disable_deep_image_inspection = False

nova/image/format_inspector.py | 109 104 + 5 - 0 !
nova/tests/unit/image/test_format_inspector.py | 104 92 + 12 - 0 !
nova/tests/unit/virt/test_images.py | 28 28 + 0 - 0 !
nova/virt/images.py | 5 5 + 0 - 0 !
4 files changed, 229 insertions(+), 17 deletions(-)

 cve-2024-40767: add iso file format inspector
 This change includes unit tests for the ISO
 format inspector using mkisofs to generate
 the iso files.
 .
 A test for stashing qcow content in the system_area
 of an iso file is also included.
 .
 This change modifies format_inspector.detect_file_format
 to evaluate all inspectors until they are complete and
 raise an InvalidDiskInfo exception if multiple formats
 match.

nova/tests/unit/virt/libvirt/test_utils.py | 23 13 + 10 - 0 !
nova/tests/unit/virt/test_images.py | 96 55 + 41 - 0 !
nova/virt/images.py | 57 37 + 20 - 0 !
3 files changed, 105 insertions(+), 71 deletions(-)

 cve-2024-40767: change force_format strategy to catch mismatches