From nobody Sun Oct 11 04:58:58 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 4j2T031DhNz6wRXm for ; Sun, 11 Oct 2026 04:58:59 +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 4j2T030ZrMz4d7P for ; Sun, 11 Oct 2026 04:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791694739; 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=IL7EABdDOWzj9yO6iOffTjRikw3VVojLn6HU87OqqAg=; b=SV/V5xoMPuBTOVabBw+eEpAeYbTgojjG3ZveirxpPhCWtZH0AVLSsvaJPALNHMPrngOL+d eWjTAxhHGujZNgyNDfc25TBATtTtloJaNpYOmP5WwAQPbRBm0SLwEfQx2WDBGYVyt5ZKqV H/RBjBTOuiLx11TwpeZBmgyv0my7IOYVpXq8VxYqLa38so+7Q7c7Fbemc0BaLUVlnwIa6G eqXROEBfDHpaH/VOZlKEHzDHDlQy2gF7bicCJbDW8rouc8qvGQT/FyQ6x1qZ3cu2GVo631 gzgGAxuFrAsMnH17Bzy5+KJt2GHfkot+8zr6xl6Xw1Sn1ybgYnhM65+Sl+qElg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791694739; b=N5fToCroJpgFbjs2A7oeOppV/LljfUj5MN8SK0IYuXPy//toDPTFZIoP2z6GtN0IXgAWxD LMmZlvYF4TXUSnRD2aVmAwC2U0+ng5EgZB3A/oUWScpaIe3+aWZPJdOAUDs0tkEmK9IU6x CP8l4AwFc7itRrYhU9vHmVgwjWxe9JAJu03IHKYUy5fskPov3XRXXCVPH02NWSVs+iQgSw TsIt8QwadNvBoweyY3a3RQN5Xq1D2NFg1khMiure/ZN3U1V2TyOqpC3v+YWtjP9e+SC1NQ n0WpFPtFV0FlvPgFVWnEBuBMtYvqmUWA7ERXKX6BW2JT5QmsThTgnGWjoNfqxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791694739; 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=IL7EABdDOWzj9yO6iOffTjRikw3VVojLn6HU87OqqAg=; b=aRgTKzv4lG/U30B/WOmxr2vjO8Dqm6evziXF5z5l61+ATxlWMjn8nvgcA8c5Q0QZmw0TII zSNZ72mNBN+y1OFTCT+DZdrCBiW5zc4gBk6fPBnrJLgecRoaESI4oaWD/HGtTMUqoiEYac 7vpXWvp2lIo7UcIgPDZDnnl4EIfeOeM0gMfDW+v4f1iYqbtYLXcgVnaAmzlU9fXdKvkSfL auLMP7Jsaw1zOSCPGShyphtjAWgnMF02rdn2Tldyk3W3PvqCfzE2WCblYejYQoHvXB7RiX TFpSFc+rv3LSmQFTd8hdncgGfMcIYaSfpVm5PU3470P9QTpdcU2H862VxMpDjw== 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 4j2T026lqxzQNc for ; Sun, 11 Oct 2026 04:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c811 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 04:58:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 0fa0966b6a5a - main - safe_eval.sh add safe_var_set 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: 0fa0966b6a5a6000e4b98104e17629161f6f1f04 Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 04:58:58 +0000 Message-Id: <6acb1792.1c811.5bdb7798@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=0fa0966b6a5a6000e4b98104e17629161f6f1f04 commit 0fa0966b6a5a6000e4b98104e17629161f6f1f04 Author: Simon J. Gerraty AuthorDate: 2026-10-11 04:58:50 +0000 Commit: Simon J. Gerraty CommitDate: 2026-10-11 04:58:50 +0000 safe_eval.sh add safe_var_set safe_var_set can be used to safely handle var=val args from command line. eg. while : do case "$1" in *=*) # eval "$1" can be very dangerous # safe_var_set will only eval if # both var and value are sane. if ! safe_var_set "$1"; then case "$?" in 1) echo invalid variable name;; 2) echo invalide value;; 3) echo variabel not allowed;; esac fi shift ;; *) break ;; esac done --- libexec/rc/safe_eval.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index eb1698472624..b5ad1ca8639d 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,6 +1,6 @@ : # RCSid: -# $Id: safe_eval.sh,v 1.28 2026/04/22 16:36:32 sjg Exp $ +# $Id: safe_eval.sh,v 1.30 2026/10/11 04:48:37 sjg Exp $ # # @(#) Copyright (c) 2023-2026 Simon J. Gerraty # @@ -22,6 +22,54 @@ else _local=: fi +## +# safe_set_var "var=val" ["allowed_vars" ["only_chars" ["extra_chars"]]] +# +# 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. +# 1. if "var" contains anything but 'A-Za-z0-9_' or matches 'ssv_*' +# we set ssv_var=invalid and return 1 +# 3. if "val" contains anything not in the combined set of +# "only_chars" and "extra_chars" we will set ssv_val=invalid +# and return 3 +# 2. if "allowed_vars" and "var" is not a member we return 2 +# 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 +# +safe_set_var() { + eval $_local ssv_rc + ssv_rc= + if ${isPOSIX_SHELL:-false}; then + ssv_var="${1%%=*}" + ssv_val="${1#*=}" + else + ssv_var=`expr "$1" : '\([^=]*\)=.*'` + ssv_val=`expr "$1" : '[^=]*=\(.*\)'` + fi + : first is ssv_var sane? + case "$ssv_var" in + *[!A-Za-z0-9_]*|ssv_*) ssv_var=invalid; ssv_rc=1;; + esac + case "$ssv_val" in + *[!${3:-A-Za-z0-9_ ,/=:+-}$4]*) ssv_val=invalid; ssv_rc=${ssv_rc:-2};; + esac + : is $ssv_var is allowed + case " ${2:-$ssv_var} " in + *" $ssv_var "*) ;; + *) ssv_rc=${ssv_rc:-3};; + esac + ssv_rc=${ssv_rc:-0} + if [ $ssv_rc = 0 ]; then + : this should be safe + eval "$ssv_var=\"$ssv_val\"" + fi + return $ssv_rc +} + ## # safe_set [xtras] #