ssh: option and argument completion updates (#332)

* Drop rsa1 keys if they are not supported by used OpenSSH * ssh-add: Complete missing arguments * Update ssh, scp and sftp completions and add missing options Signed-off-by: Jakub Jelen <jjelen@redhat.com>
scop · Aug 3, 2019 · 29a14f0 · 29a14f0
1 parent c0a3c55
commit 29a14f0
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/completions/ssh b/completions/ssh
@@ -3,7 +3,7 @@
 _ssh_queries()
 {
     COMPREPLY+=( $(compgen -W \
-        "cipher cipher-auth mac kex key key-cert key-plain protocol-version" \
+        "cipher cipher-auth mac kex key key-cert key-plain protocol-version sig" \
         -- "$cur") )
 }
 
@@ -34,7 +34,7 @@ _ssh_options()
     local opts=(
         AddKeysToAgent AddressFamily BatchMode BindAddress CanonicalDomains
         CanonicalizeFallbackLocal CanonicalizeHostname CanonicalizeMaxDots
-        CanonicalizePermittedCNAMEs CertificateFile
+        CanonicalizePermittedCNAMEs CASignatureAlgorithms CertificateFile
         ChallengeResponseAuthentication CheckHostIP Ciphers ClearAllForwardings
         Compression ConnectionAttempts ConnectTimeout ControlMaster ControlPath
         ControlPersist DynamicForward EnableSSHKeysign EscapeChar
@@ -90,10 +90,10 @@ _ssh_suboption()
         gssapidelegatecredentials|gssapirenewalforcesrekey|gssapitrustdns|\
         hashknownhosts|hostbasedauthentication|identitiesonly|\
         kbdinteractiveauthentication|kbdinteractivedevices|\
-        nohostauthenticationforlocalhost|passwordauthentication|\
+        nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|\
         proxyusefdpass|pubkeyauthentication|rhostsrsaauthentication|\
-        rsaauthentication|stricthostkeychecking|streamlocalbindunlink|\
-        tcpkeepalive|useprivilegedport|verifyhostkeydns|visualhostkey)
+        rsaauthentication|streamlocalbindunlink|\
+        tcpkeepalive|useprivilegedport|visualhostkey)
             COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
             ;;
         addkeystoagent)
@@ -108,15 +108,21 @@ _ssh_suboption()
         canonicalizehostname)
             COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
             ;;
-        *file|identityagent|include)
+        *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
             _filedir
             ;;
+        casignaturealgorithms)
+            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" sig)' -- "$cur") )
+            ;;
         cipher)
             COMPREPLY=( $(compgen -W 'blowfish des 3des' -- "$cur") )
             ;;
         ciphers)
             _ssh_ciphers "$2"
             ;;
+        controlmaster)
+            COMPREPLY=( $(compgen -W 'yes ask auto autoask no' -- "$cur") )
+            ;;
         compressionlevel)
             COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
             ;;
@@ -133,9 +139,15 @@ _ssh_suboption()
         kexalgorithms)
             COMPREPLY=( $(compgen -W '$(_ssh_query "$2" kex)' -- "$cur") )
             ;;
+        loglevel)
+            COMPREPLY=( $(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur") )
+            ;;
         macs)
             _ssh_macs "$2"
             ;;
+        pkcs11provider)
+            _filedir so
+            ;;
         preferredauthentications)
             COMPREPLY=( $(compgen -W 'gssapi-with-mic host-based publickey
                 keyboard-interactive password' -- "$cur") )
@@ -150,20 +162,26 @@ _ssh_suboption()
         proxyjump)
             _known_hosts_real -a -F "$configfile" -- "$cur"
             ;;
+        proxycommand|remotecommand|localcommand)
+            COMPREPLY=( $(compgen -c -- "$cur") )
+            ;;
         pubkeyacceptedkeytypes)
             COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
             ;;
         requesttty)
             COMPREPLY=( $(compgen -W 'no yes force auto' -- "$cur") )
             ;;
+        stricthostkeychecking)
+            COMPREPLY=( $(compgen -W 'accept-new ask no off' -- "$cur") )
+            ;;
         syslogfacility)
             COMPREPLY=( $(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur") )
             ;;
         tunnel)
             COMPREPLY=( $(compgen -W 'yes no point-to-point ethernet' \
                                   -- "$cur") )
             ;;
-        updatehostkeys)
+        updatehostkeys|verifyhostkeydns)
             COMPREPLY=( $(compgen -W 'yes no ask' -- "$cur") )
             ;;
     esac
@@ -255,7 +273,7 @@ _ssh()
             return
             ;;
         -*O)
-            COMPREPLY=( $(compgen -W 'check forward exit stop' -- "$cur") )
+            COMPREPLY=( $(compgen -W 'check forward cancel exit stop' -- "$cur") )
             return
             ;;
         -*o)
@@ -325,6 +343,10 @@ _sftp()
             _ssh_ciphers
             return
             ;;
+        -*J)
+            _known_hosts_real -a -F "$configfile" -- "$cur"
+            return
+            ;;
         -*o)
             _ssh_options
             return
@@ -447,6 +469,10 @@ _scp()
             compopt +o nospace
             return
             ;;
+        -*J)
+            _known_hosts_real -a -F "$configfile" -- "$cur"
+            return
+            ;;
         -*[lP])
             return
             ;;

diff --git a/completions/ssh-add b/completions/ssh-add
@@ -6,7 +6,15 @@ _ssh_add()
     _init_completion || return
 
     case $prev in
-        -*[tE])
+        -*E)
+            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            return
+            ;;
+        -*t)
+            return
+            ;;
+        -*T)
+            _filedir
             return
             ;;
         -*[se])

diff --git a/completions/ssh-keygen b/completions/ssh-keygen
@@ -42,7 +42,12 @@ _ssh_keygen()
             return
             ;;
         -*t)
-            COMPREPLY=( $(compgen -W 'dsa ecdsa ed25519 rsa rsa1' -- "$cur") )
+            local protocols=$(_xfunc ssh _ssh_query "$1" protocol-version)
+            local types='dsa ecdsa ed25519 rsa'
+            if [[ $protocols == *1* ]]; then
+                types+=' rsa1'
+            fi
+            COMPREPLY=( $(compgen -W "$types" -- "$cur") )
             return
             ;;
     esac