Revert "CVE-2024-32498: Check for external qcow2 data file"

cinder/image/image_utils.py

@@ -52,7 +52,6 @@
 from cinder.i18n import _
 from cinder.image import accelerator
 from cinder.image import glance
-import cinder.privsep.format_inspector
 from cinder import utils
 from cinder.volume import throttling
 from cinder.volume import volume_utils
@@ -154,26 +153,11 @@ def from_qemu_img_disk_format(disk_format: str) -> str:
     return QEMU_IMG_FORMAT_MAP_INV.get(disk_format, disk_format)
 
 
-def qemu_img_info(
-        path: str,
-        run_as_root: bool = True,
-        force_share: bool = False,
-        allow_qcow2_backing_file: bool = False) -> imageutils.QemuImgInfo:
+def qemu_img_info(path: str,
+                  run_as_root: bool = True,
+                  force_share: bool = False) -> imageutils.QemuImgInfo:
     """Return an object containing the parsed output from qemu-img info."""
-
-    format_name = cinder.privsep.format_inspector.get_format_if_safe(
-        path=path,
-        allow_qcow2_backing_file=allow_qcow2_backing_file)
-    if format_name is None:
-        LOG.warning('Image/Volume %s failed safety check', path)
-        # NOTE(danms): This is the same exception as would be raised
-        # by qemu_img_info() if the disk format was unreadable or
-        # otherwise unsuitable.
-        raise exception.Invalid(
-            reason=_('Image/Volume failed safety check'))
-
-    cmd = ['env', 'LC_ALL=C', 'qemu-img', 'info',
-           '-f', format_name, '--output=json']
+    cmd = ['env', 'LC_ALL=C', 'qemu-img', 'info', '--output=json']
     if force_share:
         if qemu_img_supports_force_share():
             cmd.append('--force-share')
@@ -189,32 +173,8 @@ def qemu_img_info(
                               prlimit=QEMU_IMG_LIMITS)
     info = imageutils.QemuImgInfo(out, format='json')
 
-    # FIXME: figure out a more elegant way to do this
-    if info.file_format == 'raw':
-        # The format_inspector will detect a luks image as 'raw', and then when
-        # we call qemu-img info -f raw above, we don't get any of the luks
-        # format-specific info (some of which is used in the create_volume
-        # flow).  So we need to check if this is really a luks container.
-        # (We didn't have to do this in the past because we called
-        # qemu-img info without -f.)
-        cmd = ['env', 'LC_ALL=C', 'qemu-img', 'info',
-               '-f', 'luks', '--output=json']
-        if force_share:
-            cmd.append('--force-share')
-        cmd.append(path)
-        if os.name == 'nt':
-            cmd = cmd[2:]
-        try:
-            out, _err = utils.execute(*cmd, run_as_root=run_as_root,
-                                      prlimit=QEMU_IMG_LIMITS)
-            info = imageutils.QemuImgInfo(out, format='json')
-        except processutils.ProcessExecutionError:
-            # we'll just use the info object we already got earlier
-            pass
-
     # From Cinder's point of view, any 'luks' formatted images
-    # should be treated as 'raw'.  (This changes the file_format, but
-    # not any of the format-specific information.)
+    # should be treated as 'raw'.
     if info.file_format == 'luks':
         info.file_format = 'raw'
 
@@ -720,35 +680,6 @@ def get_qemu_data(image_id: str,
     return data
 
 
-def check_qcow2_image(image_id: str, data: imageutils.QemuImgInfo) -> None:
-    """Check some rules about qcow2 images.
-
-    Does not check for a backing_file, because cinder has some legitimate
-    use cases for qcow2 backing files.
-
-    Makes sure the image:
-
-    - does not have a data_file
-
-    :param image_id: the image id
-    :param data: an imageutils.QemuImgInfo object
-    :raises ImageUnacceptable: when the image fails the check
-    """
-    try:
-        data_file = data.format_specific['data'].get('data-file')
-    except (KeyError, TypeError):
-        LOG.debug('Unexpected response from qemu-img info when processing '
-                  'image %s: missing format-specific info for a qcow2 image',
-                  image_id)
-        msg = _('Cannot determine format-specific information')
-        raise exception.ImageUnacceptable(image_id=image_id, reason=msg)
-    if data_file:
-        LOG.warning("Refusing to process qcow2 file with data-file '%s'",
-                    data_file)
-        msg = _('A qcow2 format image is not allowed to have a data file')
-        raise exception.ImageUnacceptable(image_id=image_id, reason=msg)
-
-
 def check_vmdk_image(image_id: str, data: imageutils.QemuImgInfo) -> None:
     """Check some rules about VMDK images.
 
@@ -839,8 +770,6 @@ def check_image_format(source: str,
 
     if data.file_format == 'vmdk':
         check_vmdk_image(image_id, data)
-    if data.file_format == 'qcow2':
-        check_qcow2_image(image_id, data)
 
 
 def fetch_verify_image(context: context.RequestContext,
@@ -883,11 +812,6 @@ def fetch_verify_image(context: context.RequestContext,
             if fmt == 'vmdk':
                 check_vmdk_image(image_id, data)
 
-            # Bug #2059809: a qcow2 can have a data file that's similar
-            # to a backing file and is also unacceptable
-            if fmt == 'qcow2':
-                check_qcow2_image(image_id, data)
-
 
 def fetch_to_vhd(context: context.RequestContext,
                  image_service: glance.GlanceImageService,