Merge branch 'ssh-rewrite' into current

* ssh-rewrite:
  T631: small bugfix in config parsind for deny-users
  T631: improve help for access-control
  T631: refactor SSH script and switch to jinja2
  T631: first full generated config file with XML and Python
  T631: use completionHelp for SSH rather then valueHelp
  T631: Rewrite SSH configuration as XML interface definition

1 files changed, 134 insertions, 0 deletions

diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml
new file mode 100644
index 000000000..5ccd3006f
--- /dev/null
+++ b/interface-definitions/ssh.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+
+<!--SSH configuration -->
+
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="ssh" owner="${vyos_sbindir}/vyos-config-ssh.py">
+        <properties>
+          <help>Secure SHell (SSH) protocol</help>
+          <priority>500</priority>
+        </properties>
+        <children>
+          <node name="access-control">
+            <properties>
+                <help>SSH user/group access controls. Directives are processed in this: deny-users, allow-users, deny-groups and allow-groups</help>
+            </properties>
+            <children>
+              <leafNode name="allow-groups">
+                <properties>
+                  <help>Configure sshd_config access control for allowed groups</help>
+                </properties>
+              </leafNode>
+              <leafNode name="allow-users">
+                <properties>
+                  <help>Configure sshd_config access control for allowed users</help>
+                </properties>
+              </leafNode>
+              <leafNode name="deny-groups">
+                <properties>
+                  <help>Configure sshd_config access control for disallowed groups</help>
+                </properties>
+              </leafNode>
+              <leafNode name="deny-users">
+                <properties>
+                  <help>Configure sshd_config access control for disallowed users</help>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="allow-root">
+            <properties>
+              <help>Enable root login over ssh</help>
+            </properties>
+          </leafNode>
+          <leafNode name="ciphers">
+            <properties>
+              <help>Allowed ciphers</help>
+              <completionHelp>
+                <script>ssh -Q cipher | tr '\n' ' '</script>
+              </completionHelp>
+            </properties>
+          </leafNode>
+          <leafNode name="disable-host-validation">
+            <properties>
+              <help>Don't validate the remote host name with DNS</help>
+            </properties>
+          </leafNode>
+          <leafNode name="disable-password-authentication">
+            <properties>
+              <help>Don't allow unknown user to login with password</help>
+            </properties>
+          </leafNode>
+          <leafNode name="key-exchange">
+            <properties>
+              <help>Key exchange algorithms</help>
+              <completionHelp>
+                <script>ssh -Q kex | tr '\n' ' '</script>
+              </completionHelp>
+            </properties>
+          </leafNode>
+          <leafNode name="listen-address">
+            <properties>
+              <help>Local addresses SSH service should listen on</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>IP address to listen for incoming connections</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ipv6</format>
+                <description>IPv6 address to listen for incoming connections</description>
+              </valueHelp>
+              <type>ipv4,ipv6</type>
+              <multi/>
+            </properties>
+          </leafNode>
+          <leafNode name="loglevel">
+            <properties>
+              <help>Log level</help>
+              <valueHelp>
+                <format>QUIET</format>
+                <description>stay silent</description>
+              </valueHelp>
+              <valueHelp>
+                <format>FATAL</format>
+                <description>log fatals only</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ERROR</format>
+                <description>log errors and fatals only</description>
+              </valueHelp>
+              <valueHelp>
+                <format>INFO</format>
+                <description>default log level</description>
+              </valueHelp>
+              <valueHelp>
+                <format>VERBOSE</format>
+                <description>enable logging of failed login attempts</description>
+              </valueHelp>
+            </properties>
+          </leafNode>
+          <leafNode name="mac">
+            <properties>
+              <help>Allowed message authentication algorithms</help>
+              <completionHelp>
+                <script>ssh -Q mac | tr '\n' ' '</script>
+              </completionHelp>
+            </properties>
+          </leafNode>
+          <leafNode name="port">
+            <properties>
+              <help>Port for SSH service</help>
+              <valueHelp>
+                <format>u32:1-65535</format>
+                <description>Numeric IP port</description>
+              </valueHelp>
+              <type>u32</type>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>