=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.7 retrieving revision 1.14 diff -u -r1.7 -r1.14 --- openbsd/fw_update/fw_install.sh 2021/10/14 03:00:02 1.7 +++ openbsd/fw_update/fw_install.sh 2021/10/17 23:25:14 1.14 @@ -13,8 +13,18 @@ done } -# do_as, unpriv, and unpriv2 are from install.sub +# tmpdir, do_as, unpriv, and unpriv2 are from install.sub +# Create a temporary directory based on the supplied directory name prefix. +tmpdir() { + local _i=1 _dir + + until _dir="${1?}.$_i.$RANDOM" && mkdir -- "$_dir" 2>/dev/null; do + ((++_i < 10000)) || return 1 + done + echo "$_dir" +} + # Run a command ($2+) as unprivileged user ($1). # Take extra care that after "cmd" no "user" processes exist. # @@ -60,10 +70,26 @@ do_as _file "$@" } +_issue= +fail() { + echo $_issue >&2 + exit 1 +} + VNAME=$(sysctl -n kern.osrelease) VERSION="${VNAME%.*}${VNAME#*.}" FWDIR="$VNAME" +# TODO: We need the firmware for the system we just installed +# not the one we booted from. For example: +# * booting from a snapshot bsd.rd that thinks it is the 7.0 release +# will install the firmware from the 7.0 directory instead of +# from the snapshots dir. +# If they're using sysupgrade, then the installer kernel will be correct. +# If we're doing this in the installer we can check what they picked +# for downloading sets and use that value. +# Otherwise, the fw_update after first boot will fix it up for us. + HTTP_FWDIR=$FWDIR set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p") [[ $1 == -!(stable) ]] && HTTP_FWDIR=snapshots @@ -73,98 +99,121 @@ PKGDIR=${DESTDIR}/var/db/pkg PATTERNS="file:${0%/*}/firmware_patterns" -drivers=$( - last='' - ftp -D "Detecting" -Vmo- $PATTERNS | - while read d m; do - grep=grep - [ "$last" = "$d" ] && continue - [ "$m" ] || m="^$d[0-9][0-9]* at " - [ "$m" = "${m#^}" ] && grep=fgrep - $grep -q "$m" /var/run/dmesg.boot || continue - echo $d - last=$d - done -) +fw_update() { + local _tmpsrc _f _remove _r + local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false + local _drivers=$( + last='' + ftp -D "Detecting" -Vmo- $PATTERNS | + while read d m; do + grep=grep + [ "$last" = "$d" ] && continue + [ "$m" ] || m="^$d[0-9][0-9]* at " + [ "$m" = "${m#^}" ] && grep=fgrep + $grep -q "$m" /var/run/dmesg.boot || continue + echo $d + last=$d + done + ) -if [ -z "$drivers" ]; then - echo "No devices found which need firmware files to be downloaded." >&2 - exit 0 -fi + if [ -z "$_drivers" ]; then + echo "No devices found which need firmware files to be downloaded." >&2 + return + fi -tmpdir=${DESTDIR}/tmp/fw_update -[ -e "$tmpdir" ] && rm -rf "$tmpdir" -mkdir -p "$tmpdir" -cd "$tmpdir" + if _tmpsrc=$( tmpdir "${DESTDIR}/tmp/fw_update" ); then + ( + >$_tmpsrc/t && + $_unpriv cat $_tmpsrc/t + ) >/dev/null 2>&1 || + rm -r $_tmpsrc + fi -# TODO: Drop privs during fetch and verify -ftp -D Get -Vm "$FWURL/SHA256.sig" + [[ ! -d $_tmpsrc ]] && + _issue="Cannot create prefetch area" && fail -# Probably should bundle the firmware sigfile on the installer, -# although we can just get it from the recently installed system. -if [ "$DESTDIR" ]; then - sigfile=$( sed -n '/^untrusted comment: verify with \(.*\)$/ { s//\1/p; q; }' SHA256.sig ) - if [ ! -e "/etc/signify/$sigfile" ] \ - && [ -e "${DESTDIR}/etc/signify/$sigfile" ]; then - cp -a "${DESTDIR}/etc/signify/$sigfile" "/etc/signify/$sigfile" - fi -fi + ! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" && + _issue="Cannot fetch SHA256.sig" && fail -signify -Ve -x SHA256.sig -m - < SHA256.sig > SHA256 + # Verify signature file with public keys. + ! unpriv -f "$_cfile" \ + signify -Vep $FWPUB_KEY -x "$_cfile.sig" -m "$_cfile" && + _issue="Signature check of SHA256.sig failed" && fail -for d in $drivers; do - firmware=$( sed -n "s/.*(\($d-firmware-.*\.tgz\)).*/\1/p" SHA256 ) - installed=$( installed_firmware $d ) + for d in $_drivers; do + _f=$( sed -n "s/.*(\($d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" ) + installed=$( installed_firmware "$d" ) - for i in $installed; do - if [ "$firmware" = "$i.tgz" ]; then - echo "Firmware for $d already installed ($installed)" - continue 2 - fi - done + for i in $installed; do + if [ "$_f" = "$i.tgz" ]; then + echo "Firmware for $d already installed ($installed)" + continue 2 + fi + done - mkdir $d + rm -f /tmp/h /tmp/fail - # TODO: Drop privs during fetch and verify - ftp -D "Get/Verify" -Vmo- "$FWURL/$firmware" | sha256 -bph "$d/h" > "$firmware" - fgrep -qx "SHA256 ($firmware) = $(<$d/h)" SHA256 + _t=Get/Verify + # Fetch firmware file and create a checksum by piping through + # sha256. Create a flag file in case ftp failed. Firmware + # from net is written to the prefetch area. + ( $_unpriv ftp -D "$_t" -Vmo - "$_src/$_f" || >/tmp/fail ) | + ( $_srclocal && unpriv2 sha256 -b >/tmp/h || + unpriv2 -f /tmp/h sha256 -bph /tmp/h >"$_tmpsrc/$_f" ) - # TODO: Check hash for files before deleting - if [ "$installed" ] && [ -e "${PKGDIR}/$installed/+CONTENTS" ]; then - echo "Uninstalling $installed" - cwd=${PKGDIR}/$installed + # Handle failed transfer. + if [[ -f /tmp/fail ]]; then + rm -f "$_tmpsrc/$_f" + _issue="Fetching of $_f failed!" + fail + fi - remove="${cwd}/+CONTENTS ${cwd}" + # Verify firmware by comparing its checksum with SHA256. + if fgrep -qx "SHA256 ($_f) = $(