StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some more sample data

This commit is contained in:
Michael Hudson-Doyle 2022-11-01 11:25:40 +01:00
parent 2e05f79dc1
commit f87b97bbdf
7 changed files with 975 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
examples/snaps/v2-systems-defective.json Normal file
View File

@ -0,0 +1,235 @@
{
"type": "sync",
"status-code": 200,
"status": "OK",
"result": {
"label": "classic",
"model": {
"architecture": "amd64",
"authority-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"base": "core22",
"brand-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"classic": "true",
"distribution": "ubuntu",
"grade": "dangerous",
"model": "mwhudson-22-classic-dangerous",
"serial-authority": [
"generic"
],
"series": "16",
"sign-key-sha3-384": "AWEzKBCuROAYkR0dQfdgI95Ih9sWqwxpU1yezWkKT3EUX6LgNNgXFWSNUxC1S2_v",
"snaps": [
{
"default-channel": "22/edge",
"id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH",
"name": "pc",
"type": "gadget"
},
{
"default-channel": "22/edge",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/edge",
"id": "amcUKQILKXHHTlmSa7NMdnXSx02dNeeT",
"name": "core22",
"type": "base"
},
{
"default-channel": "latest/edge",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
}
],
"timestamp": "2022-10-07T02:25:51+00:00",
"type": "model"
},
"brand": {
"id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"username": "mwhudson",
"display-name": "Michael Hudson-Doyle",
"validation": "unproven"
},
"actions": [
{
"title": "Install",
"mode": "install"
}
],
"volumes": {
"pc": {
"schema": "gpt",
"bootloader": "grub",
"id": "",
"structure": [
{
"name": "mbr",
"filesystem-label": "",
"offset": null,
"offset-write": null,
"size": 440,
"type": "mbr",
"role": "mbr",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-boot.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "BIOS Boot",
"filesystem-label": "",
"offset": 1048576,
"offset-write": {
"relative-to": "mbr",
"offset": 92
},
"size": 1048576,
"type": "DA,21686148-6449-6E6F-744E-656564454649",
"role": "",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-core.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-seed",
"filesystem-label": "ubuntu-seed",
"offset": null,
"offset-write": null,
"size": 1258291200,
"type": "EF,C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"role": "system-seed",
"id": "",
"filesystem": "vfat",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-boot",
"filesystem-label": "ubuntu-boot",
"offset": null,
"offset-write": null,
"size": 786432000,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-boot",
"id": "",
"filesystem": "ext4",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "ubuntu-save",
"filesystem-label": "ubuntu-save",
"offset": null,
"offset-write": null,
"size": 33554432,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-save",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
},
{
"name": "ubuntu-data",
"filesystem-label": "ubuntu-data",
"offset": null,
"offset-write": null,
"size": 1073741824,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-data",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
}
]
}
},
"storage-encryption": {
"support": "defective",
"storage-safety": "encrypted",
"encryption-type": "cryptsetup",
"unavailable-reason": "not encrypting device storage as checking TPM gave: secure boot is disabled"
}
}
}

234
examples/snaps/v2-systems-mandatory.json Normal file
View File

@ -0,0 +1,234 @@
{
"type": "sync",
"status-code": 200,
"status": "OK",
"result": {
"label": "classic",
"model": {
"architecture": "amd64",
"authority-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"base": "core22",
"brand-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"classic": "true",
"distribution": "ubuntu",
"grade": "dangerous",
"model": "mwhudson-22-classic-dangerous",
"serial-authority": [
"generic"
],
"series": "16",
"sign-key-sha3-384": "AWEzKBCuROAYkR0dQfdgI95Ih9sWqwxpU1yezWkKT3EUX6LgNNgXFWSNUxC1S2_v",
"snaps": [
{
"default-channel": "22/edge",
"id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH",
"name": "pc",
"type": "gadget"
},
{
"default-channel": "22/edge",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/edge",
"id": "amcUKQILKXHHTlmSa7NMdnXSx02dNeeT",
"name": "core22",
"type": "base"
},
{
"default-channel": "latest/edge",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
}
],
"timestamp": "2022-10-07T02:25:51+00:00",
"type": "model"
},
"brand": {
"id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"username": "mwhudson",
"display-name": "Michael Hudson-Doyle",
"validation": "unproven"
},
"actions": [
{
"title": "Install",
"mode": "install"
}
],
"volumes": {
"pc": {
"schema": "gpt",
"bootloader": "grub",
"id": "",
"structure": [
{
"name": "mbr",
"filesystem-label": "",
"offset": null,
"offset-write": null,
"size": 440,
"type": "mbr",
"role": "mbr",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-boot.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "BIOS Boot",
"filesystem-label": "",
"offset": 1048576,
"offset-write": {
"relative-to": "mbr",
"offset": 92
},
"size": 1048576,
"type": "DA,21686148-6449-6E6F-744E-656564454649",
"role": "",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-core.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-seed",
"filesystem-label": "ubuntu-seed",
"offset": null,
"offset-write": null,
"size": 1258291200,
"type": "EF,C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"role": "system-seed",
"id": "",
"filesystem": "vfat",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-boot",
"filesystem-label": "ubuntu-boot",
"offset": null,
"offset-write": null,
"size": 786432000,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-boot",
"id": "",
"filesystem": "ext4",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "ubuntu-save",
"filesystem-label": "ubuntu-save",
"offset": null,
"offset-write": null,
"size": 33554432,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-save",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
},
{
"name": "ubuntu-data",
"filesystem-label": "ubuntu-data",
"offset": null,
"offset-write": null,
"size": 1073741824,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-data",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
}
]
}
},
"storage-encryption": {
"support": "available",
"storage-safety": "encrypted",
"encryption-type": "cryptsetup"
}
}
}

