particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: update stage diffs for F39 bump

Browse source 
Diffs for stage tests have changed after the sources were updated.
Update them to match expected behaviour. This was mostly done with
some form of:

```
foo=update-crypto-policies;
sudo tools/gen-stage-test-diff --libdir . --store /var/osbuild/store/ test/data/stages/$foo > test/data/stages/$foo/diff.json
```

For the dracut one I had to figure out what new kernel was used
and the new modules and update the vanilla.json file to get the
test to pass.

For the rpm one I had to also update the metadata.json with something
like:

```
sudo python3 -m osbuild --libdir .  --store /var/osbuild/store/ --export tree \
    --output-directory /var/osbuild/out/ test/data/stages/rpm/b.json --json   \
        | jq .metadata >test/data/stages/rpm/metadata.json
```
This commit is contained in:
Dusty Mabe 2023-12-15 16:19:01 -05:00 • committed by Achilleas Koutsou
parent e077a4ceba
commit 96ee2e4bc8
14 changed files with 3287 additions and 1564 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/data/stages/copy/diff.json
View file

@ -16,7 +16,7 @@
},
"/usr/lib/os-release": {
"content": [
"sha256:d38ce6163200bfdfa564bc5f9d4a59fb82ae83dc235de835fe97eaafb46de7a2",
"sha256:125ed26603dabd0f76eb0e8bc44e90fd60940640ec5dbf4ea100c443d6eb15cf",
"sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca"
]
},

14
test/data/stages/dracut/vanilla.json
View file

