From nobody Mon Jun 23 07:44:18 2025 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 4bQg830sHxz5ywh0; Mon, 23 Jun 2025 07:44:19 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQg8300vhz4Bt3; Mon, 23 Jun 2025 07:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664659; 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=CFSbF44mk6/OVH0ziYydfJ5xxvDcTefa3FWuloVVd0s=; b=kjKRZdAkPr6RvV4UPeuub/UNcQ0sOgONFJ/i0S/PuGd8SmqFXi2MbENIHlpYl37LJ1Rp6y SiN3KwNy6xcgmoM6Y+cY+GKONJk9IC8UJ+eOhpM5GQS18wGjU0szHYr8ff7DaI+TV971GL MmpH3DVf0ZF4n9SlfCJ47YAmDht876G1N2sxrK6AOlyXfBWd1do+OnkHuMezzT2BPlrdSu gvqqizrrJ/H9JLAG2VvfP3zuuNCZUBz+KjmWYhszDeNGOqLFcBrpDUW3OKAr3OSQ+YPux3 5i2haUkQ1lv6YhBqo4ZcDE3JL04YjpYN/h/HWzI04c4XvyXWaScqGypnWLz7pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664659; 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=CFSbF44mk6/OVH0ziYydfJ5xxvDcTefa3FWuloVVd0s=; b=DVwGINWK4LP4HemruHfQdgwD/If0vzMWXsKEzyTfpKJJMYUlPYYR2MdKZx3Wbc0gXkeGtV wRGggCO+phAN4GAWotvB6FrWGrt9RCskL5CsLKHZeMXef8FII5+KdXzR0VSgoy1teBPvAv QBD6idAHn0AKdhmjDV9wfB9KkoPCnOjMSUpfoJ8FASsW7mPg/+UmbXH9mX4EfH3sSIdW7t mXbfPFI9ws+KBKr7SO3nRoJ6ohYg6f+CfBs1fR1gJDGO1HT/GtrpvevrEIu98hBJ8Ju488 jHHTH9dAB/HU0j6wpDfsyWw6sABJ+1vKXR7UPmLxna4gdNY1VWrgJseM94RLoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750664659; a=rsa-sha256; cv=none; b=t48hZECia4okrfcD3PMUo1qX5OCq81NAtGvnD5X5KCh4peGLceTZNSfLZutFmq95d/dGIB DWLg5uZwGCeSK3qtKMzRLiKrE6YJTWMCIVVfmhtAhOkntEHGhStZD/nayIXFFX7P9EfuCZ 5fWkk0CMnlA5Jveqh90zDNY5hBN9UgKrDZcxR0H4N4I7e3V33LFVZhDJ4Mx0cdSQVnSL8s Hx4tPurx3JMJtyyK32e2ZpEohJe60grgEZp46GHeblFL7LS0MzVbq6xuA2TmylENZ8ucTH lZXNPTeL/40hWo9TApVhoCrDv17m7NamDRKYaPol/VaROYNe9uSN3BBr1v6c3g== 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 4bQg826kMvztYt; Mon, 23 Jun 2025 07:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55N7iIHF067454; Mon, 23 Jun 2025 07:44:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N7iIES067451; Mon, 23 Jun 2025 07:44:18 GMT (envelope-from git) Date: Mon, 23 Jun 2025 07:44:18 GMT Message-Id: <202506230744.55N7iIES067451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 5540b9eb9e2a - stable/14 - nuageinit: add support for sudo 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5540b9eb9e2a560ba89e0a94ad665eaa8bf245cc Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5540b9eb9e2a560ba89e0a94ad665eaa8bf245cc commit 5540b9eb9e2a560ba89e0a94ad665eaa8bf245cc Author: Baptiste Daroussin AuthorDate: 2025-06-15 15:18:32 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-23 07:43:13 +0000 nuageinit: add support for sudo (cherry picked from commit 6a54f886bede6e6193ebc82ec5fca85679b7dc41) --- libexec/nuageinit/nuage.lua | 39 +++++++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit | 3 +++ libexec/nuageinit/tests/nuageinit.sh | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 76f2d24ac178..deb441ee25ba 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -228,6 +228,42 @@ local function addsshkey(homedir, key) end end +local function addsudo(pwd) + local chmodsudoersd = false + local chmodsudoers = false + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local sudoers_dir = "/usr/local/etc/sudoers.d" + if root then + sudoers_dir= root .. sudoers_dir + end + local sudoers = sudoers_dir .. "/90-nuageinit-users" + local sudoers_attr = lfs.attributes(sudoers) + if sudoers_attr == nil then + chmodsudoers = true + local dirattrs = lfs.attributes(sudoers_dir) + if dirattrs == nil then + local r, err = mkdir_p(sudoers_dir) + if not r then + return nil, err .. " (creating " .. sudoers_dir .. ")" + end + chmodsudoersd = true + end + end + local f = io.open(sudoers, "a") + if not f then + warnmsg("impossible to open " .. sudoers) + return + end + f:write(pwd.name .. " " .. pwd.sudo .. "\n") + f:close() + if chmodsudoers then + sys_stat.chmod(sudoers, 416) + end + if chmodsudoersd then + sys_stat.chmod(sudoers, 480) + end +end + local function update_sshd_config(key, value) local sshd_config = "/etc/ssh/sshd_config" local root = os.getenv("NUAGE_FAKE_ROOTDIR") @@ -419,7 +455,8 @@ local n = { pkg_bootstrap = pkg_bootstrap, install_package = install_package, update_packages = update_packages, - upgrade_packages = upgrade_packages + upgrade_packages = upgrade_packages, + addsudo = addsudo } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c1026aa2afee..d8aa734cb122 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -290,6 +290,9 @@ if line == "#cloud-config" then nuage.addsshkey(homedir, v) end end + if u.sudo then + nuage.addsudo(u) + end else nuage.warn("invalid type : " .. type(u) .. " for users entry number " .. n) end diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index edcc80346b5d..fe799a2227f3 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -117,6 +117,7 @@ users: - name: foobar gecos: Foo B. Bar primary_group: foobar + sudo: ALL=(ALL) NOPASSWD:ALL groups: users passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ EOF @@ -138,6 +139,7 @@ EOF sed -i "" "s/freebsd:.*:1001/freebsd:freebsd:1001/" "${PWD}"/etc/master.passwd atf_check -o file:expectedpasswd cat "${PWD}"/etc/master.passwd atf_check -o file:expectedgroup cat "${PWD}"/etc/group + atf_check -o inline:"foobar ALL=(ALL) NOPASSWD:ALL\n" cat ${PWD}/usr/local/etc/sudoers.d/90-nuageinit-users } nocloud_network_head()