From nobody Tue Aug 11 11:17:27 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 4hK8Gv615Yz6nXk4 for ; Tue, 11 Aug 2026 11:17:27 +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 4hK8Gv396pz3Qm0 for ; Tue, 11 Aug 2026 11:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786447047; 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=7h6wuib/v7Ku0MYC2ktauq14UaygisgFK32MlVwDkDc=; b=kfJuJQ57j03KKV+hNecJ6guNCMMA5mcFj3eMh9/2x3Qo7GYuOh3V922VyGCdztBEiq8zbB wBT9osZCQ1Rk1hP6yN9PRyTEd1RHiRLqUHa1oTlBIGJyMtbpIxC0qLRE/M90CuVXU4binX KLFbg/yUdlRV5CBhg1QCd+ff8CHpyi1YASQbjYTSCdQBnmavGCrZxXn3MPSvzxT1DP00/5 4qEyPgUVFkUNvvp94an8w7yjiFgpXzvPFPk3LlUABm9EYng3qxtC84GNwIVpgBtoQeqQYG HnmOsaI4LqL5hO0BnOkvpFCTNXm0JeaAPqf3+sZ5G+RzGuCCSfwC0JmGRpAJYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786447047; a=rsa-sha256; cv=none; b=xbaYX4tywOc+dnoPkw8dUhfgOiCEMwYMb+TqaR/cZkZGeiCEfciV3XzsR0XrnQnrO/vifH 1YOpWNIfVxre50R+ZTmQD3BqfJ2hz4LPDxjki3z4cswqZ+q2GGh6/6BmEt/NbHI15zsh2E xYH+GTK2Dd/Np7MdSxI0EqtImR+Q+S8d2CeJm8v0GKHQxc5or6kC0RDRBOPUI7cjO94pWm KRHIBGhRKR6mByG0sCmZ5r2S+3eWWnOB7saJjf6+0IYvYbB9zeKZiIdtNHRZu3AIxTElzt YgL3iCSdbdZ7MqV3N0b5dLBjrEqJK2+0VEo3GSBrQpzMyjaNmlVSwX2z+5GQlA== 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=1786447047; 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=7h6wuib/v7Ku0MYC2ktauq14UaygisgFK32MlVwDkDc=; b=ScjQZ20xBZe+o3BfaVdtTSrvnyHwkgbME61S5tNojx9020CN4byOl3+ekkDSodHvhWAbVG VOLX35/5f6xB2sqRyNn9AbhwmrfvGtD3+/MN6EdFcaOR1HP9khMLHI9Plhvq3Nn72JMTKb AYfP6ovqXBmVv2ajlg4ZnakgRNGyc6U8s2i5YAbLnItJmBaz2e3TU+VWW/yY6Os+YeoCOY QlNlr13ZLSgJGRsUiSSrfIaDsJNFc62jKWlEKNgT1Yj3BXOHV1x2Kkp0SCuvlJNuCYwLjY Zid+nKYUXqOsl4PhZ92lneieZy+HVadoj/mhlgOgNfI4f87dmIEdXuSWFRWOSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hK8Gv0HhmzsyT for ; Tue, 11 Aug 2026 11:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 11 Aug 2026 11:17:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8f378c83c6b8 - main - nuageinit: support allow_public_ssh_keys 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/main X-Git-Reftype: branch X-Git-Commit: 8f378c83c6b8b052433834ca0b53677459dc0e85 Auto-Submitted: auto-generated Date: Tue, 11 Aug 2026 11:17:27 +0000 Message-Id: <6a7b04c7.3ef65.701c40b9@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8f378c83c6b8b052433834ca0b53677459dc0e85 commit 8f378c83c6b8b052433834ca0b53677459dc0e85 Author: Baptiste Daroussin AuthorDate: 2026-08-11 10:00:56 +0000 Commit: Baptiste Daroussin CommitDate: 2026-08-11 11:17:09 +0000 nuageinit: support allow_public_ssh_keys Skip importing datasource public keys when set to false. --- libexec/nuageinit/nuageinit | 6 ++++-- libexec/nuageinit/nuageinit.7 | 10 +++++++++ libexec/nuageinit/tests/nuageinit.sh | 41 ++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 536739c8a0bf..31daff5c71b9 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -18,7 +18,8 @@ local citype = arg[2] local function default_user(obj, metadata) local ssh_authorized_keys = {} - if type(metadata.public_keys) == "table" then + if (not obj or obj.allow_public_ssh_keys ~= false) and + type(metadata.public_keys) == "table" then for _, k in pairs(metadata.public_keys) do table.insert(ssh_authorized_keys, k) end @@ -604,7 +605,8 @@ local function disable_root(obj, metadata) opts = opts:gsub("%$DISABLE_USER", "root") end local keys = {} - if type(metadata.public_keys) == "table" then + if obj.allow_public_ssh_keys ~= false and + type(metadata.public_keys) == "table" then for _, k in pairs(metadata.public_keys) do table.insert(keys, k) end diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 7e6c9154f799..6a72d322cca4 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -323,6 +323,16 @@ being the actual content of the files in Append each entry of the array to .Nm default user which will be created. +.It Ic allow_public_ssh_keys +Boolean which determines if the public SSH keys from the datasource +metadata are imported to the default user and root. +If set to +.Ar false , +only the keys specified in +.Ic ssh_authorized_keys +are used. +Defaults to +.Ar true . .It Ic ssh_pwauth boolean which determines the value of the .Qq Ic PasswordAuthentication diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 4803ddf941ab..bfc7e9f13c88 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -385,6 +385,46 @@ EOF atf_check -o inline:"ssh-ed25519 my_key_id tdb@host\n" cat home/freebsd/.ssh/authorized_keys } +config2_pubkeys_allow_public_ssh_keys_head() +{ + atf_set "require.user" root +} +config2_pubkeys_allow_public_ssh_keys_body() +{ + here=$(pwd) + export NUAGE_FAKE_ROOTDIR=$(pwd) + if [ $(id -u) -ne 0 ]; then + atf_skip "root required" + fi + mkdir -p media/nuageinit + cat > media/nuageinit/meta_data.json << EOF +{ + "uuid": "uuid_for_this_instance", + "public_keys": { + "tdb": "ssh-ed25519 my_key_id tdb@host" + } +} +EOF + cat > media/nuageinit/user_data << EOF +#cloud-config +allow_public_ssh_keys: false +EOF + mkdir -p etc + mkdir -p root + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/csh +sys:*:1:0::0:0:Sys:/home/sys:/bin/csh +EOF + pwd_mkdb -d etc ${here}/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + atf_check /usr/libexec/nuageinit ${here}/media/nuageinit config-2 + # no public key should be imported + atf_check -s exit:1 test -e home/freebsd/.ssh/authorized_keys +} + config2_network_body() { mkdir -p media/nuageinit @@ -1509,6 +1549,7 @@ atf_init_test_cases() atf_add_test_case config2_pubkeys atf_add_test_case config2_pubkeys_user_data atf_add_test_case config2_pubkeys_meta_data + atf_add_test_case config2_pubkeys_allow_public_ssh_keys atf_add_test_case config2_network atf_add_test_case config2_network_static_v4 atf_add_test_case config2_network_dns