From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6943578040844681216 X-Received: by 2002:a05:6000:181:: with SMTP id p1mr33000194wrx.73.1617099352504; Tue, 30 Mar 2021 03:15:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d1c8:: with SMTP id b8ls1156793wrd.3.gmail; Tue, 30 Mar 2021 03:15:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkHLJ6zLss2MgSTi3nfPpq8ctAC87SK4qpKA3n8ulLcaNu5ouc27L4ML+D7hoeM47H6cRr X-Received: by 2002:adf:f2c3:: with SMTP id d3mr33366172wrp.380.1617099351768; Tue, 30 Mar 2021 03:15:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617099351; cv=none; d=google.com; s=arc-20160816; b=tbI0jQX7jhk/k2hbh6fke3C8dydBJsc7aHTKwXfxxGX1tqiKGLoeby7l/pbEovIVWa 2EoF3VLp/uQsU1pKfTUquPba+Q3UFFuDKTNnV3VJC2cD5wPvGWp93JW47BmSEimhj0tp +zJXLz1Kfk0QqorghCG4EBc1HsixyqmYsjmMx83F1Xym2HFAO8FdrFYwugILybcoTiCA jTtSyGqjtJ3tqnag43hTb0P3/qdupm9kWRjm0bViF4cgm/ZzUsGa0Qx3JK29gTQyfKqH rOS83UhgrgRFXODNJO5gKox6ekZOSq6I8j+5O1wTsQczLd8MK2aIi/JxV7Do4vFuzC1k o5cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=S56HdmRJERwqm0BQKIftBe6m8TDCPjKF4fN08v4pWlE=; b=MjKuIq7Dv1fm+cVaq+yV2dplag8Fx3eyHlchOltSfQLrf4gWx797WRh8ZBzhjQGzMu iDd2MKkF3pARJcQuc5tyD+fla2WgqqYIeYwC/ciZ3g42a3V+5GTJnoM3J5h2cR24KAaN diyOa50A7tlB7PotaNr7ODP0cOZXiYt037ICjKqPUeYZJvuJ4cAfKZDGNRIhQzvxpCUe 7ws1xUrlZyBFRAjBKgzIQ3o6ucGIJ9FYzh4OC0sSE+9GBbz2cJvRvJiPahkIUtIhhKXY OXq495AkIm+4jAK+jlUk/eDCmVuLd0GeKZ+KvfO/ryyDZNLvBlPn8vSJ57Zx5GtrS0Xh 1FHw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id y12si882433wrs.0.2021.03.30.03.15.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Mar 2021 03:15:51 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 12UAFpUb005698 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 30 Mar 2021 12:15:51 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.2.166]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 12UAFpS8017575; Tue, 30 Mar 2021 12:15:51 +0200 Date: Tue, 30 Mar 2021 12:15:50 +0200 From: Henning Schild To: isar-users Cc: Jan Kiszka Subject: Re: [PATCH] sshd-regen-keys: Improve service, make more robust Message-ID: <20210330121550.11b74ae0@md1za8fc.ad001.siemens.net> In-Reply-To: <20210326081108.26648-1-henning.schild@siemens.com> References: <29bfb292-fa50-e82f-d0aa-172a14f93515@siemens.com> <20210326081108.26648-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: Ni8CQbp5fXYS Am Fri, 26 Mar 2021 09:11:08 +0100 schrieb Henning Schild : > Switch to using "/usr/bin/ssh-keygen -A" instead of dpkg-reconfigure. > With this we would generate new host keys every time the service > starts and no keys exist. Removing the keys from openssh-server in a > postinst makes it complete so that we really only generate on the > first boot. > > This is easier to handle that reusing the debian package hooks for key > generation. > > Signed-off-by: Henning Schild > --- > .../sshd-regen-keys/files/postinst | 2 ++ > .../files/sshd-regen-keys.service | 4 +--- > .../sshd-regen-keys/files/sshd-regen-keys.sh | 20 > ------------------- .../sshd-regen-keys/sshd-regen-keys_0.3.bb | > 17 ---------------- .../sshd-regen-keys/sshd-regen-keys_0.4.bb | > 14 +++++++++++++ 5 files changed, 17 insertions(+), 40 deletions(-) > delete mode 100644 > meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh delete > mode 100644 > meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb create > mode 100644 > meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb > > diff --git a/meta/recipes-support/sshd-regen-keys/files/postinst > b/meta/recipes-support/sshd-regen-keys/files/postinst index > ae722a7349a2..1c9b03e3e040 100644 --- > a/meta/recipes-support/sshd-regen-keys/files/postinst +++ > b/meta/recipes-support/sshd-regen-keys/files/postinst @@ -1,4 +1,6 @@ > #!/bin/sh > set -e > > +rm /etc/ssh/ssh_host_*_key* > + > systemctl enable sshd-regen-keys.service > diff --git > a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > index f50d34c820d8..af98d5e9e966 100644 --- > a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > +++ > b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > @@ -9,9 +9,7 @@ ConditionPathIsReadWrite=/etc [Service] Type=oneshot > RemainAfterExit=yes -Environment=DEBIAN_FRONTEND=noninteractive > -ExecStart=/usr/sbin/sshd-regen-keys.sh > -ExecStartPost=-/bin/systemctl disable sshd-regen-keys.service > +ExecStart=/usr/bin/ssh-keygen -A > StandardOutput=syslog > StandardError=syslog > > diff --git > a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh > b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh > deleted file mode 100644 index 910d879ba51f..000000000000 --- > a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh +++ > /dev/null @@ -1,20 +0,0 @@ > -#!/usr/bin/env sh > - > -echo -n "SSH server is " > -if systemctl is-enabled ssh; then > - SSHD_ENABLED="true" > - systemctl disable --no-reload ssh > -fi > - > -echo "Removing keys ..." > -rm -v /etc/ssh/ssh_host_*_key* > - > -echo "Regenerating keys ..." > -dpkg-reconfigure openssh-server > - > -if test -n $SSHD_ENABLED; then > - echo "Reenabling ssh server ..." > - systemctl enable --no-reload ssh > -fi > - > -sync > diff --git > a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb > b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb deleted > file mode 100644 index 6f12414239a3..000000000000 --- > a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb +++ > /dev/null @@ -1,17 +0,0 @@ > -# This software is a part of ISAR. > -inherit dpkg-raw > - > -DESCRIPTION = "Systemd service to regenerate sshd keys" > -MAINTAINER = "isar-users " > -DEBIAN_DEPENDS = "openssh-server, systemd" > - > -SRC_URI = "file://postinst \ > - file://sshd-regen-keys.service \ > - file://sshd-regen-keys.sh" > - > -do_install[cleandirs] = "${D}/lib/systemd/system \ > - ${D}/usr/sbin" > -do_install() { > - install -v -m 644 "${WORKDIR}/sshd-regen-keys.service" > "${D}/lib/systemd/system/sshd-regen-keys.service" > - install -v -m 755 "${WORKDIR}/sshd-regen-keys.sh" > "${D}/usr/sbin/sshd-regen-keys.sh" -} > diff --git > a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb > b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb new > file mode 100644 index 000000000000..8b1cd8d4aba0 --- /dev/null > +++ b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb > @@ -0,0 +1,14 @@ > +# This software is a part of ISAR. > +inherit dpkg-raw > + > +DESCRIPTION = "Systemd service to regenerate sshd keys" > +MAINTAINER = "isar-users " > +DEBIAN_DEPENDS = "openssh-server, systemd" > + > +SRC_URI = "file://postinst \ > + file://sshd-regen-keys.service" > + > +do_install() { > + install -m 0755 "${D}/lib/systemd/system" missing "-d" will send v2 > + install -m 0644 "${WORKDIR}/sshd-regen-keys.service" > "${D}/lib/systemd/system/sshd-regen-keys.service" +}