Create directories before copying or writing files

I accidentally did not notice this, because on my systems the directories
were already created from my previous script. Also add a test case checking
the individual commands and the setup command itself, so that does not
happen again.

Fixes #2

Author: julian-klode

sicherboot

@@ -129,10 +129,12 @@ install_kernel() {
     local image_dir="$BOOT_EFI_DIR/$relative_image_dir"
     local relative_image="$relative_image_dir/linux.efi"
     local image="$image_dir/linux.efi"
-    local conf="$BOOT_EFI_DIR/loader/entries/$MACHINE_ID-$version.conf"
+    local conf_dir="$BOOT_EFI_DIR/loader/entries"
+    local conf="$conf_dir/$MACHINE_ID-$version.conf"
 
+    mkdir -p "$conf_dir"
+    mkdir -p "$image_dir"
     _create_loader_entry  "$conf" "$relative_image" "$version"
-    [ -d "$image_dir" ] || mkdir -p "$image_dir"
     build_image "$BOOT_DIR/vmlinuz-$version" \
                 "$BOOT_DIR/initrd.img-$version" \
                 "$image"
@@ -220,8 +222,10 @@ ENROLL_KEYS_HELP="Usage: sicherboot enroll-keys
 "
 enroll_keys() {
     local relative_image="$MACHINE_ID/KeyTool.efi"
+    local image_dir="$BOOT_EFI_DIR/$MACHINE_ID"
     local image="$BOOT_EFI_DIR/$relative_image"
-    local conf="$BOOT_EFI_DIR/loader/entries/$MACHINE_ID-keytool.conf"
+    local conf_dir="$BOOT_EFI_DIR/loader/entries"
+    local conf="$conf_dir/$MACHINE_ID-keytool.conf"
     local key_dir_rel="Keys/$MACHINE_ID"
     local key_dir="$BOOT_EFI_DIR/$key_dir_rel"
 
@@ -241,6 +245,9 @@ enroll_keys() {
         fi
     fi
 
+    mkdir -p "$image_dir"
+    mkdir -p "$conf_dir"
+
     cp "$KEYTOOL" "$image"
     sign_image "$image"
 

tests/sicherboot.conf

@@ -0,0 +1,10 @@
+# Test configuration file
+BOOT_DIR=$PWD/tmp/
+BOOT_EFI_DIR=$PWD/tmp/efi
+KEY_HOME=$PWD/tmp/keys
+
+# Hack: Specify a temporary machine-id (overrides os-release, as included later)
+MACHINE_ID=machine-id
+
+# Hack: We need to export EFI_ARCH for use in the tests
+echo "EFI_ARCH=$EFI_ARCH" > $PWD/tmp/config

tests/test-setup

@@ -0,0 +1,95 @@
+#!/bin/sh -e
+set -e
+
+cd "$(dirname "$(readlink -f "$0")")"
+
+testsuccess() {
+    printf "%-90s" "Testing $*..."
+    printf "=====================================================\n" >> $PWD/tmp/out.log
+    printf " Output of command $*\n"                                 >> $PWD/tmp/out.log
+    printf "=====================================================\n" >> $PWD/tmp/out.log
+    if ! "$@" >>$PWD/tmp/out.log 2>&1; then
+        printf "FAIL\n"
+        printf "Output so far:\n" >&2
+        cat $PWD/tmp/out.log
+        exit 1
+    else
+        printf "PASS\n"
+    fi
+}
+
+export SICHERBOOT_CONFIGURATION_FILE_INTERNAL=$PWD/sicherboot.conf
+export PATH="$PWD/tmp:$PATH"
+
+if test -e tmp; then
+    rm -rf tmp
+fi
+
+
+mkdir tmp
+
+######################### TEST KEY GENERATION ##############################
+testsuccess fakeroot ../sicherboot generate-keys
+
+. tmp/config
+
+testsuccess test -e tmp/keys/PK.auth
+testsuccess test -e tmp/keys/db.auth
+testsuccess test -e tmp/keys/KEK.auth
+
+######################### TEST KEY ENROLLMENT ###############################
+
+testsuccess fakeroot ../sicherboot enroll-keys
+
+testsuccess sbverify --cert tmp/keys/db.crt tmp/efi/machine-id/KeyTool.efi
+testsuccess test -e tmp/efi/loader/entries/machine-id-keytool.conf
+
+############################# TEST BOOTLOADER INSTALLATION ##################
+
+# Mock bootctl
+cat >> $PWD/tmp/bootctl << EOF
+#!/bin/sh
+install -D /usr/lib/systemd/boot/efi/systemd-boot${EFI_ARCH}.efi $PWD/tmp/efi/EFI/systemd/systemd-boot${EFI_ARCH}.efi
+EOF
+
+chmod +x $PWD/tmp/bootctl
+
+testsuccess fakeroot ../sicherboot bootctl install
+testsuccess test -e tmp/efi/EFI/systemd/systemd-boot${EFI_ARCH}.efi
+testsuccess sbverify --cert tmp/keys/db.crt tmp/efi/EFI/systemd/systemd-boot${EFI_ARCH}.efi
+
+
+############################## TEST KERNEL INSTALLATION ######################
+cp /usr/lib/systemd/boot/efi/linux${EFI_ARCH}.efi.stub tmp/vmlinuz-kernel-version
+touch tmp/initrd.img-kernel-version
+
+testsuccess fakeroot ../sicherboot install-kernel kernel-version
+testsuccess test -e tmp/efi/machine-id/kernel-version/linux.efi
+testsuccess test -e tmp/efi/loader/entries/machine-id-kernel-version.conf
+
+
+testsuccess sbverify --cert tmp/keys/db.crt tmp/efi/machine-id/kernel-version/linux.efi
+
+
+############################# TEST THE REAL SETUP COMMAND ######################
+
+# Mock uname
+cat >> $PWD/tmp/uname << EOF
+#!/bin/sh
+echo kernel-version
+EOF
+
+chmod +x $PWD/tmp/uname
+
+
+rm -r tmp/efi
+rm -r tmp/keys
+
+testsuccess test ! -e tmp/efi
+testsuccess test ! -e tmp/keys
+
+testsuccess sh -c 'yes | fakeroot ../sicherboot setup'
+
+testsuccess sbverify --cert tmp/keys/db.crt tmp/efi/EFI/systemd/systemd-boot${EFI_ARCH}.efi
+testsuccess sbverify --cert tmp/keys/db.crt tmp/efi/machine-id/kernel-version/linux.efi
+testsuccess test -e tmp/efi/loader/entries/machine-id-kernel-version.conf