From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: jan.kiszka@siemens.com, daniel.bovensiepen@siemens.com,
henning.schild@siemens.com, venkata.pyla@toshiba-tsip.com,
Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH v2 05/10] generate deterministic clear-text password hash
Date: Thu, 12 Jan 2023 05:56:14 +0000 [thread overview]
Message-ID: <20230112055619.843445-6-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20230112055619.843445-1-felix.moessbauer@siemens.com>
This patch changes how we derive the hashed password of a user that is
created using the clear-text-password flag. Previously, the clear-text
password was directly input into chpasswd. However, chpasswd internally
creates a 16-character random salt. This breaks the reproducability.
Instead of letting chpasswd create the hashed password string, we now
create it manually by deriving the salt from the SOURCE_DATE_EPOCH
variable. This is technically done using the host openssl tool. As
openssl is a transitive dependency of sbuild, we do not need to add
it explicitly to the host-tools.
In case SOURCE_DATE_EPOCH is not set, chpasswd is used
directly to create the salt.
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
meta/classes/image-account-extension.bbclass | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass
index 70950a7..bb173b1 100644
--- a/meta/classes/image-account-extension.bbclass
+++ b/meta/classes/image-account-extension.bbclass
@@ -253,7 +253,15 @@ image_postprocess_accounts() {
if [ -n "$password" -o "${flags}" != "${flags%*,allow-empty-password,*}" ]; then
chpasswd_args="-e"
if [ "${flags}" != "${flags%*,clear-text-password,*}" ]; then
- chpasswd_args=""
+ # chpasswd adds a random salt when running against a clear-text password.
+ # For reproducible images, we manually generate the password and use the
+ # SOURCE_DATE_EPOCH to generate the salt in a deterministic way.
+ if [ -z "${SOURCE_DATE_EPOCH}"]; then
+ chpasswd_args=""
+ else
+ salt="$(echo "${SOURCE_DATE_EPOCH}" | sha256sum -z | cut -c 1-15)"
+ password="$(openssl passwd -6 -salt $salt "$password")"
+ fi
fi
printf '%s:%s' "$name" "$password" | sudo chroot '${ROOTFSDIR}' \
/usr/sbin/chpasswd $chpasswd_args
--
2.34.1
next prev parent reply other threads:[~2023-01-12 5:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 5:56 [PATCH v2 00/10] Make rootfs build reproducible Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 01/10] fix rebuild of rootfs_finalize task Felix Moessbauer
2023-01-14 20:47 ` Uladzimir Bely
2023-01-14 22:16 ` Roberto A. Foglietta
2023-01-14 23:35 ` Roberto A. Foglietta
2023-01-15 13:31 ` Moessbauer, Felix
2023-01-23 9:00 ` Henning Schild
2023-01-12 5:56 ` [PATCH v2 02/10] image.bbclass: fix non-reproducible file time-stamps inside rootfs Felix Moessbauer
2023-01-14 20:26 ` Uladzimir Bely
2023-01-14 20:31 ` Roberto A. Foglietta
2023-01-14 20:39 ` Uladzimir Bely
2023-01-15 13:42 ` Moessbauer, Felix
2023-01-15 21:57 ` Roberto A. Foglietta
2023-01-12 5:56 ` [PATCH v2 03/10] rootfs postprocess: clean python cache Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 04/10] remove non-portable ldconfig aux-cache Felix Moessbauer
2023-01-12 5:56 ` Felix Moessbauer [this message]
2023-01-12 5:56 ` [PATCH v2 06/10] update debian initramfs in deterministic mode Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 07/10] create custom " Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 08/10] make deb_add_changelog idempotent Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 09/10] deb_add_changelog: set timestamp to valid epoch Felix Moessbauer
2023-01-12 5:56 ` [PATCH v2 10/10] make custom linux-image bit-by-bit reproducible Felix Moessbauer
2023-01-12 9:35 ` [PATCH v2 00/10] Make rootfs build reproducible Henning Schild
[not found] ` <CAJGKYO6i0hUBs4XeBtzLKnVVS6sRdVuEG9v87+wHPvXpiHzMWA@mail.gmail.com>
2023-01-13 2:29 ` Moessbauer, Felix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230112055619.843445-6-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=daniel.bovensiepen@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
--cc=venkata.pyla@toshiba-tsip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox