ncm-metaconfig: ssh: cleanup TT files a bit

quattor · Jun 11, 2020 · 7e8f2c5 · 7e8f2c5
1 parent 8a8b1a3
commit 7e8f2c5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 36 deletions.
diff --git a/ncm-metaconfig/src/main/metaconfig/ssh/client_attrs.tt b/ncm-metaconfig/src/main/metaconfig/ssh/client_attrs.tt
@@ -1,22 +1,12 @@
-[% spacelist = ['SendEnv', 'GlobalKnownHostsFile', 'IgnoreUnknown', 'Include', 'UserKnownHostsFile' ] -%]
-[% commalist = ['CASignatureAlgorithms', 'CanonicalDomains', 'CanonicalizePermittedCNAMEs', 'Ciphers',
-    'GSSAPIKexAlgorithms', 'HostbasedKeyTypes','HostKeyAlgorithms',
-    'KbdInteractiveDevices', 'KexAlgorithms', 'KbdInteractiveDevices',
-    'MACs', 'PreferredAuthentications', 'PubkeyAcceptedKeyTypes', 'ProxyJump',
-    ] -%]
-[% multilinelist = ['CertificateFile', 'IdentityFile', 'RevokedHostKeys'] -%]
-
+[% # different forms of list handling, default for list type is comma separated
+    spacelist = ['SendEnv', 'GlobalKnownHostsFile', 'IgnoreUnknown', 'Include', 'UserKnownHostsFile' ];
+    multilinelist = ['CertificateFile', 'IdentityFile', 'RevokedHostKeys'];
+     -%]
 [%- FOREACH pair IN data.pairs -%]
-[%     NEXT IF pair.key == 'hostnames' || pair.key == 'matches' -%] 
-[%     IF pair.value.is_boolean -%]
-[%         pair.key %] [% pair.value ? 'Yes' : 'No' %]
-[%         NEXT -%]
-[%     END -%]
 [%     SWITCH pair.key -%]
+[%         CASE ['hostnames', 'matches'] %][% # Do nothing -%]
 [%         CASE spacelist -%]
 [%             pair.key %] [% pair.value.join(' ') %]
-[%         CASE commalist -%]
-[%             pair.key %] [% pair.value.join(',') %]
 [%         CASE multilinelist -%]
 [%             FOREACH line IN pair.value -%]
 [%                 pair.key %] [% line %]
@@ -26,6 +16,13 @@
 SetEnv [% item.key %]="[% item.value %]"
 [%             END -%]
 [%         CASE -%]
-[%             pair.key %] [% pair.value %]
-[%     END -%]
+[%             pair.key %] [% -%]
+[%             IF pair.value.is_boolean -%]
+[%                  pair.value ? 'Yes' : 'No' -%]
+[%             ELSIF CCM.is_list(pair.value) -%]
+[%                  pair.value.join(',') -%]
+[%             ELSE -%]
+[%                  pair.value -%]
+[%             END -%]
+[%     END %]
 [% END -%]
diff --git a/ncm-metaconfig/src/main/metaconfig/ssh/server_attrs.tt b/ncm-metaconfig/src/main/metaconfig/ssh/server_attrs.tt
@@ -1,20 +1,10 @@
-[% spacelist = ['AcceptEnv', 'AllowGroups', 'AllowUsers', 'AuthenticationMethods', 'AuthorizedKeysFile', 'AuthorizedPrincipalsFile',
-    'DenyGroups', 'DenyUsers',
-    'IPQoS',
-    'PermitListen', 'PermitOpen',
-    'RekeyLimit' ] -%]
-[% commalist = ['Ciphers', 'HostKeyAlgorithms', 'HostbasedAcceptedKeyTypes', 'KexAlgorithms', 'MACs', 'PubkeyAcceptedKeyTypes' ] -%]
-[% multilinelist = ['HostKey', 'ListenAddress', 'Port' ] -%]
-
+[% # different forms of list handling, default for list type is space separated
+    commalist = ['Ciphers', 'HostKeyAlgorithms', 'HostbasedAcceptedKeyTypes', 'KexAlgorithms', 'MACs', 'PubkeyAcceptedKeyTypes' ];
+    multilinelist = ['HostKey', 'ListenAddress', 'Port' ]
+    -%]
 [%- FOREACH pair IN data.pairs -%]
-[%     NEXT IF pair.key == 'matches' -%]
-[%     IF pair.value.is_boolean -%]
-[%         pair.key %] [% pair.value ? 'Yes' : 'No' %]
-[%         NEXT -%]
-[%     END -%]
 [%     SWITCH pair.key -%]
-[%         CASE spacelist -%]
-[%             pair.key %] [% pair.value.join(' ') %]
+[%         CASE 'matches' %][% # do nothing -%]
 [%         CASE commalist -%]
 [%             pair.key %] [% pair.value.join(',') %]
 [%         CASE multilinelist -%]
@@ -23,13 +13,20 @@
 [%             END -%]
 [%         CASE 'Subsystem' -%]
 [%             FOREACH item IN pair.value.pairs -%]
-Subsystem [% item.key %] [% item.value %]
+Subsystem [%       item.key %] [% item.value %]
 [%             END -%]
 [%         CASE 'SetEnv' -%]
 [%             FOREACH item IN pair.value.pairs -%]
-SetEnv [% item.key %]="[% item.value %]"
+SetEnv [%           item.key %]="[% item.value %]"
 [%             END -%]
 [%         CASE -%]
-[%             pair.key %] [% pair.value %]
-[%     END -%]
+[%             pair.key %] [% -%]
+[%             IF pair.value.is_boolean -%]
+[%                  pair.value ? 'Yes' : 'No' -%]
+[%             ELSIF CCM.is_list(pair.value) -%]
+[%                  pair.value.join(' ') -%]
+[%             ELSE -%]
+[%                  pair.value -%]
+[%             END -%]
+[%     END %]
 [% END -%]