@ -1,5 +1,5 @@
{
"initramfs-6.5.6-200.fc38.x86_64.img": {
"initramfs-6.6.4-200.fc39.x86_64.img": {
"early_cpio": false,
"compression": "gzip",
"kmods": [
@ -159,6 +159,7 @@
"fusb302.ko.xz",
"fuse.ko.xz",
"ghash-clmulni-intel.ko.xz",
"governor_simpleondemand.ko.xz",
"gpio-sbu-mux.ko.xz",
"gpio_keys.ko.xz",
"gpio_keys_polled.ko.xz",
@ -198,6 +199,7 @@
"hid-gembird.ko.xz",
"hid-gfrm.ko.xz",
"hid-glorious.ko.xz",
"hid-google-stadiaff.ko.xz",
"hid-gt683r.ko.xz",
"hid-gyration.ko.xz",
"hid-holtek-kbd.ko.xz",
@ -434,6 +436,7 @@
"nls_koi8-r.ko.xz",
"nls_koi8-ru.ko.xz",
"nls_koi8-u.ko.xz",
"nls_ucs2_utils.ko.xz",
"nls_utf8.ko.xz",
"ntfs3.ko.xz",
"null_blk.ko.xz",
@ -443,7 +446,6 @@
"nvme-fabrics.ko.xz",
"nvme-fc.ko.xz",
"nvme.ko.xz",
"nvme.ko.xz",
"nvmet-fc.ko.xz",
"nvmet.ko.xz",
"orangefs.ko.xz",
@ -499,6 +501,7 @@
"pinctrl-broxton.ko.xz",
"pinctrl-cannonlake.ko.xz",
"pinctrl-cedarfork.ko.xz",
"pinctrl-cs42l43.ko.xz",
"pinctrl-cy8c95x0.ko.xz",
"pinctrl-denverton.ko.xz",
"pinctrl-elkhartlake.ko.xz",
@ -650,6 +653,7 @@
"ucsi_stm32g0.ko.xz",
"udf.ko.xz",
"udp_tunnel.ko.xz",
"ufshcd-core.ko.xz",
"uhid.ko.xz",
"uio.ko.xz",
"ums-alauda.ko.xz",
@ -719,17 +723,17 @@
"nvdimm",
"qemu",
"lunmask",
"memstrack",
"resume",
"rootfs-block",
"terminfo",
"udev-rules",
"virtiofs",
"dracut-systemd",
"usrmount",
"base",
"fs-lib",
"shutdown",
"virtiofs"
"memstrack",
"shutdown"
]
}
}

14
test/data/stages/firewall/diff.json
View file

@ -1,13 +1,19 @@
{
"added_files": [
"/etc/firewalld/firewalld.conf.old",
"/etc/firewalld/zones/trusted.xml",
"/etc/firewalld/zones/trusted.xml.old",
"/etc/firewalld/zones/new-zone.xml",
"/etc/firewalld/zones/new-zone.xml.old"
"/etc/firewalld/zones/new-zone.xml.old",
"/etc/firewalld/zones/public.xml",
"/etc/firewalld/zones/trusted.xml",
"/etc/firewalld/zones/trusted.xml.old"
],
"deleted_files": [],
"differences": {
"/etc/firewalld/firewalld.conf": {"mode": [41471, 33152]}
"/etc/firewalld/firewalld.conf": {
"mode": [
41471,
33152
]
}
}
}

3
test/data/stages/hostname/diff.json
View file

@ -1,6 +1,7 @@
{
"added_files": [
"/etc/hostname"
"/etc/hostname",
"/etc/kernel"
],
"deleted_files": [],
"differences": {}

1
test/data/stages/keymap/diff.json
View file

@ -2,6 +2,7 @@
"added_files": [
"/etc/X11/xorg.conf.d",
"/etc/X11/xorg.conf.d/00-keyboard.conf",
"/etc/kernel",
"/etc/vconsole.conf"
],
"deleted_files": [],

1
test/data/stages/locale/diff.json
View file

@ -1,5 +1,6 @@
{
"added_files": [
"/etc/kernel",
"/etc/locale.conf"
],
"deleted_files": [],

70
test/data/stages/oscap.remediation-extra/diff.json
View file

@ -3,7 +3,6 @@
"/var/lib/authselect/backups"
],
"added_files": [
"/boot/grub2/grubenv",
"/etc/authselect/custom/hardening",
"/etc/authselect/custom/hardening/README",
"/etc/authselect/custom/hardening/REQUIREMENTS",
@ -16,15 +15,9 @@
"/etc/authselect/custom/hardening/smartcard-auth",
"/etc/authselect/custom/hardening/system-auth",
"/etc/chrony.conf",
"/etc/default/grub",
"/etc/dnf/automatic.conf",
"/etc/fstab",
"/etc/ipsec.conf",
"/etc/kernel/cmdline",
"/etc/modprobe.d/atm.conf",
"/etc/modprobe.d/can.conf",
"/etc/modprobe.d/firewire-core.conf",
"/etc/modprobe.d/tipc.conf",
"/etc/profile.d/tmout.sh",
"/etc/rsyslog.conf",
"/etc/rsyslog.d",
@ -34,8 +27,9 @@
"/etc/ssh/sshd_config.d",
"/etc/ssh/sshd_config.d/00-complianceascode-hardening.conf",
"/etc/ssh/sshd_config.d/01-complianceascode-reinforce-os-defaults.conf",
"/etc/sysctl.conf",
"/etc/systemd/coredump.conf",
"/etc/systemd/system/debug-shell.service",
"/etc/systemd/system/systemd-coredump.socket",
"/root/log.eval",
"/root/log.eval-remediated",
"/root/log.generate-fix",
@ -50,20 +44,20 @@
"differences": {
"/etc/authselect/authselect.conf": {
"content": [
null,
null
"sha256:55eee183988be83f2c7867cdb7c29bba9f8d879cf7dc915a5c6cfd7f3fc56adb",
"sha256:1c3fea4c500fae2e394b6ff2613de88205a33a551f344b30fc623d8d8e346e25"
]
},
"/etc/authselect/password-auth": {
"content": [
null,
null
"sha256:adf5dcbbd3e196b4eb80058e3d721e8c762f6f39630673767259e69da50759a5",
"sha256:90211c449f0f3931ab44d155cffdcff0137b0137e92f3298e4a9dbadd795eb85"
]
},
"/etc/authselect/system-auth": {
"content": [
null,
null
"sha256:adf5dcbbd3e196b4eb80058e3d721e8c762f6f39630673767259e69da50759a5",
"sha256:13d524978cf9a4a8a3828ec69c9250c9011f0b64e10421cff96fcb4d259543d2"
]
},
"/etc/crypto-policies/back-ends/bind.config": {
@ -132,6 +126,12 @@
"/usr/share/crypto-policies/FIPS/openssl.txt"
]
},
"/etc/crypto-policies/back-ends/openssl_fips.config": {
"symlink": [
"/usr/share/crypto-policies/DEFAULT/openssl_fips.txt",
"/usr/share/crypto-policies/FIPS/openssl_fips.txt"
]
},
"/etc/crypto-policies/back-ends/opensslcnf.config": {
"symlink": [
"/usr/share/crypto-policies/DEFAULT/opensslcnf.txt",
@ -158,8 +158,8 @@
},
"/etc/crypto-policies/state/CURRENT.pol": {
"content": [
"sha256:34459f8b102d05d1df56885c4a103e68ae6353f88ef41386402edf97c56eb505",
"sha256:3433137c54925eb3618bc7a34e33dfbc2d8fedad947256b91aa7ba7ac49eea51"
"sha256:5af38a3ead1e8288c94d4c5edc92a8cd43841f5e3f3bfd38603b9f2c39539b6b",
"sha256:209dce3608e0d22d715c3f009cffd7bd2b7d10739abf91564d2189171275db91"
]
},
"/etc/crypto-policies/state/current": {
@ -170,8 +170,8 @@
},
"/etc/pki/tls/openssl.cnf": {
"content": [
"sha256:e7eb326b64430f55b0b458a3dce27569ec2bb8ae4dbc66a2ae9447aa0bd1db27",
"sha256:c6b69d7a0d99af981df392d6f2ea64b0b5d5a9c13c4cc6810d890e7909998359"
"sha256:399ea625a69ffb6f06bc7554901f8b4eb95b88ac3d9685d4a3325057733e32d0",
"sha256:2435be35e481ed91c5db6cb62739ba38a11507ad0362504ee339001dcafecd22"
]
},
"/etc/security/faillock.conf": {
@ -186,40 +186,28 @@
"sha256:2472eda92cb43fa38e231f104e979c2c080c4c67bccf5f9e6e7788f33bb05f82"
]
},
"/etc/sysctl.conf": {
"content": [
"sha256:51d16ee2e7eef12dd42e924af6b835861e8b79d11921ba0418d7d0aec7a2a93b",
"sha256:92aa2a3f72f18d68ed3f2bda68a2fc214689996c549fd6f56780fee0e7ea275a"
]
},
"/etc/systemd/coredump.conf": {
"content": [
"sha256:72f8630b657da48549b2bd9ba5e855939e4afec3d4ee60574fc5757cfc767bd6",
"sha256:67206831694bca3b569ad27ca9b577101e45b9dc19fbfd68b1722949c862ba9d"
]
},
"/etc/yum.repos.d/fedora-cisco-openh264.repo": {
"content": [
null,
null
"sha256:82ea9028dc1438df46382e7bc46d11b56835ddd0cd15a39327eb00f72f2f3e00",
"sha256:cf323ebf3e3c1afa373688f59d7b1a8abafe9b3591217197c0dff6d46f5533d2"
]
},
"/etc/yum.repos.d/fedora-updates-testing.repo": {
"content": [
null,
null
"sha256:b4d333aa93ca8468bd42669a734ed190c9ad3b83db83ea7dd17975fd4510f80f",
"sha256:37c100de077894b7b56f65aa91bbc3586237746a506eca4a7ebd43f0a5a147f1"
]
},
"/etc/yum.repos.d/fedora-updates.repo": {
"content": [
null,
null
"sha256:762810cb4ab863a7f57ed85602e268d29c8b002128452839d5b415b9f1752019",
"sha256:309cdedaa2293b71ecaa6b35a6c808e896f32964ab8ceecf4c5da30bea8a7e34"
]
},
"/etc/yum.repos.d/fedora.repo": {
"content": [
null,
null
"sha256:91ec30ca30615b60119587ceb275d5318131fd7b3e56e60677eef5092a09243f",
"sha256:2f4618499779e6e27857d3fb0f03f2b962293ee5af6456cde8fb552bb8872b6b"
]
},
"/usr/lib/issue": {
@ -233,12 +221,6 @@
"sha256:2411b554d569a269581e12f946b5746e6eab4d0be621df030865cd7528ddca95",
"sha256:252f244f9ec7433c86bc21b1003de48a53bc3c35349a11789ed21a69ba0dec69"
]
},
"/usr/lib/sysctl.d/50-coredump.conf": {
"content": [
"sha256:fa3e45fa358e07c53128adca1fc663e3c294a27795d7629db598c541d4ad806b",
"sha256:90368094e1eb7c6a3ac68e623706185531ad76edd8ebca80b394538f230910c0"
]
}
}
}

