[ptxdist] [PATCH] openssh: improve rc.once script to support locations other than /etc/ssh

[ptxdist] [PATCH] openssh: improve rc.once script to support locations other than /etc/ssh

[Uwe Kleine-König]

This is done by parsing the sshd_config using awk for the location of
the key files being used.

Note that the dependency on awk is a weak one because if awk isn't
available the script simply falls back to the default location.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 generic/etc/rc.once.d/openssh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/generic/etc/rc.once.d/openssh b/generic/etc/rc.once.d/openssh
index 83e6e37..fea8472 100644
--- a/generic/etc/rc.once.d/openssh
+++ b/generic/etc/rc.once.d/openssh
@@ -2,13 +2,15 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-OPENSSH_RSAKEY_DEFAULT="/etc/ssh/ssh_host_rsa_key"
-OPENSSH_DSAKEY_DEFAULT="/etc/ssh/ssh_host_dsa_key"
+get_default_key() {
+	key_type=$1
+	sshd_config="/etc/ssh/sshd_config"
+
+	awk -v type="$key_type" '/^HostKey/ && match($2, "/ssh_host_" type "_key$") { print $2; found=1 } END { exit !found }' "$sshd_config" || echo "/etc/ssh/ssh_host_${key_type}_key"
+}
 
-test -n "$OPENSSH_RSAKEY" || \
-	OPENSSH_RSAKEY=$OPENSSH_RSAKEY_DEFAULT
-test -n "$OPENSSH_DSAKEY" || \
-	OPENSSH_DSAKEY=$OPENSSH_DSAKEY_DEFAULT
+OPENSSH_RSAKEY="$(get_default_key rsa)"
+OPENSSH_DSAKEY="$(get_default_key dsa)"
 
 gen_key() {
 
-- 
1.8.4.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] openssh: improve rc.once script to support locations other than /etc/ssh

[Michael Olbrich]

On Wed, Dec 18, 2013 at 04:13:25PM +0100, Uwe Kleine-König wrote:
> This is done by parsing the sshd_config using awk for the location of
> the key files being used.
> 
> Note that the dependency on awk is a weak one because if awk isn't
> available the script simply falls back to the default location.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  generic/etc/rc.once.d/openssh | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/generic/etc/rc.once.d/openssh b/generic/etc/rc.once.d/openssh
> index 83e6e37..fea8472 100644
> --- a/generic/etc/rc.once.d/openssh
> +++ b/generic/etc/rc.once.d/openssh
> @@ -2,13 +2,15 @@
>  
>  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
>  
> -OPENSSH_RSAKEY_DEFAULT="/etc/ssh/ssh_host_rsa_key"
> -OPENSSH_DSAKEY_DEFAULT="/etc/ssh/ssh_host_dsa_key"
> +get_default_key() {
> +	key_type=$1
> +	sshd_config="/etc/ssh/sshd_config"
> +
> +	awk -v type="$key_type" '/^HostKey/ && match($2, "/ssh_host_" type "_key$") { print $2; found=1 } END { exit !found }' "$sshd_config" || echo "/etc/ssh/ssh_host_${key_type}_key"

Can you make this a bit more readable. Like using multiple lines and
if [ $? != 0 ]; then
...

And I think it should be '/^HostKey\>/'.

Michael

> +}
>  
> -test -n "$OPENSSH_RSAKEY" || \
> -	OPENSSH_RSAKEY=$OPENSSH_RSAKEY_DEFAULT
> -test -n "$OPENSSH_DSAKEY" || \
> -	OPENSSH_DSAKEY=$OPENSSH_DSAKEY_DEFAULT
> +OPENSSH_RSAKEY="$(get_default_key rsa)"
> +OPENSSH_DSAKEY="$(get_default_key dsa)"
>  
>  gen_key() {
>  
> -- 
> 1.8.4.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de