From a747a3975b932df3bef26f26248367a997e5119a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 23 Jun 2020 16:31:55 +0200
Subject: ssh: T2635: migrate from a script base completion helper to a list

SSH mac, ciper and key exchange algorithms are not ynamically and only change
on distro upgrades. Thus it is easier to have them in a list and use a regex
based constraint. In the past users could have entered anything here!
---
 interface-definitions/ssh.xml.in | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in
index 4e8cf28eb..f16262d2d 100644
--- a/interface-definitions/ssh.xml.in
+++ b/interface-definitions/ssh.xml.in
@@ -76,8 +76,12 @@
             <properties>
               <help>Allowed ciphers</help>
               <completionHelp>
-                <script>ssh -Q cipher | tr '\n' ' '</script>
+                <!-- generated by ssh -Q cipher | tr '\n' ' ' as this won't change dynamically  -->
+                <list>3des-cbc aes128-cbc aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se aes128-ctr aes192-ctr aes256-ctr aes128-gcm@openssh.com aes256-gcm@openssh.com chacha20-poly1305@openssh.com</list>
               </completionHelp>
+                <constraint>
+                  <regex>^(3des-cbc|aes128-cbc|aes192-cbc|aes256-cbc|rijndael-cbc@lysator.liu.se|aes128-ctr|aes192-ctr|aes256-ctr|aes128-gcm@openssh.com|aes256-gcm@openssh.com|chacha20-poly1305@openssh.com)$</regex>
+                </constraint>
               <multi/>
             </properties>
           </leafNode>
@@ -97,9 +101,13 @@
             <properties>
               <help>Allowed key exchange (KEX) algorithms</help>
               <completionHelp>
-                <script>ssh -Q kex | tr '\n' ' '</script>
+                <!-- generated by ssh -Q kex | tr '\n' ' ' as this won't change dynamically  -->
+                <list>diffie-hellman-group1-sha1 diffie-hellman-group14-sha1 diffie-hellman-group14-sha256 diffie-hellman-group16-sha512 diffie-hellman-group18-sha512 diffie-hellman-group-exchange-sha1 diffie-hellman-group-exchange-sha256 ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521 curve25519-sha256 curve25519-sha256@libssh.org</list>
               </completionHelp>
               <multi/>
+              <constraint>
+                <regex>^(diffie-hellman-group1-sha1|diffie-hellman-group14-sha1|diffie-hellman-group14-sha256|diffie-hellman-group16-sha512|diffie-hellman-group18-sha512|diffie-hellman-group-exchange-sha1|diffie-hellman-group-exchange-sha256|ecdh-sha2-nistp256|ecdh-sha2-nistp384|ecdh-sha2-nistp521|curve25519-sha256|curve25519-sha256@libssh.org)$</regex>
+              </constraint>
             </properties>
           </leafNode>
           <leafNode name="listen-address">
@@ -144,13 +152,18 @@
                 <description>enable logging of failed login attempts</description>
               </valueHelp>
             </properties>
+            <defaultValue>INFO</defaultValue>
           </leafNode>
           <leafNode name="mac">
             <properties>
               <help>Allowed message authentication code (MAC) algorithms</help>
               <completionHelp>
-                <script>ssh -Q mac | tr '\n' ' '</script>
+                <!-- generated by ssh -Q mac | tr '\n' ' ' as this won't change dynamically  -->
+                <list>hmac-sha1 hmac-sha1-96 hmac-sha2-256 hmac-sha2-512 hmac-md5 hmac-md5-96 umac-64@openssh.com umac-128@openssh.com hmac-sha1-etm@openssh.com hmac-sha1-96-etm@openssh.com hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com hmac-md5-etm@openssh.com hmac-md5-96-etm@openssh.com umac-64-etm@openssh.com umac-128-etm@openssh.com</list>
               </completionHelp>
+              <constraint>
+                <regex>^(hmac-sha1|hmac-sha1-96|hmac-sha2-256|hmac-sha2-512|hmac-md5|hmac-md5-96|umac-64@openssh.com|umac-128@openssh.com|hmac-sha1-etm@openssh.com|hmac-sha1-96-etm@openssh.com|hmac-sha2-256-etm@openssh.com|hmac-sha2-512-etm@openssh.com|hmac-md5-etm@openssh.com|hmac-md5-96-etm@openssh.com|umac-64-etm@openssh.com|umac-128-etm@openssh.com)$</regex>
+              </constraint>
               <multi/>
             </properties>
           </leafNode>
-- 
cgit v1.2.3