49
test/data/stages/oscap.remediation/diff.json
View file

@ -1,38 +1,35 @@
{
"added_directories": [
"/var/lib/authselect/backups",
"/etc/ssh"
"/var/lib/authselect/backups"
],
"added_files": [
"/boot/grub2/grubenv",
"/etc/authselect/custom/hardening",
"/etc/authselect/custom/hardening/README",
"/etc/authselect/custom/hardening/REQUIREMENTS",
"/etc/authselect/custom/hardening/dconf-db",
"/etc/authselect/custom/hardening/dconf-locks",
"/etc/authselect/custom/hardening/fingerprint-auth",
"/etc/authselect/custom/hardening/nsswitch.conf",
"/etc/authselect/custom/hardening/password-auth",
"/etc/authselect/custom/hardening/postlogin",
"/etc/authselect/custom/hardening/README",
"/etc/authselect/custom/hardening/REQUIREMENTS",
"/etc/authselect/custom/hardening/smartcard-auth",
"/etc/authselect/custom/hardening/system-auth",
"/etc/chrony.conf",
"/etc/default/grub",
"/etc/dnf/automatic.conf",
"/etc/fstab",
"/etc/ipsec.conf",
"/etc/kernel/cmdline",
"/etc/modprobe.d/atm.conf",
"/etc/modprobe.d/can.conf",
"/etc/modprobe.d/firewire-core.conf",
"/etc/modprobe.d/tipc.conf",
"/etc/profile.d/tmout.sh",
"/etc/rsyslog.conf",
"/etc/rsyslog.d",
"/etc/rsyslog.d/cron.conf",
"/etc/selinux/config",
"/etc/ssh",
"/etc/ssh/sshd_config.d",
"/etc/ssh/sshd_config.d/00-complianceascode-hardening.conf",
"/etc/ssh/sshd_config.d/01-complianceascode-reinforce-os-defaults.conf",
"/etc/sysctl.conf",
"/etc/systemd/coredump.conf",
"/etc/systemd/system/debug-shell.service",
"/etc/systemd/system/systemd-coredump.socket",
"/run/mount",
"/var/tmp/oscap_eval_xccdf_results.xml",
"/var/tmp/oscap_remediation.bash"
@ -123,6 +120,12 @@
"/usr/share/crypto-policies/FIPS/openssl.txt"
]
},
"/etc/crypto-policies/back-ends/openssl_fips.config": {
"symlink": [
"/usr/share/crypto-policies/DEFAULT/openssl_fips.txt",
"/usr/share/crypto-policies/FIPS/openssl_fips.txt"
]
},
"/etc/crypto-policies/back-ends/opensslcnf.config": {
"symlink": [
"/usr/share/crypto-policies/DEFAULT/opensslcnf.txt",
@ -149,8 +152,8 @@
},
"/etc/crypto-policies/state/CURRENT.pol": {
"content": [
"sha256:34459f8b102d05d1df56885c4a103e68ae6353f88ef41386402edf97c56eb505",
"sha256:3433137c54925eb3618bc7a34e33dfbc2d8fedad947256b91aa7ba7ac49eea51"
"sha256:5af38a3ead1e8288c94d4c5edc92a8cd43841f5e3f3bfd38603b9f2c39539b6b",
"sha256:209dce3608e0d22d715c3f009cffd7bd2b7d10739abf91564d2189171275db91"
]
},
"/etc/crypto-policies/state/current": {
@ -177,18 +180,6 @@
"sha256:2472eda92cb43fa38e231f104e979c2c080c4c67bccf5f9e6e7788f33bb05f82"
]
},
"/etc/sysctl.conf": {
"content": [
"sha256:51d16ee2e7eef12dd42e924af6b835861e8b79d11921ba0418d7d0aec7a2a93b",
"sha256:92aa2a3f72f18d68ed3f2bda68a2fc214689996c549fd6f56780fee0e7ea275a"
]
},
"/etc/systemd/coredump.conf": {
"content": [
"sha256:72f8630b657da48549b2bd9ba5e855939e4afec3d4ee60574fc5757cfc767bd6",
"sha256:67206831694bca3b569ad27ca9b577101e45b9dc19fbfd68b1722949c862ba9d"
]
},
"/etc/yum.repos.d/fedora-cisco-openh264.repo": {
"content": [
null,
@ -224,12 +215,6 @@
"sha256:2411b554d569a269581e12f946b5746e6eab4d0be621df030865cd7528ddca95",
"sha256:252f244f9ec7433c86bc21b1003de48a53bc3c35349a11789ed21a69ba0dec69"
]
},
"/usr/lib/sysctl.d/50-coredump.conf": {
"content": [
"sha256:fa3e45fa358e07c53128adca1fc663e3c294a27795d7629db598c541d4ad806b",
"sha256:90368094e1eb7c6a3ac68e623706185531ad76edd8ebca80b394538f230910c0"
]
}
}
}