234
examples/snaps/v2-systems-prefer-encrypted.json Normal file
View File

@ -0,0 +1,234 @@
{
"type": "sync",
"status-code": 200,
"status": "OK",
"result": {
"label": "classic",
"model": {
"architecture": "amd64",
"authority-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"base": "core22",
"brand-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"classic": "true",
"distribution": "ubuntu",
"grade": "dangerous",
"model": "mwhudson-22-classic-dangerous",
"serial-authority": [
"generic"
],
"series": "16",
"sign-key-sha3-384": "AWEzKBCuROAYkR0dQfdgI95Ih9sWqwxpU1yezWkKT3EUX6LgNNgXFWSNUxC1S2_v",
"snaps": [
{
"default-channel": "22/edge",
"id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH",
"name": "pc",
"type": "gadget"
},
{
"default-channel": "22/edge",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/edge",
"id": "amcUKQILKXHHTlmSa7NMdnXSx02dNeeT",
"name": "core22",
"type": "base"
},
{
"default-channel": "latest/edge",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
}
],
"timestamp": "2022-10-07T02:25:51+00:00",
"type": "model"
},
"brand": {
"id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"username": "mwhudson",
"display-name": "Michael Hudson-Doyle",
"validation": "unproven"
},
"actions": [
{
"title": "Install",
"mode": "install"
}
],
"volumes": {
"pc": {
"schema": "gpt",
"bootloader": "grub",
"id": "",
"structure": [
{
"name": "mbr",
"filesystem-label": "",
"offset": null,
"offset-write": null,
"size": 440,
"type": "mbr",
"role": "mbr",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-boot.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "BIOS Boot",
"filesystem-label": "",
"offset": 1048576,
"offset-write": {
"relative-to": "mbr",
"offset": 92
},
"size": 1048576,
"type": "DA,21686148-6449-6E6F-744E-656564454649",
"role": "",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-core.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-seed",
"filesystem-label": "ubuntu-seed",
"offset": null,
"offset-write": null,
"size": 1258291200,
"type": "EF,C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"role": "system-seed",
"id": "",
"filesystem": "vfat",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-boot",
"filesystem-label": "ubuntu-boot",
"offset": null,
"offset-write": null,
"size": 786432000,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-boot",
"id": "",
"filesystem": "ext4",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "ubuntu-save",
"filesystem-label": "ubuntu-save",
"offset": null,
"offset-write": null,
"size": 33554432,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-save",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
},
{
"name": "ubuntu-data",
"filesystem-label": "ubuntu-data",
"offset": null,
"offset-write": null,
"size": 1073741824,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-data",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
}
]
}
},
"storage-encryption": {
"support": "available",
"storage-safety": "prefer-encrypted",
"encryption-type": "cryptsetup"
}
}
}

234
examples/snaps/v2-systems-prefer-unencrypted.json Normal file
View File

