From nobody Sun Jun 28 18:40:16 2026 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 4gpJB86dwlz6jkJ2 for ; Sun, 28 Jun 2026 18:40:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB84NhMz3XMF for ; Sun, 28 Jun 2026 18:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672016; 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=hg8ofyhmjRKjbwUq6a1iF+773dmpH40SXcUSOawIIo4=; b=QUxHxSOnZZxC2DyjQ45k9/kItkySDrscwXJ97Yd2TfjLiGalrOvKtq5WVQ2arNeC+3an49 greMjpZKgjRuSWrmm4ero+Vp75h0luwqzJy0HVyJRO0fPPbCGqVP4SATz8c8P8tErNVQCy c3SjoFT9vzhod0NoiZviMXRAvkk2DujraDlP1Q6oQR873+hFbMu7brv18WD2QB3K9kdIG4 lapAW5UzUDrRC9P9B33daZg1mxPVoXqWsoYr8KE9SRZ9TWpxByXPRk86nPMFfu6dXVudTT +JuNDudY8BIv3YQK+w4wmpDTJFOsb/+HTXKji8Muurxe+ucnar9cTUzCDrordQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672016; a=rsa-sha256; cv=none; b=m2t13wOPDG113CbJMHpPPGjmDpnV4qckz4bW6xCVYrIL+KaQpMaEP3zqM2Pdff1dDBtbzI LcZodP9leiNE7DuMfJ/KEgclxfgWxxS3FS7C7rXovKdPelqkdRzO4u5LK6XP58+Ka9YXp5 wee5ZcjmwuKIYBPKdc5gzu+ZD65pXtmEnYWSx+MQV3qcyGx9A28/sEtG1KQBWrn2COeim4 oKg/N5LBlA/kwj8CDJoePb0Fw0uSioh2VJhDtv0kgt8soQayuAe0IxFgXVPV/iSoIPLq6q VPf6hezbL5cIi6LwA72T8GhdJwl+lbQPSF9gfJKV9zR6qn+QRDt+cLOI+KeYlQ== 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=1782672016; 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=hg8ofyhmjRKjbwUq6a1iF+773dmpH40SXcUSOawIIo4=; b=wGPnKyZJWO18xSySu5P/PpIslvxyTp+WmxKh0j1bif8vpgFRRHloVxHO3ScCY59AXbrReW AWEGKwMj36nl3vB61aJEdZqlQivDiKjeHgcFBiztBnLlNiDyI989nv4m7tp3+iIvtCdUjL QMMNlNuB4JkokTmgfSfPR7TvOiOJtmXG8HalA5pUBon60GKgxKRuysko/Y+7YUOL7J/9Or yPe+GY6aU19OscbRWdlpoDJGVSR7nxExit/ZujukzhsPomFihKjaeoHDfrvgS4VTepdrwZ 6u8HovRCiQzUuEQWYw/Voa7QJkKhEHRpF7WS9MSog4YZjSffuW1AF/WSgfXlew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB82y6kz6Yl for ; Sun, 28 Jun 2026 18:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c324 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3b91e432616d - stable/15 - nuageinit: add adddoas tests 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 List-Id: 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3b91e432616da67c0e54f53c0c9564498a68fe44 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:16 +0000 Message-Id: <6a416a90.1c324.10471765@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3b91e432616da67c0e54f53c0c9564498a68fe44 commit 3b91e432616da67c0e54f53c0c9564498a68fe44 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 nuageinit: add adddoas tests (cherry picked from commit 0f92bee2b3e08ffa34720a2eeffbce01af3f19f9) --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/adddoas.lua | 64 +++++++++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 7 ++++ 3 files changed, 72 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index d13ad14f1d8f..4c99f8e31ce3 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -20,5 +20,6 @@ ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua ${PACKAGE}FILES+= addsudo.lua +${PACKAGE}FILES+= adddoas.lua .include diff --git a/libexec/nuageinit/tests/adddoas.lua b/libexec/nuageinit/tests/adddoas.lua new file mode 100644 index 000000000000..d4bab41ecc3d --- /dev/null +++ b/libexec/nuageinit/tests/adddoas.lua @@ -0,0 +1,64 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local function get_localbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local lb = f:read("*l") + f:close() + if lb == nil or lb:len() == 0 then + lb = "/usr/local" + end + return lb +end + +local function read_doasconf() + local path = root .. get_localbase() .. "/etc/doas.conf" + local f = io.open(path, "r") + if not f then + return nil + end + local content = f:read("*a") + f:close() + return content +end + +-- test with a single string rule with %u substitution +n.adddoas({ name = "testuser", doas = "permit persist %u as root" }) +local content = read_doasconf() +if not content then + n.err("doas.conf not created") +end +if content ~= "permit persist testuser as root\n" then + n.err("unexpected doas.conf content with %u: '" .. content .. "'") +end + +-- remove file for next test +os.remove(root .. get_localbase() .. "/etc/doas.conf") + +-- test with a table of rules +n.adddoas({ + name = "testuser", + doas = { + "deny %u as foobar", + "permit persist %u as root cmd whoami" + } +}) +content = read_doasconf() +if not content then + n.err("doas.conf not created for table") +end +if content ~= "deny testuser as foobar\npermit persist testuser as root cmd whoami\n" then + n.err("unexpected doas.conf content for table: '" .. content .. "'") +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 9e3442281c15..01c4612eb8ec 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -16,6 +16,7 @@ atf_test_case addgroup atf_test_case addfile atf_test_case decode_base64 atf_test_case addsudo +atf_test_case adddoas settimezone_body() { @@ -103,6 +104,11 @@ addsudo_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/addsudo.lua } +adddoas_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/adddoas.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -113,4 +119,5 @@ atf_init_test_cases() atf_add_test_case addfile atf_add_test_case decode_base64 atf_add_test_case addsudo + atf_add_test_case adddoas }