From nobody Sun Oct 11 18:13:09 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 4j2pcQ13lqz6vd5J for ; Sun, 11 Oct 2026 18:13:10 +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 4j2pcQ0Vz2z4XMn for ; Sun, 11 Oct 2026 18:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791742390; 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=luUUDNLjG9FoiD9awUsopAO3f8afaNulQO9ELl7t8gA=; b=Ddo+csgN+KlqdAEwoXHtRAFR4JHfWmcA5oHeVZ1jtj+BHO6N3k0iRJ9bzR5ZXgjGqRZjXe tctpF2zjWTQ8qnH0crLtyLoCxjyfF5YysrPTp8/TD4SGXUhJ5z4LhniQNox6dfbqsDvIyd 3uK0y2q9mZLaXOZZNwf/YOh7iUMV8gCGpk/jYIwiy4/D76xvBhwbmwfj6w/esTH/5GuU2v oPIETEMiXri0oaqQVtzFNBqXRSOQqYBxj/EMIFw27X85mp/QbXpxonbCNpNV72SMtYXS4h EVdZ9PIggE78LhBQ4wBHBrtXCRq/FsOZWBJaEtxRBHZDOLOiiUPG3qUEG1vzpg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791742390; b=Nj5j5AdHqP386U2iw5SzLB/50/MzV4oK/NzLOVEIvtM9uKbvz8bJiq2Ir70wCuoSgpYMPW 9jGZw0kmRxQEeZlMaLsGYriffnLcq1Im/FxzLftVHVNdntg1JOCG9VVRvtfgQIQD2A2ESa 9BwZhORj1ljClvAGcxRW5Bmw+Kl1n+5wgznMynj7gUiiNM+7PcA+jiJqPLpnR4ftV3q4tO ttYTKl/sSbNEP5a3WDgfCgLYVUdoPu9HKYFF2drgtFKBlDxUSD5TtAMkHb22nktKNUskPI Uf0DBSObcpzyem0qMvJjPo+oYeKi+2a/v2HlrAPs9TrBxWqTn4AOa4a8YZMmbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791742390; 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=luUUDNLjG9FoiD9awUsopAO3f8afaNulQO9ELl7t8gA=; b=CYLOgjSdwJja/pU6JAYI/vUXI+uEDNDQAtE73B37b9KlmpKdrkHzwsS/gtIVMa1QQktGh3 /IkGibTfrluUE84hK5hLtWx/+j7rys9zpPDdBVAHlEJXjmQyrnDTDzdhaWtoUlf5x7qMp1 TW8Zn/azWug046qni4F6rEw0++3nh5uFaqA6XM9bq1c4iqsejt0GOpxaAuRn75zOuGhlAQ oiH2u6ZDLfvMD0LBbi+1vHDnQJ4TxayuCob52fqfMp3SGXLnUOevMuQOzCxMaf2XypM+0S QNLunPFElMO8QP//dhTA8erb4ecccNYWGplUDMR8xQeA8w3OGdeejHhnRNgsHA== 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 4j2pcP6PNKzt3T for ; Sun, 11 Oct 2026 18:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3353d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 18:13:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 7c75c96d176f - main - safe_eval.sh: safe_set_var avoid positional args 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: 7c75c96d176f600c7d17cb4652a1e655b44b2943 Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 18:13:09 +0000 Message-Id: <6acbd1b5.3353d.7e4dba05@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=7c75c96d176f600c7d17cb4652a1e655b44b2943 commit 7c75c96d176f600c7d17cb4652a1e655b44b2943 Author: Simon J. Gerraty AuthorDate: 2026-10-11 18:12:59 +0000 Commit: Simon J. Gerraty CommitDate: 2026-10-11 18:12:59 +0000 safe_eval.sh: safe_set_var avoid positional args Use options to set ssv_{allow,only,extra} Improve the documentation. Add a test harness for safe_set_var. --- libexec/rc/safe_eval.sh | 90 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index 940465581c62..597c9e79ef9e 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,6 +1,6 @@ : # RCSid: -# $Id: safe_eval.sh,v 1.32 2026/10/11 06:02:40 sjg Exp $ +# $Id: safe_eval.sh,v 1.34 2026/10/11 18:08:28 sjg Exp $ # # @(#) Copyright (c) 2023-2026 Simon J. Gerraty # @@ -23,26 +23,53 @@ else fi ## -# safe_set_var "var=val" ["allowed_vars" ["only_chars" ["extra_chars"]]] +# safe_set_var ["options"] "var=val" +# +# Useful for processing command line input like 'var=val'. # -# Useful for processing command line input like 'var=val' # We perform a number of sanity checks similar to safe_set. # We set ssv_var=var and ssv_val=val so that caller can produce -# error messages if desired. ssv_var or ssv_val will be set to -# 'invalid' if they fail the relevant checks. +# error messages if desired. +# To be safe, ssv_var and/or ssv_val will be set to 'invalid' +# if they fail the relevant checks. +# +# Options: +# +# -a "allow" +# list of allowed variable names. +# +# -o "only_chars" +# white-list of acceptable chars in "val" +# default is 'A-Za-z0-9_ ,/=:+-'. +# +# -x "extra_chars" +# eXtra chars to add to white-list for "val". +# # 1. if "var" contains anything but 'A-Za-z0-9_' or matches 'ssv_*' -# we set ssv_var=invalid and return 1 +# we set ssv_var=invalid and return 1. +# # 2. if "val" contains anything not in the combined set of # "only_chars" and "extra_chars" we will set ssv_val=invalid -# and return 2 -# 3. if "allowed_vars" and "var" is not a member we return 3 -# If "only_chars" is not provided we use 'A-Za-z0-9_ ,/=:+-' -# similar to save_set. -# If we pass all that, we eval "var=val" and return 0 +# and return 2. +# +# 3. if "allow" is set and "var" is not a member we return 3. +# +# If we pass all that, we eval "var=val" and return 0. # safe_set_var() { - eval $_local ssv_rc + eval $_local ssv_allow ssv_extra ssv_only ssv_rc + ssv_only="A-Za-z0-9_. \$,/=:+-" ssv_rc= + + while : + do + case "$1" in + -a) ssv_allow="$2"; shift 2;; + -o) ssv_only="$2"; shift 2;; + -x) ssv_extra="$2"; shift 2;; + *) break;; + esac + done if ${isPOSIX_SHELL:-false}; then ssv_var="${1%%=*}" ssv_val="${1#*=}" @@ -59,13 +86,13 @@ safe_set_var() { esac : is ssv_val ok - "$ssv_val" case "$ssv_val" in - *[!${3:-A-Za-z0-9_. \$,/=:+-}$4]*) + *[!$ssv_only$ssv_extra]*) ssv_val=invalid ssv_rc=${ssv_rc:-2} ;; esac : is $ssv_var is allowed - "${2:-$ssv_var}" - case " ${2:-$ssv_var} " in + case " ${ssv_allow:-$ssv_var} " in *" $ssv_var "*) ;; *) ssv_rc=${ssv_rc:-3};; esac @@ -87,7 +114,7 @@ safe_set_var() { # so just delete them. # # "xtras" should be used with caution and cannot include ';' -# +# safe_set() { ${SED:-sed} -e 's/^[ ]*//;s/[ ]*#.*//;s/^:.*//' \ -e '/`/d' -e '/\$(/d' \ @@ -153,11 +180,42 @@ safe_dot() { return 0 } +# for testing case /$0 in */safe_eval*) case "$1" in dot|eval|set) op=safe_$1; shift; $op "$@";; - *) safe_dot "$@";; + set_var) + shift + allow= + only= + extra= + + while : + do + : 1="$1" + case "$1" in + -a) allow="$2"; shift 2;; + -o) only="$2"; shift 2;; + -x) extra="$2"; shift 2;; + *=*) + if safe_set_var ${allow:+-a "$allow"} ${only:+-o "$only"} \ + ${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;; + esac + fi + shift + ;; + *) break;; + esac + done + ;; + *) safe_dot "$@";; esac ;; esac