fix: LuksDump not parsing multiple data segments (#3569)

* fix: LuksDump not parsing multiple data segments Signed-off-by: daniel.zatovic <[email protected]> * Add regression test for parsing luksDump segments Signed-off-by: daniel.zatovic <[email protected]> Signed-off-by: daniel.zatovic <[email protected]>
RedHatInsights · Nov 3, 2022 · 568dbf9 · 568dbf9
1 parent 4ac809a
commit 568dbf9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/insights/parsers/cryptsetup_luksDump.py b/insights/parsers/cryptsetup_luksDump.py
@@ -34,7 +34,7 @@ def __init__(self):
 
         ZeroLevelKVPair = Key + Value1
         FirstLevelKVPair = FirstIndent >> Key + Value1
-        SecondLevelKVPair = SecondIndent >> WithIndent(Key + Value)
+        SecondLevelKVPair = SecondIndent >> WithIndent(Key + Value) << Opt(Many(Char("\n")))
 
         Luks2SectionName = Key << Char("\n")
         Luks2SectionEntry = (FirstLevelKVPair + Many(SecondLevelKVPair).map(dict)).map(self.convert_type)

diff --git a/insights/tests/parsers/test_cryptsetup_luksDump.py b/insights/tests/parsers/test_cryptsetup_luksDump.py
@@ -65,6 +65,20 @@
 	cipher: aes-xts-plain64
 	sector: 4096 [bytes]
 
+  1: crypt
+	offset: 16777216 [bytes]
+	length: (whole device)
+	cipher: aes-xts-plain64
+	sector: 4096 [bytes]
+	flags : backup-previous
+
+  2: crypt
+	offset: 16777216 [bytes]
+	length: (whole device)
+	cipher: aes-xts-plain64
+	sector: 4096 [bytes]
+	flags : backup-final
+
 Keyslots:
   0: luks2
 	Key:        512 bits
@@ -146,7 +160,7 @@ def test_cryptsetup_luks_dump_luks2():
     assert luks2_parsed.dump["header"]["Version"] == "2"
     assert len(luks2_parsed.dump["Keyslots"].keys()) == 3
     assert luks2_parsed.dump["Keyslots"]["0"]["type"] == "luks2"
-    assert len(luks2_parsed.dump["Data segments"].keys()) == 1
+    assert len(luks2_parsed.dump["Data segments"].keys()) == 3
     assert len(luks2_parsed.dump["Tokens"].keys()) == 1
     assert len(luks2_parsed.dump["Digests"].keys()) == 1