Schutzfile

@@ -9,28 +9,28 @@
   "centos-9": {
     "dependencies": {
       "osbuild": {
-        "commit": "e93cd75e5b23bc16f19eb032226f19e0957ddfb6"
+        "commit": "1668c78cfb63c927b1b2073fc06f1b3351d3418b"
       }
     }
   },
   "centos-10": {
     "dependencies": {
       "osbuild": {
-        "commit": "e93cd75e5b23bc16f19eb032226f19e0957ddfb6"
+        "commit": "1668c78cfb63c927b1b2073fc06f1b3351d3418b"
       }
     }
   },
   "fedora-40": {
     "dependencies": {
       "osbuild": {
-        "commit": "e93cd75e5b23bc16f19eb032226f19e0957ddfb6"
+        "commit": "1668c78cfb63c927b1b2073fc06f1b3351d3418b"
       }
     }
   },
   "fedora-41": {
     "dependencies": {
       "osbuild": {
-        "commit": "e93cd75e5b23bc16f19eb032226f19e0957ddfb6"
+        "commit": "1668c78cfb63c927b1b2073fc06f1b3351d3418b"
       }
     },
     "repos": [

cmd/otk/osbuild-gen-partition-table/main_test.go

@@ -224,8 +224,7 @@ var expectedSimplePartOutput = `{
               "size": 1048576,
               "type": "21686148-6449-6E6F-744E-656564454649",
               "bootable": true,
-              "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549",
-              "payload_type": "no-payload"
+              "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
             },
             {
               "start": 10097152,

pkg/disk/luks.go

@@ -1,6 +1,7 @@
 package disk
 
 import (
+	"encoding/json"
 	"fmt"
 	"math/rand"
 	"reflect"
@@ -29,7 +30,7 @@ type ClevisBind struct {
 
 	// If enabled, the passphrase will be removed from the LUKS device at the
 	// end of the build (using the org.osbuild.luks2.remove-key stage).
-	RemovePassphrase bool
+	RemovePassphrase bool `json:"remove_passphrase"`
 }
 
 // LUKSContainer represents a LUKS encrypted volume.
@@ -47,7 +48,7 @@ type LUKSContainer struct {
 	// Parameters for binding the LUKS device.
 	Clevis *ClevisBind
 
-	Payload Entity
+	Payload Entity `json:"payload,omitempty"`
 }
 
 func init() {
@@ -131,3 +132,24 @@ func (lc *LUKSContainer) minSize(size uint64) uint64 {
 	}
 	return minSize
 }
+
+func (lc *LUKSContainer) UnmarshalJSON(data []byte) (err error) {
+	// keep in sync with lvm.go,partition.go,luks.go
+	type alias LUKSContainer
+	var withoutPayload struct {
+		alias
+		Payload     json.RawMessage `json:"payload"`
+		PayloadType string          `json:"payload_type"`
+	}
+	if err := jsonUnmarshalStrict(data, &withoutPayload); err != nil {
+		return fmt.Errorf("cannot unmarshal %q: %w", data, err)
+	}
+	*lc = LUKSContainer(withoutPayload.alias)
+
+	lc.Payload, err = unmarshalJSONPayload(data)
+	return err
+}
+
+func (lc *LUKSContainer) UnmarshalYAML(unmarshal func(any) error) error {
+	return unmarshalYAMLviaJSON(lc, unmarshal)
+}

pkg/disk/lvm.go

@@ -1,6 +1,7 @@
 package disk
 
 import (
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"strings"
@@ -16,7 +17,7 @@ type LVMVolumeGroup struct {
 	Name        string
 	Description string
 
-	LogicalVolumes []LVMLogicalVolume
+	LogicalVolumes []LVMLogicalVolume `json:"logical_volumes,omitempty"`
 }
 
 func init() {
@@ -174,6 +175,16 @@ func (vg *LVMVolumeGroup) minSize(size uint64) uint64 {
 	return vg.AlignUp(size)
 }
 
+func (vg *LVMVolumeGroup) UnmarshalJSON(data []byte) error {
+	type alias LVMVolumeGroup
+	var tmp alias
+	if err := json.Unmarshal(data, &tmp); err != nil {
+		return err
+	}
+	*vg = LVMVolumeGroup(tmp)
+	return nil
+}
+
 type LVMLogicalVolume struct {
 	Name    string
 	Size    uint64
@@ -232,3 +243,24 @@ func lvname(path string) string {
 	path = strings.TrimLeft(path, "/")
 	return strings.ReplaceAll(path, "/", "_") + "lv"
 }
+
+func (lv *LVMLogicalVolume) UnmarshalJSON(data []byte) (err error) {
+	// keep in sync with lvm.go,partition.go,luks.go
+	type alias LVMLogicalVolume
+	var withoutPayload struct {
+		alias
+		Payload     json.RawMessage `json:"payload"`
+		PayloadType string          `json:"payload_type"`
+	}
+	if err := jsonUnmarshalStrict(data, &withoutPayload); err != nil {
+		return fmt.Errorf("cannot unmarshal %q: %w", data, err)
+	}
+	*lv = LVMLogicalVolume(withoutPayload.alias)
+
+	lv.Payload, err = unmarshalJSONPayload(data)
+	return err
+}
+
+func (lv *LVMLogicalVolume) UnmarshalYAML(unmarshal func(any) error) error {
+	return unmarshalYAMLviaJSON(lv, unmarshal)
+}

pkg/disk/partition.go

@@ -1,10 +1,8 @@
 package disk
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
-	"reflect"
 )
 
 type Partition struct {
@@ -105,7 +103,7 @@ func (p *Partition) IsPReP() bool {
 func (p *Partition) MarshalJSON() ([]byte, error) {
 	type partAlias Partition
 
-	entityName := "no-payload"
+	var entityName string
 	if p.Payload != nil {
 		entityName = p.Payload.EntityName()
 	}
@@ -121,36 +119,23 @@ func (p *Partition) MarshalJSON() ([]byte, error) {
 	return json.Marshal(partWithPayloadType)
 }
 
-func (p *Partition) UnmarshalJSON(data []byte) error {
-	type partAlias Partition
-	var partWithoutPayload struct {
-		partAlias
+func (p *Partition) UnmarshalJSON(data []byte) (err error) {
+	// keep in sync with lvm.go,partition.go,luks.go
+	type alias Partition
+	var withoutPayload struct {
+		alias
 		Payload     json.RawMessage `json:"payload"`
-		PayloadType string          `json:"payload_type,omitempty"`
-	}
-
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	if err := dec.Decode(&partWithoutPayload); err != nil {
-		return fmt.Errorf("cannot build partition from %q: %w", data, err)
+		PayloadType string          `json:"payload_type"`
 	}
-	*p = Partition(partWithoutPayload.partAlias)
-	// no payload, e.g. bios partiton
-	if partWithoutPayload.PayloadType == "no-payload" {
-		return nil
+	if err := jsonUnmarshalStrict(data, &withoutPayload); err != nil {
+		return fmt.Errorf("cannot unmarshal %q: %w", data, err)
 	}
+	*p = Partition(withoutPayload.alias)
 
-	entType := payloadEntityMap[partWithoutPayload.PayloadType]
-	if entType == nil {
-		return fmt.Errorf("cannot build partition from %q: unknown payload %q", data, partWithoutPayload.PayloadType)
-	}
-	entValP := reflect.New(entType).Elem().Addr()
-	ent := entValP.Interface()
-	if err := json.Unmarshal(partWithoutPayload.Payload, &ent); err != nil {
-		return err
-	}
-	p.Payload = ent.(PayloadEntity)
-	return nil
+	p.Payload, err = unmarshalJSONPayload(data)
+	return err
 }
+
 func (t *Partition) UnmarshalYAML(unmarshal func(any) error) error {
 	return unmarshalYAMLviaJSON(t, unmarshal)
 }

pkg/disk/partition_table.go

@@ -27,7 +27,7 @@ type PartitionTable struct {
 	// Extra space at the end of the partition table (sectors)
 	ExtraPadding uint64 `json:"extra_padding,omitempty"`
 	// Starting offset of the first partition in the table (Mb)
-	StartOffset uint64 `json:"start_offset,omitempty"`
+	StartOffset uint64 `json:"start_offset,omitempty" yaml:"start_offset,omitempty"`
 }
 
 type PartitioningMode string

pkg/disk/partition_table_yaml_test.go

@@ -39,7 +39,6 @@ partition_table:
       bootable: true
       type: *bios_boot_partition_guid
       uuid: *bios_boot_partition_uuid
-      payload_type: "no-payload"
     - &default_partition_table_part_efi
       size: 209_715_200  # 200 MiB
       type: *efi_system_partition_guid
@@ -118,3 +117,79 @@ partition_table:
 	}
 	assert.Equal(t, expected, ptWrapper.PartitionTable)
 }
+
+func TestPartitionTableUnmarshalYAMLwithLUKS(t *testing.T) {
+	inputYAML := `
+partition_table:
+  uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
+  type: "gpt"
+  partitions:
+    - size: 1_048_576  # 1 MiB
+      bootable: true
+    - payload_type: "luks"
+      size: 987654321
+      payload:
+        label: "crypt_root"
+        cipher: "cipher_null"
+        passphrase: "osbuild"
+        pbkdf:
+          iterations: 4
+        clevis:
+          pin: "null"
+        payload_type: "lvm"
+        payload:
+          name: "rootvg"
+          description: "bla"
+          logical_volumes:
+            - size: 123456789
+              name: "rootlv"
+              payload_type: "filesystem"
+              payload:
+                type: "ext4"
+                mountpoint: "/"
+`
+	var ptWrapper struct {
+		PartitionTable disk.PartitionTable `yaml:"partition_table"`
+	}
+
+	err := yaml.Unmarshal([]byte(inputYAML), &ptWrapper)
+	require.NoError(t, err)
+	expected := disk.PartitionTable{
+		UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
+		Type: 2,
+		Partitions: []disk.Partition{
+			{
+				Size:     1048576,
+				Bootable: true,
+			}, {
+				Size: 987654321,
+				Payload: &disk.LUKSContainer{
+					Label:      "crypt_root",
+					Cipher:     "cipher_null",
+					Passphrase: "osbuild",
+					PBKDF: disk.Argon2id{
+						Iterations: 4,
+					},
+					Clevis: &disk.ClevisBind{
+						Pin: "null",
+					},
+					Payload: &disk.LVMVolumeGroup{
+						Name:        "rootvg",
+						Description: "bla",
+						LogicalVolumes: []disk.LVMLogicalVolume{
+							{
+								Name: "rootlv",
+								Size: 123456789,
+								Payload: &disk.Filesystem{
+									Type:       "ext4",
+									Mountpoint: "/",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	assert.Equal(t, expected, ptWrapper.PartitionTable)
+}

pkg/disk/partition_test.go

@@ -28,8 +28,14 @@ func TestMarshalUnmarshalSimple(t *testing.T) {
 
 func TestMarshalUnmarshalSad(t *testing.T) {
 	var part disk.Partition
-	err := json.Unmarshal([]byte(`{"randon": "json"}`), &part)
-	assert.ErrorContains(t, err, `cannot build partition from "{`)
+	err := json.Unmarshal([]byte(`{"random": "json"}`), &part)
+	assert.ErrorContains(t, err, `json: unknown field "random"`)
+}
+
+func TestMarshalUnmarshalPayloadButNoPayloadTypeSad(t *testing.T) {
+	var part disk.Partition
+	err := json.Unmarshal([]byte(`{"payload": "some-payload-but-no-payload-type-field"}`), &part)
+	assert.ErrorContains(t, err, `cannot build payload: empty payload type but payload is`)
 }
 
 func TestMarshalUnmarshalPartitionHappy(t *testing.T) {

pkg/disk/unmarshal.go

@@ -1,8 +1,10 @@
 package disk
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"reflect"
 )
 
 // unmarshalYAMLviaJSON unmarshals via the JSON interface, this avoids code
@@ -22,3 +24,35 @@ func unmarshalYAMLviaJSON(u json.Unmarshaler, unmarshal func(any) error) error {
 	}
 	return nil
 }