1661
test/data/stages/rpm/diff.json
View file

File diff suppressed because it is too large Load diff

2988
test/data/stages/rpm/metadata.json
View file

File diff suppressed because it is too large Load diff

4
test/data/stages/sshd.config/diff.json
View file

@ -4,8 +4,8 @@
"differences": {
"/etc/ssh/sshd_config": {
"content": [
"sha256:7e333391dcb59343f577eb700ca5b344d8e6da28bc736c305a42c5290e966859",
"sha256:f62e094be30225eafd5d09d1ad38c50de2f3091888162c02f2be492498dc4c0a"
"sha256:d72b96c3e68685cdbacc572126204d098ce7feeb6f60cc17059976d55c53d3f2",
"sha256:e2d889acfe367d8d7c7ea3198370deb138ac3f7b3d094a7be7a94271717cfe8d"
]
}
}

1
test/data/stages/timezone/diff.json
View file

@ -1,5 +1,6 @@
{
"added_files": [
"/etc/kernel",
"/etc/localtime"
],
"deleted_files": [],

19
test/data/stages/update-crypto-policies/diff.json
View file

@ -1,5 +1,7 @@
{
"added_files": ["/dev/null"],
"added_files": [
"/dev/null"
],
"deleted_files": [],
"differences": {
"/etc/crypto-policies/back-ends/bind.config": {
@ -53,7 +55,8 @@
"/etc/crypto-policies/back-ends/openssh.config": {
"symlink": [
"/usr/share/crypto-policies/DEFAULT/openssh.txt",
"/usr/share/crypto-policies/FIPS/openssh.txt"]
"/usr/share/crypto-policies/FIPS/openssh.txt"
]
},
"/etc/crypto-policies/back-ends/opensshserver.config": {
"symlink": [
@ -67,6 +70,12 @@
"/usr/share/crypto-policies/FIPS/openssl.txt"
]
},
"/etc/crypto-policies/back-ends/openssl_fips.config": {
"symlink": [
"/usr/share/crypto-policies/DEFAULT/openssl_fips.txt",
"/usr/share/crypto-policies/FIPS/openssl_fips.txt"
]
},
"/etc/crypto-policies/back-ends/opensslcnf.config": {
"symlink": [
"/usr/share/crypto-policies/DEFAULT/opensslcnf.txt",
@ -93,11 +102,11 @@
},
"/etc/crypto-policies/state/CURRENT.pol": {
"content": [
"sha256:34459f8b102d05d1df56885c4a103e68ae6353f88ef41386402edf97c56eb505",
"sha256:3433137c54925eb3618bc7a34e33dfbc2d8fedad947256b91aa7ba7ac49eea51"
"sha256:5af38a3ead1e8288c94d4c5edc92a8cd43841f5e3f3bfd38603b9f2c39539b6b",
"sha256:209dce3608e0d22d715c3f009cffd7bd2b7d10739abf91564d2189171275db91"
]
},
"/etc/crypto-policies/state/current": {
"/etc/crypto-policies/state/current": {
"content": [
"sha256:ecae097fb02a733ac98c03d7527fd923d5c9607c6a02feb5f0d388375f3e70dc",
"sha256:858dd9c983a8e87bbb242952b737f33499c99ff5fd8b377b218da3836357c874"

24
test/data/stages/users/diff.json
View file

@ -44,38 +44,38 @@
"differences": {
"/etc/group": {
"content": [
"sha256:d5c638b9377359ab9b8208688016b3e5f5d03fa6af7fe022edb9f7fc321d448c",
"sha256:84079552caba6790afb0e296561c337a2385737eb7ac578c59f8efcff9848f32"
"sha256:da6b9ba10db7b25c23208d8e15339ef83d7b3e1aed787ac5c85c359d76fdf45d",
"sha256:5421f8cc1ebe16abae841ccd80f3eda71a0f18688f0613304d1c2c8e79bd356c"
]
},
"/etc/group-": {
"content": [
"sha256:8914cb8d99323b84dbb1ec5fa48b1bb51750ac2a3fb94fb259e525285f59cb5d",
"sha256:b45befe0fe6aa7f5c40da3fcaba457da1461f5f589fa8a4c99735d29e338123d"
"sha256:654711ab4bdcc11087f0620c1bbf24eb424ad025b4ffb5185bb0f026377b5786",
"sha256:e9d1716c384e61eb257dfc90398b48ab829bac5f597ff076c3d250200a9d5c8f"
]
},
"/etc/gshadow": {
"content": [
"sha256:a01a1ddd6a53ba25d0780f673ed36fa0bfc826aaf4d056772b7417e193db13bc",
"sha256:d51d76d7050cd21250580094944b0a3ff3d122de5873a4c07597dacae1eb1126"
"sha256:7728e19aa48b2164468affe00eb47594968e806d320eaad301fc65c6fa7815fc",
"sha256:d6611a607b723fda5748ad50cb6fd2b2d8e06a6dbe71e5abe53893c35b42f5cc"
]
},
"/etc/gshadow-": {
"content": [
"sha256:29dbb27082363c364f510e2d702e3199875770d5aae94eb57e3fb5fe8022cd62",
"sha256:061ce7d905e1eb5e0d11e1f05b1dbf9797ad121d6ba9782fca7410e58922088d"
"sha256:b91ceac2f490c578d0d5156a6c40d5fcfae177aebc25bad8689809193da9c032",
"sha256:dd082a411d3f462423a6e4ab5c2107425ce7ca418864b9ddbabd3f2e90195586"
]
},
"/etc/passwd": {
"content": [
"sha256:e03d18535ce9484febf6805938116f7aa0697e4245ae9fdf0f0d67b365553a8c",
"sha256:865fa8c60c66ab50edb781c586074338031c4c86f54e619f572659c93c2b1132"
"sha256:1d279ca71e34faacde25e62394d6da7c93b0146e4d736c510dcb6d3ffda8024c",
"sha256:896cc893667cac84c1a23bcefbc760e8e6c6bd28a52cba0265f67ca50d19f9d3"
]
},
"/etc/passwd-": {
"content": [
"sha256:00326736a86775fea7eaec4b3ffbcac98550ee02b1c56bfc988c2f1a0b419fb2",
"sha256:f470ce277174e39130642ec673df1c6ebbde35acfcbdec8b8ec01f7a9160163a"
"sha256:2b7b778af27e3e4dfe3369f2c07e344e4536bad998b6df41ab99de0f6863e26d",
"sha256:95b59e793b329a10bc418682f3b742a858740eb1c0ed067c637fcd58a7e96bab"
]
},
"/etc/shadow": {