summaryrefslogtreecommitdiff
path: root/interface-definitions/ssh.xml
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-05-15 21:59:05 +0200
committerChristian Poessinger <christian@poessinger.com>2018-05-15 21:59:05 +0200
commit2fd1926bad0753296807c5b29df711af29e2a67a (patch)
treeb46238e704e453d2320ee613684b6d68adabe518 /interface-definitions/ssh.xml
parent560411eae7be70e5ef44edbdb5000aa311fdae8f (diff)
parent0c42107faa0fb4fedccab6746bf90a0f02b86bc9 (diff)
downloadvyos-1x-2fd1926bad0753296807c5b29df711af29e2a67a.tar.gz
vyos-1x-2fd1926bad0753296807c5b29df711af29e2a67a.zip
Merge branch 't632-ssh-multi-nodes' into current
* t632-ssh-multi-nodes: T632: allow multiple algoorithms for: Ciper, KEX, MACs T632: use multi node for SSH allow/deny users and groups
Diffstat (limited to 'interface-definitions/ssh.xml')
-rw-r--r--interface-definitions/ssh.xml63
1 files changed, 39 insertions, 24 deletions
diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml
index ba5b887bc..9b4680235 100644
--- a/interface-definitions/ssh.xml
+++ b/interface-definitions/ssh.xml
@@ -13,29 +13,41 @@
<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>
+ <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>
+ <node name="allow">
+ <children>
+ <leafNode name="group">
+ <properties>
+ <help>Login is allowed for users whose primary or supplementary group matches</help>
+ <multi/>
+ </properties>
+ </leafNode>
+ <leafNode name="user">
+ <properties>
+ <help>Login is allowed only for user names that match</help>
+ <multi/>
+ </properties>
+ </leafNode>
+ </children>
+ </node>
+ <node name="deny">
+ <children>
+ <leafNode name="group">
+ <properties>
+ <help>Login is disallowed for users whose primary or supplementary group matches</help>
+ <multi/>
+ </properties>
+ </leafNode>
+ <leafNode name="user">
+ <properties>
+ <help>Login is disallowed for user names that match</help>
+ <multi/>
+ </properties>
+ </leafNode>
+ </children>
+ </node>
</children>
</node>
<leafNode name="allow-root">
@@ -46,10 +58,11 @@
</leafNode>
<leafNode name="ciphers">
<properties>
- <help>Allowed ciphers</help>
+ <help>Specifies allowed Ciphers</help>
<completionHelp>
<script>ssh -Q cipher | tr '\n' ' '</script>
</completionHelp>
+ <multi/>
</properties>
</leafNode>
<leafNode name="disable-host-validation">
@@ -66,10 +79,11 @@
</leafNode>
<leafNode name="key-exchange">
<properties>
- <help>Key exchange algorithms</help>
+ <help>Specifies available KEX (Key Exchange) algorithms</help>
<completionHelp>
<script>ssh -Q kex | tr '\n' ' '</script>
</completionHelp>
+ <multi/>
</properties>
</leafNode>
<leafNode name="listen-address">
@@ -117,10 +131,11 @@
</leafNode>
<leafNode name="mac">
<properties>
- <help>Allowed message authentication algorithms</help>
+ <help>Specifies available MAC (message authentication code) algorithms</help>
<completionHelp>
<script>ssh -Q mac | tr '\n' ' '</script>
</completionHelp>
+ <multi/>
</properties>
</leafNode>
<leafNode name="port">