From bc3c52de14289111b4db528950ffb2dca391bafb Mon Sep 17 00:00:00 2001
From: Preslav Gerchev <preslav@mondoo.com>
Date: Mon, 8 Jul 2024 07:15:24 +0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Normalize=20partition=20labels?=
 =?UTF-8?q?=20before=20checking=20them=20and=20sort=20by=20size=20(#4314)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛 Normalize partition labels before checking them. Return first match from findVolume.

Signed-off-by: Preslav <preslav@mondoo.com>

* Sort candidate partitions.

---------

Signed-off-by: Preslav <preslav@mondoo.com>
---
 providers/os/connection/snapshot/blockdevices.go  | 15 ++++++++++-----
 .../os/connection/snapshot/blockdevices_test.go   |  4 ++--
 .../snapshot/testdata/alma9_attached.json         |  2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/providers/os/connection/snapshot/blockdevices.go b/providers/os/connection/snapshot/blockdevices.go
index 49ac7689eb..4afac10279 100644
--- a/providers/os/connection/snapshot/blockdevices.go
+++ b/providers/os/connection/snapshot/blockdevices.go
@@ -213,20 +213,25 @@ func (blockEntries BlockDevices) GetUnmountedBlockEntry() (*PartitionInfo, error
 }
 
 func findVolume(children []BlockDevice) *PartitionInfo {
-	var fs *PartitionInfo
+	candidates := []BlockDevice{}
 	for i := range children {
 		entry := children[i]
 		if entry.IsNotBootOrRootVolumeAndUnmounted() {
 			// we are NOT searching for the root volume here, so we can exclude the "sda" and "xvda" volumes
-			devFsName := "/dev/" + entry.Name
-			fs = &PartitionInfo{Name: devFsName, FsType: entry.FsType}
+			candidates = append(candidates, entry)
 		}
 	}
-	return fs
+	if len(candidates) == 0 {
+		return nil
+	}
+	sortPartitionsBySize(candidates)
+	return &PartitionInfo{Name: "/dev/" + candidates[0].Name, FsType: candidates[0].FsType}
 }
 
 func (entry BlockDevice) IsNoBootVolume() bool {
-	return entry.Uuid != "" && entry.FsType != "" && entry.FsType != "vfat" && entry.Label != "EFI" && entry.Label != "boot"
+	typ := strings.ToLower(entry.FsType)
+	label := strings.ToLower(entry.Label)
+	return entry.Uuid != "" && typ != "" && typ != "vfat" && label != "efi" && label != "boot"
 }
 
 func (entry BlockDevice) IsNoBootVolumeAndUnmounted() bool {
diff --git a/providers/os/connection/snapshot/blockdevices_test.go b/providers/os/connection/snapshot/blockdevices_test.go
index 82cb598eac..a37be3b0eb 100644
--- a/providers/os/connection/snapshot/blockdevices_test.go
+++ b/providers/os/connection/snapshot/blockdevices_test.go
@@ -107,7 +107,7 @@ func TestGetMountablePartitionByDevice(t *testing.T) {
 					Name: "sde",
 					Children: []BlockDevice{
 						{Uuid: "12346", FsType: "xfs", Size: 110, Label: "ROOT", Name: "sde1"},
-						{Uuid: "12345", FsType: "xfs", Size: 120, Label: "boot", Name: "sde2"},
+						{Uuid: "12345", FsType: "xfs", Size: 120, Label: "BOOT", Name: "sde2"},
 					},
 				},
 			},
@@ -395,7 +395,7 @@ func TestAttachedBlockEntryMultipleMatch(t *testing.T) {
 	info, err := blockEntries.GetUnnamedBlockEntry()
 	require.NoError(t, err)
 	require.Equal(t, "xfs", info.FsType)
-	require.True(t, strings.Contains(info.Name, "xvdh4"))
+	require.True(t, strings.Contains(info.Name, "xvdh3"))
 }
 
 func TestAttachedBlockEntryFedora(t *testing.T) {
diff --git a/providers/os/connection/snapshot/testdata/alma9_attached.json b/providers/os/connection/snapshot/testdata/alma9_attached.json
index 2fc182dd9e..e49c8f0d7c 100644
--- a/providers/os/connection/snapshot/testdata/alma9_attached.json
+++ b/providers/os/connection/snapshot/testdata/alma9_attached.json
@@ -89,6 +89,7 @@
         {
           "name": "xvdh3",
           "fstype": "xfs",
+          "size": 101,
           "fsver": null,
           "label": null,
           "uuid": "31f80bf2-f73c-4350-bd3e-1dfe82e691f9",
@@ -102,6 +103,7 @@
           "name": "xvdh4",
           "fstype": "xfs",
           "fsver": null,
+          "size": 100,
           "label": null,
           "uuid": "b6b03ca5-4431-4db9-a1fb-f13c8566f779",
           "fsavail": null,