@ -0,0 +1,234 @@
{
"type": "sync",
"status-code": 200,
"status": "OK",
"result": {
"label": "classic",
"model": {
"architecture": "amd64",
"authority-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"base": "core22",
"brand-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"classic": "true",
"distribution": "ubuntu",
"grade": "dangerous",
"model": "mwhudson-22-classic-dangerous",
"serial-authority": [
"generic"
],
"series": "16",
"sign-key-sha3-384": "AWEzKBCuROAYkR0dQfdgI95Ih9sWqwxpU1yezWkKT3EUX6LgNNgXFWSNUxC1S2_v",
"snaps": [
{
"default-channel": "22/edge",
"id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH",
"name": "pc",
"type": "gadget"
},
{
"default-channel": "22/edge",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/edge",
"id": "amcUKQILKXHHTlmSa7NMdnXSx02dNeeT",
"name": "core22",
"type": "base"
},
{
"default-channel": "latest/edge",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
}
],
"timestamp": "2022-10-07T02:25:51+00:00",
"type": "model"
},
"brand": {
"id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
"username": "mwhudson",
"display-name": "Michael Hudson-Doyle",
"validation": "unproven"
},
"actions": [
{
"title": "Install",
"mode": "install"
}
],
"volumes": {
"pc": {
"schema": "gpt",
"bootloader": "grub",
"id": "",
"structure": [
{
"name": "mbr",
"filesystem-label": "",
"offset": null,
"offset-write": null,
"size": 440,
"type": "mbr",
"role": "mbr",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-boot.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "BIOS Boot",
"filesystem-label": "",
"offset": 1048576,
"offset-write": {
"relative-to": "mbr",
"offset": 92
},
"size": 1048576,
"type": "DA,21686148-6449-6E6F-744E-656564454649",
"role": "",
"id": "",
"filesystem": "",
"content": [
{
"source": "",
"target": "",
"image": "pc-core.img",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-seed",
"filesystem-label": "ubuntu-seed",
"offset": null,
"offset-write": null,
"size": 1258291200,
"type": "EF,C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"role": "system-seed",
"id": "",
"filesystem": "vfat",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 2,
"preserve": null
}
},
{
"name": "ubuntu-boot",
"filesystem-label": "ubuntu-boot",
"offset": null,
"offset-write": null,
"size": 786432000,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-boot",
"id": "",
"filesystem": "ext4",
"content": [
{
"source": "grubx64.efi",
"target": "EFI/boot/grubx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
},
{
"source": "shim.efi.signed",
"target": "EFI/boot/bootx64.efi",
"image": "",
"offset": null,
"offset-write": null,
"size": 0,
"unpack": false
}
],
"update": {
"edition": 1,
"preserve": null
}
},
{
"name": "ubuntu-save",
"filesystem-label": "ubuntu-save",
"offset": null,
"offset-write": null,
"size": 33554432,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-save",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
},
{
"name": "ubuntu-data",
"filesystem-label": "ubuntu-data",
"offset": null,
"offset-write": null,
"size": 1073741824,
"type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"role": "system-data",
"id": "",
"filesystem": "ext4",
"content": null,
"update": {
"edition": 0,
"preserve": null
}
}
]
}
},
"storage-encryption": {
"support": "available",
"storage-safety": "prefer-unencrypted",
"encryption-type": "cryptsetup"
}
}
}

2
examples/snaps/v2-systems-classic.json → examples/snaps/v2-systems-unavailable.json
View File

@ -3,7 +3,7 @@
"status-code": 200,
"status": "OK",
"result": {
"label": "classic",
"label": "unavailable",
"model": {
"architecture": "amd64",
"authority-id": "developer1",

38
examples/tpm-sources.yaml
View File

@ -1,6 +1,6 @@
- description:
en: This test source has encryption support set to "unavailable"
id: ubuntu-server-minimal
id: src-unavailable
locale_support: none
name:
en: TPM encryption unavailable.
@ -8,4 +8,38 @@
size: 530485248
type: fsimage
variant: server
snapd_system_label: classic
snapd_system_label: unavailable
- description:
en: This test source has encryption support set to "prefer-encrypted" (and encryption available)
id: src-prefer-encrypted
locale_support: none
name:
en: TPM encryption preferred.
path: foo.squashfs
size: 530485248
type: fsimage
variant: server
snapd_system_label: prefer-encrypted
default: true
- description:
en: This test source has encryption support set to "prefer-unencrypted" (and encryption available)
id: src-prefer-unencrypted
locale_support: none
name:
en: TPM encryption not preferred.
path: foo.squashfs
size: 530485248
type: fsimage
variant: server
snapd_system_label: prefer-unencrypted
- description:
en: This test source has the invalid combination of encryption reqired and unavailable.
id: src-defective
locale_support: none
name:
en: TPM encryption defective.
path: foo.squashfs
size: 530485248
type: fsimage
variant: server
snapd_system_label: defective

2
subiquity/ui/views/filesystem/probing.py
View File

@ -96,7 +96,7 @@ class DefectiveEncryptionError(BaseView):
title = _("Encryption requirements not met")
def __init__(self, controller, error_ref):
def __init__(self, controller):
self.controller = controller
super().__init__(screen([
Text(rewrap(_(defective_text))),