From nobody Tue Oct 13 23:08:28 2026 X-Original-To: dev-commits-src-main@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 4j494D74MJz6w1rk for ; Tue, 13 Oct 2026 23:08:28 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j494D66k0z4kJH for ; Tue, 13 Oct 2026 23:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791932908; 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=MGSLuEuwHYw/EXUmAqunC+diXuwXQZ/kg3JEb9BSCOQ=; b=o8ZJ7SSGTdwCGT0dUZSj9NAA/xkUf09yNa5lmi8K4U3PcCltf2Fe5UTvYiupSFDMMnxodE qJsZtuMGhq5evgLvnXOYEKmChE7j7Q9xqN+nKRglXvqMh3S9tmrkUqlt6+pcvvcNZRBZ+w IcydUJI2TynPKslAAg4zfLstQkETMe/ISVenmL1PZfcYqiaQuOUYpzQ68evDtBsIQc2BEl wx7WCMzmiCkrFTx6VjuHeCLFxWDsbuU4oGm70k9OoMnkNmf2pT+K0/LY6oneO+JUZvx77y lF0oqOTnqnmS+mIRm/X0qKl1C1MFrjQLpQL6moPU+1w+T+obzAiTPd293PDi5Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791932908; b=dB9HGX4+P/uWAuHp/2JobYIgIRtcn4MNuLZ6vzOJh0s5pVu30GLrtHbnJbFJSJ44V7QdFB eRuQvqjTuaxKLdaaZFt+/54k233+rIJfs5dgh6k7n9Y5gfGa1kKy8aJ5916ZT9m5OvOdKX vHiEEWKoj9Ba+9z2JIYkbp4uR62ugKryF3gdTrWg/MZiqcv82ODxekH7Qbg5EkDLJEolYe iFF+KKCu3SQn+lsNIMoRyoqiFnA4blY4GrYIhJbRS5i87BS7hE1WlgtFyWoSGM0ILdrTvX i9sI/ZzX6g97duDEhhjLGs3Yj9ZyiPhrve+rO4kCIWTeFsjrMn69UNMkuBIQ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791932908; 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=MGSLuEuwHYw/EXUmAqunC+diXuwXQZ/kg3JEb9BSCOQ=; b=gAg9djYAS3/SSF5DCV/9Z21IiZPRjZj8kAqInZ1iFdjySFBDRfYbq+ODEGVghZ3E7SJ0A/ Ywa8ExJ78fFdhoXhHl45PSq9h0N9Ate2/xKFxCe4aof1n8AnsYDXCl38VkiLmNCNaeZvDh c5Rcr0w5MFm81z0I5uskaC8bCq5a+SdntuUWOQKSJJhpuIl9Gc2mP/b5nM12G5zBAwmLzd tQ/gehuc3BW6NEtNMTQn51GtedXPkMujp2gak5RWk7DFEBdOgxnund6mcJANX6CZUgdoLD Wqen8awbVXgaY10HJA6nPvkwhRDh185R3v6R9WjZvE2jc0BsuDJOnU6vRK/38A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j494D5C5BzcTy for ; Tue, 13 Oct 2026 23:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 23:08:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 5efc40dd13a7 - main - safe_eval.sh: safe_set_var add allow list for values List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5efc40dd13a7ebd17fe79ab40a424ad894316675 Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 23:08:28 +0000 Message-Id: <6aceb9ec.31cc7.6dc54177@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5efc40dd13a7ebd17fe79ab40a424ad894316675 commit 5efc40dd13a7ebd17fe79ab40a424ad894316675 Author: Simon J. Gerraty AuthorDate: 2026-10-13 23:05:21 +0000 Commit: Simon J. Gerraty CommitDate: 2026-10-13 23:05:21 +0000 safe_eval.sh: safe_set_var add allow list for values Complete the controls with -v "values": sh ./safe_eval.sh set_var -a "knob" -v "no yes" knob=yes knob=no knob=ok ok=yes knob=yes knob=no denied value 'ok' for 'knob' denied variable 'ok' --- libexec/rc/safe_eval.sh | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index 0fd085869397..491633a1343d 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,6 +1,6 @@ : # RCSid: -# $Id: safe_eval.sh,v 1.35 2026/10/11 21:48:58 sjg Exp $ +# $Id: safe_eval.sh,v 1.36 2026/10/13 22:44:09 sjg Exp $ # # @(#) Copyright (c) 2023-2026 Simon J. Gerraty # @@ -42,6 +42,9 @@ fi # white-list of acceptable chars in "val" # default is 'A-Za-z0-9_ ,/=:+-'. # +# -v "values" +# list of allowed values. +# # -x "extra_chars" # eXtra chars to add to white-list for "val". # @@ -54,10 +57,12 @@ fi # # 3. if "allow" is set and "var" is not a member we return 3. # +# 4. if "values" is set and "val" is not a member we return 4. +# # If we pass all that, we eval "var=val" and return 0. # safe_set_var() { - eval $_local ssv_allow ssv_extra ssv_only ssv_space ssv_rc + eval $_local ssv_allow ssv_extra ssv_only ssv_space ssv_rc ssv_values # use [:space:] if we can as it includes \n case " " in [[:space:]]) ssv_space="[:space:]";; @@ -68,9 +73,11 @@ safe_set_var() { while : do + : 1="$1" case "$1" in -a) ssv_allow="$2"; shift 2;; -o) ssv_only="$2"; shift 2;; + -v) ssv_values="$2"; shift 2;; -x) ssv_extra="$2"; shift 2;; *) break;; esac @@ -101,6 +108,10 @@ safe_set_var() { *" $ssv_var "*) ;; *) ssv_rc=${ssv_rc:-3};; esac + case " ${ssv_values:-$ssv_val} " in + *" $ssv_val "*) ;; + *) ssv_rc=${ssv_rc:-4};; + esac ssv_rc=${ssv_rc:-0} if [ $ssv_rc = 0 ]; then : this should be safe @@ -193,8 +204,9 @@ case /$0 in set_var) shift allow= - only= extra= + only= + values= while : do @@ -202,16 +214,20 @@ case /$0 in case "$1" in -a) allow="$2"; shift 2;; -o) only="$2"; shift 2;; + -v) values="$2"; shift 2;; -x) extra="$2"; shift 2;; *=*) - if safe_set_var ${allow:+-a "$allow"} ${only:+-o "$only"} \ + if safe_set_var ${allow:+-a "$allow"} \ + ${only:+-o "$only"} \ + ${values:+-v "$values"} \ ${extra:+-x "$extra"} "$1"; then echo $ssv_var=$ssv_val else case $? in 1) echo invalid variable;; - 2) echo invalid value for $ssv_var;; - 3) echo denied $ssv_var;; + 2) echo "invalid value for '$ssv_var'";; + 3) echo "denied variable '$ssv_var'";; + 4) echo "denied value '$ssv_val' for '$ssv_var'";; esac fi shift