From ec0868baf633f1756e781acb41333acefb42fead Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Feb 2025 01:42:01 -0500 Subject: [PATCH 1/2] feat: delegate authorized_keys file validation to sshcommand Rather than try and validate this out of band, depend on sshcommand for performing any such checks on the file. There isn't any need for dokku to duplicate this when listing the contents of the file. --- plugins/ssh-keys/subcommands/list | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/ssh-keys/subcommands/list b/plugins/ssh-keys/subcommands/list index 2a7ad3085..2dec55961 100755 --- a/plugins/ssh-keys/subcommands/list +++ b/plugins/ssh-keys/subcommands/list @@ -23,7 +23,6 @@ cmd-ssh-keys-list() { FORMAT="" fi - verify_ssh_key_file if [[ "$FORMAT" == "json" ]]; then if [[ -n "$NAME" ]]; then sshcommand list dokku "" "$FORMAT" | jq -cM "[.[] | select(.name == \"$NAME\")]" From 8bab6408e0d18755ff9579f9ad3dd1ee3127e210 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 26 Feb 2025 01:30:26 -0500 Subject: [PATCH 2/2] chore: update sshcommand to ensure we keep validation --- contrib/dependencies.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/dependencies.json b/contrib/dependencies.json index cf7baafc0..f4a26016f 100644 --- a/contrib/dependencies.json +++ b/contrib/dependencies.json @@ -42,10 +42,10 @@ }, { "name": "sshcommand", - "version": "0.18.0", + "version": "0.19.0", "urls": { - "amd64": "https://github.com/dokku/sshcommand/releases/download/v0.18.0/sshcommand", - "arm64": "https://github.com/dokku/sshcommand/releases/download/v0.18.0/sshcommand" + "amd64": "https://github.com/dokku/sshcommand/releases/download/v0.19.0/sshcommand", + "arm64": "https://github.com/dokku/sshcommand/releases/download/v0.19.0/sshcommand" } } ], @@ -93,4 +93,4 @@ } } ] -} +} \ No newline at end of file