From nobody Fri Jun 5 11:18:10 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 4gWzSg1TbCz6gtZL for ; Fri, 05 Jun 2026 11:18:11 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gWzSf5xB9z3vq7 for ; Fri, 05 Jun 2026 11:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780658290; 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=mb7vJT3CgFdvMbWR7KXdPA4jsZRgRcVg/uYJKJLK0wU=; b=IjTbw1Q+hPZHePn8fgY8r3wRiUfbQzYViRBE/Rtd4wQVOFvYBUoBJoRBqcy85be7xfcv9P kVWElKWv88LOUZ/WWCbeLaEEOU1H28nCUheIRLmZqOh28LUNTM4l3m+lF4T24Vmu87FS2X PH5k0fLafwElfofrl24fYnpWQ1+TWB3AhmERU25mPzKxD+8wz1l3D28wVCkAK0bpRQKZLi vvek6Xxg6A7EnGIdozNfhSF+Tom4pOKjcIpJGUkJ17+EtS6Je2Pjdw1U+A4HhZ4K2wcRqo vPT+EHJLaMeEPNbBv/e5hoTNjH7du+LUOrWdJ/LMemoExdDhXtVBPiP3iKTerQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780658290; a=rsa-sha256; cv=none; b=manbQgCTK70Fe+pWjZHPj4YrTn7Ait5bIwYiTe+WjC7gaVZpyJ4tsE1ZzF9xX0pW2xN5tV u0DypRHZO0/ZSZylVw1HSrvUyT42IJF18OE/lG95SOwsVHo6+BNT3U74TRl9QhcMarTqCS FxlYEjyzCYQymzG0KxSik7DfZiyuUcIKy1jFsLNcuxGMV9TYupvUw0UoZWbPWdHxpvR+/u 0yZ4ynybS3t78CK1LegkHG+YbmThggx5g9m7zrdmX/6cR+w213gnfIqBRhKSTesC9yJQIX QobNqXE4uNARo/NPzfDHk+eTgnD8uHT32MvdeAier3q1VYAsLr/ZfIHNQZshbQ== 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=1780658290; 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=mb7vJT3CgFdvMbWR7KXdPA4jsZRgRcVg/uYJKJLK0wU=; b=ewHuX7N+d3wImf7NDyINkG+flft4xzbxzRez3/nkp1ODDKCSYVa4OSny9m0+B7t78PqWc8 +uxNeVLqvSVffFHZAeKwHPhinGSMphWaViiIaPVjKZ9cbgBmrd5q8uAKy9Hc98yfqpN0N0 zeLb8R8/1ayzLsqxDVJtuvGXdg1z+yHCd5CTt/4DoWEdq3ltbjVJx0Vdw6IGYUsQsyZRn2 5zFaU+oYuf56aDJm9gVbBkZhSICN2bbVufd9Dippd7HWnPElSTQg2sG/6eRhTrBhsNYVHz ukS+1SBA7hzXP8eX1sOaXSka4IlrPp4MQ81cDQgJIbWBsK9MMXfeOKOQ5HlW0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWzSf5WGkzBVn for ; Fri, 05 Jun 2026 11:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 11:18:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: d7984912385c - main - nuageinit: implement ssh_authkey_fingerprints support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d7984912385cc5a191547dc6c2d73acba25e2239 Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 11:18:10 +0000 Message-Id: <6a22b072.1c5c2.104db6c0@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d7984912385cc5a191547dc6c2d73acba25e2239 commit d7984912385cc5a191547dc6c2d73acba25e2239 Author: Baptiste Daroussin AuthorDate: 2026-06-05 10:38:06 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-05 11:17:55 +0000 nuageinit: implement ssh_authkey_fingerprints support Add support for the 'ssh_authkey_fingerprints' cloud-config key which logs SSH host key fingerprints to the console via ssh-keygen. --- libexec/nuageinit/nuageinit | 24 ++++++++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 5 +++++ libexec/nuageinit/tests/nuageinit.sh | 21 +++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 033aa7861f6b..8e2658f2cd13 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -509,6 +509,29 @@ local function ssh_pwauth(obj) nuage.update_sshd_config("PasswordAuthentication", value) end +local function ssh_authkey_fingerprints(obj) + if obj.ssh_authkey_fingerprints ~= true then return end + local ssh_dir = root .. "/etc/ssh" + local attrs = lfs.attributes(ssh_dir) + if not attrs or attrs.mode ~= "directory" then + return + end + for entry in lfs.dir(ssh_dir) do + if entry:match("^ssh_host_.*_key$") then + local keypath = ssh_dir .. "/" .. entry + local f = io.popen("ssh-keygen -l -f " .. + nuage.shell_escape(keypath), "r") + if f then + local fingerprint = f:read("*a") + f:close() + if fingerprint and fingerprint ~= "" then + io.stderr:write(fingerprint) + end + end + end + end +end + local function ssh_deletekeys(obj) if obj.ssh_deletekeys == nil then return end if obj.ssh_deletekeys then @@ -897,6 +920,7 @@ elseif line == "#cloud-config" then create_default_user, ssh_deletekeys, ssh_keys, + ssh_authkey_fingerprints, network_config, resolv_conf, keyboard, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 9a20df0787ba..200eb2524fe6 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -232,6 +232,11 @@ The keyboard variant (e.g., .Qq acc , .Qq nodeadkeys ) . .El +.It Ic ssh_authkey_fingerprints +Boolean which determines whether fingerprints of SSH host keys +should be logged to the console. +Defaults to +.Ar false . .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 22b002ae2440..44c681e18046 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -37,6 +37,7 @@ atf_test_case config2_userdata_manage_etc_hosts atf_test_case config2_userdata_mounts atf_test_case config2_userdata_resolv_conf atf_test_case config2_userdata_keyboard +atf_test_case config2_userdata_ssh_authkey_fingerprints atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1198,6 +1199,25 @@ EOF true } +config2_userdata_ssh_authkey_fingerprints_head() +{ + atf_set "require.user" root +} +config2_userdata_ssh_authkey_fingerprints_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + mkdir -p etc/ssh + ssh-keygen -t ed25519 -f etc/ssh/ssh_host_ed25519_key -N "" -q 2>/dev/null + cat > media/nuageinit/user_data <