672705831f
As motivation for this; we have had two breakouts of dib in recent memory. One was a failure to unmount through symlinks in the core code (I335316019ef948758392b03e91f9869102a472b9) and the other was removing host keys on the build-system (Ib01d71ff9415a0ae04d963f6e380aab9ac2260ce). For the most part, dib runs unprivileged. Bits of the core code are hopefully well tested (modulo bugs like the first one!). We give free reign inside the chroot (although there is still some potential there for adverse external affects via bind mounts). Where we could be a bit safer (and could have prevented at least the second of these breakouts) is with some better checking that the "sudo" calls *outside* the chroot at least looked sane. This adds a basic check that we're using chroot or image paths when calling sudo in those parts of elements that run *outside* the chroot. Various files are updated to accomodate this check; mostly by just ignoring it for existing code (I have not audited these calls). Nobody is pretending this type of checking makes dib magically safe, or removes the issues with it needing to do things as root during the build. But this can help find egregious errors like the key removal. Change-Id: I161a5aea1d29dcdc7236f70d372c53246ec73749
48 lines
1.2 KiB
Bash
Executable File
48 lines
1.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# dib-lint: disable=safe_sudo
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
# sanity checks
|
|
source $_LIB/die
|
|
[ -n "$IMAGE_BLOCK_DEVICE" ] || die "Image block device not set"
|
|
|
|
# execute sfdisk with the given partitioning schema
|
|
sudo sfdisk -uS --force $IMAGE_BLOCK_DEVICE <<EOF
|
|
$DIB_PARTITIONING_SFDISK_SCHEMA
|
|
EOF
|
|
sudo partprobe $IMAGE_BLOCK_DEVICE
|
|
|
|
# To ensure no race conditions exist from calling partprobe
|
|
sudo udevadm settle
|
|
|
|
# If the partition isn't under /dev/loop*p1, create it with kpartx
|
|
DM=
|
|
if [ ! -e "${IMAGE_BLOCK_DEVICE}p1" ]; then
|
|
DM=${IMAGE_BLOCK_DEVICE/#\/dev/\/dev\/mapper}
|
|
# If running inside Docker, make our nodes manually, because udev will not be working.
|
|
if [ -f /.dockerenv ]; then
|
|
# kpartx cannot run in sync mode in docker.
|
|
sudo kpartx -av $TMP_IMAGE_PATH
|
|
sudo dmsetup --noudevsync mknodes
|
|
else
|
|
sudo kpartx -asv $TMP_IMAGE_PATH
|
|
fi
|
|
elif [[ "$ARCH" =~ "ppc" ]]; then
|
|
sudo kpartx -asv $TMP_IMAGE_PATH
|
|
fi
|
|
|
|
if [ -n "$DM" ]; then
|
|
echo "IMAGE_BLOCK_DEVICE=${DM}p1"
|
|
elif [[ "$ARCH" =~ "ppc" ]]; then
|
|
DM=${IMAGE_BLOCK_DEVICE/#\/dev/\/dev\/mapper}
|
|
echo "IMAGE_BLOCK_DEVICE=${DM}p2"
|
|
else
|
|
echo "IMAGE_BLOCK_DEVICE=${IMAGE_BLOCK_DEVICE}p1"
|
|
fi
|