From nobody Tue Sep 03 07:08:18 2024 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 4WycCl2V9Jz5W580; Tue, 03 Sep 2024 07:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WycCk5wHYz4TGy; Tue, 3 Sep 2024 07:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725347298; 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=7LcpfZ5+kHXn9QKNjMcXzhAocSRSdMyJxhxRuM7mV50=; b=DWqektQuPtZOJ87YvkLgFUY2p7T64D8+mWHSYgVa7QmI/YFxftDvwDEe+2rGnwjcxOWyVR zg427/UlygjDXHrlNhl64zFIJ73644/cCn9ZkqtasUxHT4CuQkTZuwYPJ+4JMGf24N1Txj 3YNVMAgtt7dj6rWdg0RprhotWQLdDynKcqovd2OxMwHB7vnMUQg1ha2NjxwjzuaTPsi031 loUyDiijgqkQw/G3CqPdFpI1iCvQU+qWPkxvApsjpstPATNfQgEjnVuHp5XhrtI324W8A9 i6RBcMfzlN7vi4rt3H2zg5yCTYay228JAwAyBdOh4KQWEsRHE8aSetyJqE+ztg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725347298; a=rsa-sha256; cv=none; b=ITRIUR4yGGnU3HITt1YyTwO39fv3dfsW1O351Q7aZIWg7fpvYKTef3NrPiRmmNvXYZnnP1 pQyILIVNAjaB0oPnNMfUGMgqYE0q+d8AnFlwGstEDZF+ogMJpZALE6BYepfonXzCihg4p7 CGigmxkTeTiFauAjdkHyPZXXTMBK+/d48jPsDSzaAgj8CpnPozCU/LWMSOl47I0sTtpO4S dquThjKmU2oZhu/Iuw5W6pUAifjkB2IX9sqV4pAjfYIdw0zHpW6GkYzxs5bc7P1JrQKgGH /VnOgAuGWf6lcjnV/u4kS6EI3B8J/wb9KOQUfUv4Jpbtt3n9WKhRi00LKVJePw== 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=1725347298; 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=7LcpfZ5+kHXn9QKNjMcXzhAocSRSdMyJxhxRuM7mV50=; b=H5d/2DG7n9GFRyXRr8KVJS/iV14jtwqz+0pgtlkbD/29YsVZG7em9Hd44COSDm0M9f6xpH ZlyxxOXXL0l62Y5OU++IJpYVOPTViLtYPZKX4EcNY5FoZJT5AFzY4j0rEMpBc/sX0Fga7d 1esfPJfsflLma+XD5ku6x69ZkcfEfkr7syJlcpiuiQzn5SINfv29lf+5uJZA5bQup9tldd mJ/GPoovZeddACH34vn30aBmOvRaE8HObNjVm5ki4RN44XF6zLVpTMahty1b/17mAWfPuN lhEk1yexHze0CB1iN6xYVpKrivD6w0vS5CTcpaeSkacrUAf6j3A8uG42IED4qQ== 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 4WycCk59R1zWND; Tue, 3 Sep 2024 07:08: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 48378Ieu069072; Tue, 3 Sep 2024 07:08:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48378I4d069069; Tue, 3 Sep 2024 07:08:18 GMT (envelope-from git) Date: Tue, 3 Sep 2024 07:08:18 GMT Message-Id: <202409030708.48378I4d069069@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: 617179178727 - stable/14 - nuageinit: Set recommended SSH permissions 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: 617179178727b61123b17e5de6e369ff5dbb8117 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=617179178727b61123b17e5de6e369ff5dbb8117 commit 617179178727b61123b17e5de6e369ff5dbb8117 Author: Jose Luis Duran AuthorDate: 2024-07-23 08:59:09 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-03 07:05:24 +0000 nuageinit: Set recommended SSH permissions As stated in sshd(8), the recommended permissions for ~/.ssh are read/write/execute for the user, and not accessible by others; and the recommended permissions for ~/.ssh/authorized_keys are read/write for the user, and not accessible by others. (cherry picked from commit 07d17ca189fcf3cc44b7706040b05ca8135c3b85) --- libexec/nuageinit/nuage.lua | 2 ++ libexec/nuageinit/tests/nuage.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 81fb40c0d8eb..10451dc0bdc4 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -205,9 +205,11 @@ local function addsshkey(homedir, key) f:write(key .. "\n") f:close() if chownak then + os.execute("chmod 0600 " .. ak_path) pu.chown(ak_path, dirattrs.uid, dirattrs.gid) end if chowndotssh then + os.execute("chmod 0700 " .. dotssh_path) pu.chown(dotssh_path, dirattrs.uid, dirattrs.gid) end end diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index bbf306eae51f..531c171a3271 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -17,6 +17,8 @@ addsshkey_body() { if [ ! -f .ssh/authorized_keys ]; then atf_fail "ssh key not added" fi + atf_check -o inline:".ssh: 040700 [drwx------ ] -> 040700 [drwx------ ]\n" chmod -vv 0700 .ssh + atf_check -o inline:".ssh/authorized_keys: 0100600 [-rw------- ] -> 0100600 [-rw------- ]\n" chmod -vv 0600 .ssh/authorized_keys atf_check -o inline:"mykey\n" cat .ssh/authorized_keys atf_check /usr/libexec/flua $(atf_get_srcdir)/addsshkey.lua atf_check -o inline:"mykey\nmykey\n" cat .ssh/authorized_keys