+
+func unmarshalJSONPayload(data []byte) (PayloadEntity, error) {
+	var payload struct {
+		Payload     json.RawMessage `json:"payload"`
+		PayloadType string          `json:"payload_type,omitempty"`
+	}
+	if err := json.Unmarshal(data, &payload); err != nil {
+		return nil, fmt.Errorf("cannot peek payload: %w", err)
+	}
+	if payload.PayloadType == "" {
+		if len(payload.Payload) > 0 {
+			return nil, fmt.Errorf("cannot build payload: empty payload type but payload is: %q", payload.Payload)
+		}
+		return nil, nil
+	}
+	entType := payloadEntityMap[payload.PayloadType]
+	if entType == nil {
+		return nil, fmt.Errorf("cannot build payload from %q: unknown payload type %q", data, payload.PayloadType)
+	}
+	entValP := reflect.New(entType).Elem().Addr()
+	ent := entValP.Interface()
+	if err := jsonUnmarshalStrict(payload.Payload, &ent); err != nil {
+		return nil, fmt.Errorf("cannot decode payload for %q: %w", data, err)
+	}
+	return ent.(PayloadEntity), nil
+}
+
+func jsonUnmarshalStrict(data []byte, v any) error {
+	dec := json.NewDecoder(bytes.NewBuffer(data))
+	dec.DisallowUnknownFields()
+	return dec.Decode(&v)
+}