From nobody Wed Dec 6 21:40:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlrRy4LJZz532JT; Wed, 6 Dec 2023 21:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlrRy2GYPz3WLr; Wed, 6 Dec 2023 21:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701898846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlVYoOOUs3wpcFkDHWVzWCzrUSlOPxUZ56tsi24Z2vY=; b=Ej8h/OWrV2h0eiM+3Pn6m98KlKxnX579CDNjuKyD3rLz2zu/kpjdIzHAUa5GmNk3/lE/XV 0Kf4PO1FPX3L+s5JTx5sYI1ORfKMFfVISLG7R0wclIEt5qTKRfVu8un0xFQWZ0Z9mKC/2u 7HLSypx8lxxOhKdCcHU/COtC6RRe4gAjyloo+YcPbW9XsIu1uQk4hCIMQMg14IsjRiPF98 EBeLG+D1lnGzvm4SpEQklMgde+0iedCQfhj9bfPZtr+DHC7btPjNGfRr7k5I7Bb/EvZfcb cJuatm7DusVUylxRo9fVG8bpcqBaVuCKbYMUZcC7vmWHv33AFKEvNrzdp01jvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701898846; a=rsa-sha256; cv=none; b=yG4u/HR4w0LDIIbiMFbXK34Fl/+ax7mvhXW8LSrG86VBMNAGBmAHV97g/aD+CGn15c2pAg EQ+y74cyBuxfBAdeRTGmupyUBhAOOsP8kVsCb7uc4+EWe61T+5C0tvsYrc64532qrqejjl ypO3SumFppq9P3W7nRvbdvXnGeZHD08xuOVqV+Zz62+BJW9Q8RudSguIA9snvyE2B4YRNV XifLomjH5ZN0oNyC0nqLLvPzdel6AOTv79Yz3v6NS2+IIPptgu+ZnGoVxiLfGf5Tt08Tev U6J1cOtAi/D3Ucxf+l5VoAudAEG9hGVBwdvx5mmkYrWkunL8Ss5mu3HEa5gmvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701898846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlVYoOOUs3wpcFkDHWVzWCzrUSlOPxUZ56tsi24Z2vY=; b=ffGsYfqThatWHl7AcuIqF9aCitxqGwjAM2cDNNOPd1ltdOHrYheT8hsJki0Gf6xsRyNIEy lSOvcccu4owvGZNk6ZSOmZCkwKZMeCki7jCDS1q16qBzPoSWHXGuksNRtL2u6Um2/A32SN BMcXDpXB72yZzamfrHIfF1+RW8PBOhSloWJ6jRqDpqWv3qxaHNNvix7sys3RT7TJbApY/P dgAgtgg5kcoH5DeJEKr0ehFDsTf6z2nA0AQ94/y2o+GnhFpUCkTlRHmm1pMnqzmc+NAPlr P/hpP1jqTC5nnXV1vMpXOec22Rh6yqlWiyLtmm+DmUnlgyLAZFd5oAGKEgirNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlrRy1LSvz18q9; Wed, 6 Dec 2023 21:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6LekAb047813; Wed, 6 Dec 2023 21:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6LekVq047810; Wed, 6 Dec 2023 21:40:46 GMT (envelope-from git) Date: Wed, 6 Dec 2023 21:40:46 GMT Message-Id: <202312062140.3B6LekVq047810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 47d669f10ea3 - main - bsdinstall: Encode dists to valid variable names in checksum script List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47d669f10ea3eb92a3783376549728b42c9e22b9 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=47d669f10ea3eb92a3783376549728b42c9e22b9 commit 47d669f10ea3eb92a3783376549728b42c9e22b9 Author: Jessica Clarke AuthorDate: 2023-12-06 21:37:32 +0000 Commit: Jessica Clarke CommitDate: 2023-12-06 21:37:32 +0000 bsdinstall: Encode dists to valid variable names in checksum script Currently we just strip the .txz of the dist name (and add a status_ prefix) to get the shell variable name for its status, but this doesn't give a valid result for dists like base-dbg, kernel-dbg and lib32-dbg, or even kernel.KERNCONF (or, combining the two, kernel.KERNCONF-dbg). As a result, four things go wrong for such dists: 1. If there is a dot and/or a dash in the name, writing to the variable fails and spits an error out on stderr to the log 3. If there is a dot in the name before any dash, the syntax is always invalid, reading the variable fails, spits an error out on stderr to the log, the result is the empty string and that is interpreted as being 0% 2. If there is a dash in the name before any dot, and there is a dist whose name is the substring up to that first dash, and it has already had its status written to, reading the variable instead reads that dist's variable and so the status of that dist is displayed instead 3. If there is a dash in the name before any dot, and either there is not a dist whose name is the substring up to that first dash or there is such a dist but it has not already had its status written to, reading the varaible instead results in the substring after the first dash, including any additional string expansion syntax that follows (i.e. ${status_kernel-dbg:--11}, the expression used to read the variable, is interpreted as reading status_kernel with a default value of "dbg:--11") For example, in a default install with base, kernel, kernel-dbg and lib32, the following sequence of displays happens: 1. base is In Progress, kernel is Pending, kernel-dbg is 0% (what shows for the garbage input "dbg:--11") and lib32 is Pending 2. base is Passed, kernel is In Progress, kernel-dbg is In Progress (since kernel has now had its status written to) and lib32 is Pending 3. base is Passed, kernel is Passed, kernel-dbg is Passed (again, since that is the status of kernel, despite that kernel-dbg is being verified at this point) and lib32 is Pending 4. base is Passed, kernel is Passed, kernel-dbg is Passed and lib32 is In Progress Fix this with a crude encoding scheme. More special characters can easily be added if needed in future. Note that, prior to bsddialog being used (and thus for branches this is MFC'ed to where dialog is still used), the same problem existed but displayed slightly differently due to a combination of different default values and different behaviour for unintended inputs. Fixes: b70047d41362 ("Add generation of an installation manifest containing SHA256 checksums as ...") MFC after: 1 week --- usr.sbin/bsdinstall/scripts/checksum | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/checksum b/usr.sbin/bsdinstall/scripts/checksum index 376ba4261496..ee93cb342f25 100755 --- a/usr.sbin/bsdinstall/scripts/checksum +++ b/usr.sbin/bsdinstall/scripts/checksum @@ -30,14 +30,20 @@ test -f $BSDINSTALL_DISTDIR/MANIFEST || exit 0 BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1 +dist_to_statusvar() +{ + printf 'status_' + echo "$1" | sed 's/_/__/g;s/\./_dot_/g;s/-/_dash_/g' +} + percentage=0 for dist in $DISTRIBUTIONS; do - distname=$(basename $dist .txz) - eval "status_$distname=-8" + statusvar=$(dist_to_statusvar $dist) + eval "$statusvar=-8" items="" for i in $DISTRIBUTIONS; do - items="$items $i `eval echo \\\${status_$(basename $i .txz):--11}`" + items="$items $i `eval echo \\\${$(dist_to_statusvar $i):--11}`" done bsddialog --backtitle "$OSNAME Installer" --title "Checksum Verification" \ --mixedgauge "\nVerifying checksums of selected distributions.\n" \ @@ -57,13 +63,13 @@ for dist in $DISTRIBUTIONS; do CK_VALID=$? if [ $CK_VALID -le 1 ]; then if [ $CK_VALID -eq 0 ]; then - eval "status_$distname=-3" + eval "$statusvar=-3" else - eval "status_$distname=-7" + eval "$statusvar=-7" fi percentage=$(echo $percentage + 100/`echo $DISTRIBUTIONS | wc -w` | bc) else - eval "status_$distname=-2" + eval "$statusvar=-2" case $(/bin/freebsd-version -u) in *-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE) bsddialog --backtitle "$OSNAME Installer" --title "Error" \