Salt/openssh-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/openssh-formula.git synced 2026-05-06 23:57:56 +02:00
Code Issues Activity

drop default values (fixes #102)

Browse Source
This commit is contained in:
Alexander Weidinger 2017-10-12 03:26:44 +02:00
parent a2dd72bb3e
commit eae8ca0e33
2 changed files with 111 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
openssh/files/sshd_config
View File

@ -4,8 +4,8 @@
{#- generic renderer used for sshd matches, known options, -#} {#- generic renderer used for sshd matches, known options, -#}
{#- and unknown options -#} {#- and unknown options -#}
{%- macro render_option(keyword, default, config_dict=sshd_config) -%} {%- macro render_option(keyword, config_dict=sshd_config) -%}
{%- set value = config_dict.get(keyword, default) -%} {%- set value = config_dict.get(keyword) -%}
{%- if value is sameas true -%} {%- if value is sameas true -%}
{{ keyword }} yes {{ keyword }} yes
{%- elif value is sameas false -%} {%- elif value is sameas false -%}
@ -19,27 +19,12 @@
{%- endif -%} {%- endif -%}
{%- endmacro -%} {%- endmacro -%}
{#- macros for render option according to present -#} {#- macros for render option if present -#}
{%- macro option_impl(keyword, default, present) -%} {%- macro option(keyword, present) -%}
{%- if present -%} {%- if keyword in sshd_config -%}
{%- do processed_options.append(keyword) -%} {%- do processed_options.append(keyword) -%}
{%- set prefix='' -%} {{ render_option(keyword) }}
{%- else -%}
{%- set prefix='#' -%}
{%- endif -%} {%- endif -%}
{#- add prefix to keyword -#}
{%- set keyword = prefix ~ keyword -%}
{{ render_option(keyword, default) }}
{%- endmacro -%}
{#- macros for render option commented by default -#}
{%- macro option(keyword, default, present) -%}
{{ option_impl(keyword, default, keyword in sshd_config) }}
{%- endmacro -%}
{#- macros for render option uncommented by default -#}
{%- macro option_default_uncommented(keyword, default, present) -%}
{{ option_impl(keyword, default, True) }}
{%- endmacro -%} {%- endmacro -%}
{#- macro for collapsing a list into a string -#} {#- macro for collapsing a list into a string -#}
@ -49,13 +34,9 @@
{%- endmacro -%} {%- endmacro -%}
{#- macro for handling an option that can be specified as a list or a string -#} {#- macro for handling an option that can be specified as a list or a string -#}
{%- macro option_string_or_list(keyword, default, default_commented, sep=',') -%} {%- macro option_string_or_list(keyword, sep=',') -%}
{%- if sshd_config.get(keyword, '') is string -%} {%- if sshd_config.get(keyword, '') is string -%}
{%- if default_commented -%} {{ option(keyword) }}
{{ option(keyword, default) }}
{%- else -%}
{{ option_default_uncommented(keyword, default) }}
{%- endif -%}
{%- else -%} {%- else -%}
{{ option_collapselist(keyword, sep) }} {{ option_collapselist(keyword, sep) }}
{%- endif -%} {%- endif -%}
@ -91,147 +72,146 @@
# quick reference. # quick reference.
# See the sshd_config(5) manpage for details # See the sshd_config(5) manpage for details
# Specifies which address family should be used by sshd(8). {#- Specifies which address family should be used by sshd(8). #}
# Valid arguments are any, inet (use IPv4 only), or inet6 (use IPv6 only) {#- Valid arguments are any, inet (use IPv4 only), or inet6 (use IPv6 only) #}
{{ option('AddressFamily', 'any') }} {{ option('AddressFamily') }}
# What ports, IPs and protocols we listen for {#- What ports, IPs and protocols we listen for #}
{{ option('Port', 22) }} {{ option('Port') }}
# Use these options to restrict which interfaces/protocols sshd will bind to {#- Use these options to restrict which interfaces/protocols sshd will bind to #}
{{ option('ListenAddress', ['::', '0.0.0.0']) }} {{ option('ListenAddress') }}
{{ option_default_uncommented('Protocol', 2) }} {{ option('Protocol') }}
# HostKeys for protocol version 2 {#- HostKeys for protocol version 2 #}
{{ option_default_uncommented('HostKey', ['/etc/ssh/ssh_host_rsa_key', '/etc/ssh/ssh_host_dsa_key', '/etc/ssh/ssh_host_ecdsa_key', '/etc/ssh/ssh_host_ed25519_key']) -}} {{ option('HostKey') -}}
#Privilege Separation is turned on for security #Privilege Separation is turned on for security
{{ option_default_uncommented('UsePrivilegeSeparation', 'sandbox') }} {{ option('UsePrivilegeSeparation') }}
# Lifetime and size of ephemeral version 1 server key {#- Lifetime and size of ephemeral version 1 server key #}
{{ option_default_uncommented('KeyRegenerationInterval', 3600) }} {{ option('KeyRegenerationInterval') }}
{{ option_default_uncommented('ServerKeyBits', 1024) }} {{ option('ServerKeyBits') }}
# Logging {#- Logging #}
{{ option_default_uncommented('SyslogFacility', 'AUTH') }} {{ option('SyslogFacility') }}
{{ option_default_uncommented('LogLevel', 'INFO') }} {{ option('LogLevel') }}
# Session idle time out {#- Session idle time out #}
{{ option_default_uncommented('ClientAliveInterval', 0) }} {{ option('ClientAliveInterval') }}
{{ option_default_uncommented('ClientAliveCountMax', 3) }} {{ option('ClientAliveCountMax') }}
# Authentication: {#- Authentication: #}
{{ option_default_uncommented('LoginGraceTime', 120) }} {{ option('LoginGraceTime') }}
{{ option_default_uncommented('PermitRootLogin', 'yes') }} {{ option('PermitRootLogin') }}
{{ option_default_uncommented('StrictModes', 'yes') }} {{ option('StrictModes') }}
{{ option_default_uncommented('MaxAuthTries', '6') }} {{ option('MaxAuthTries') }}
{{ option_default_uncommented('MaxSessions', '10') }} {{ option('MaxSessions') }}
{{ option('DSAAuthentication', 'yes') }} {{ option('DSAAuthentication') }}
{{ option_default_uncommented('RSAAuthentication', 'yes') }} {{ option('RSAAuthentication') }}
{{ option_default_uncommented('PubkeyAuthentication', 'yes') }} {{ option('PubkeyAuthentication') }}
{{ option('AuthorizedKeysFile', '%h/.ssh/authorized_keys') }} {{ option('AuthorizedKeysFile') }}
{{ option('AuthorizedKeysCommand', 'none') }} {{ option('AuthorizedKeysCommand') }}
{{ option('AuthorizedKeysCommandUser', 'nobody') }} {{ option('AuthorizedKeysCommandUser') }}
# Don't read the user's ~/.rhosts and ~/.shosts files {#- Don't read the user's ~/.rhosts and ~/.shosts files #}
{{ option_default_uncommented('IgnoreRhosts', 'yes') }} {{ option('IgnoreRhosts') }}
# For this to work you will also need host keys in /etc/ssh_known_hosts {#- For this to work you will also need host keys in /etc/ssh_known_hosts #}
{{ option_default_uncommented('RhostsRSAAuthentication', 'no') }} {{ option('RhostsRSAAuthentication') }}
# similar for protocol version 2 {#- similar for protocol version 2 #}
{{ option_default_uncommented('HostbasedAuthentication', 'no') }} {{ option('HostbasedAuthentication') }}
# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication {#- Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication #}
{{ option('IgnoreUserKnownHosts', 'yes') }} {{ option('IgnoreUserKnownHosts') }}
# To enable empty passwords, change to yes (NOT RECOMMENDED) {#- To enable empty passwords, change to yes (NOT RECOMMENDED) #}
{{ option_default_uncommented('PermitEmptyPasswords', 'no') }} {{ option('PermitEmptyPasswords') }}
# Change to yes to enable challenge-response passwords (beware issues with {#- Change to yes to enable challenge-response passwords (beware issues with #}
# some PAM modules and threads) {#- some PAM modules and threads) #}
{{ option_default_uncommented('ChallengeResponseAuthentication', 'no') }} {{ option('ChallengeResponseAuthentication') }}
{{ option('AuthenticationMethods', 'publickey,keyboard-interactive') }} {{ option('AuthenticationMethods') }}
# Change to no to disable tunnelled clear text passwords {#- Change to no to disable tunnelled clear text passwords #}
{{ option('PasswordAuthentication', 'yes') }} {{ option('PasswordAuthentication') }}
# Kerberos options {#- Kerberos options #}
{{ option('KerberosAuthentication', 'no') }} {{ option('KerberosAuthentication') }}
{{ option('KerberosGetAFSToken', 'no') }} {{ option('KerberosGetAFSToken') }}
{{ option('KerberosOrLocalPasswd', 'yes') }} {{ option('KerberosOrLocalPasswd') }}
{{ option('KerberosTicketCleanup', 'yes') }} {{ option('KerberosTicketCleanup') }}
# GSSAPI options {#- GSSAPI options #}
{{ option('GSSAPIAuthentication', 'no') }} {{ option('GSSAPIAuthentication') }}
{{ option('GSSAPICleanupCredentials', 'yes') }} {{ option('GSSAPICleanupCredentials') }}
{{ option_default_uncommented('X11Forwarding', 'yes') }} {{ option('X11Forwarding') }}
{{ option('AllowTcpForwarding', 'yes') }} {{ option('AllowTcpForwarding') }}
{{ option_default_uncommented('X11DisplayOffset', '10') }} {{ option('X11DisplayOffset') }}
{{ option_default_uncommented('PrintMotd', 'no') }} {{ option('PrintMotd') }}
{# Bug in FreeBSD 10.3 (?) See https://lists.freebsd.org/pipermail/freebsd-stable/2016-April/084501.html #} {# Bug in FreeBSD 10.3 (?) See https://lists.freebsd.org/pipermail/freebsd-stable/2016-April/084501.html #}
{% if not (salt['grains.get']('os') == 'FreeBSD' and salt['grains.get']('osrelease')|float >= 10.3) -%} {% if not (salt['grains.get']('os') == 'FreeBSD' and salt['grains.get']('osrelease')|float >= 10.3) -%}
{{ option_default_uncommented('PrintLastLog', 'yes') }} {{ option('PrintLastLog') }}
{% endif -%} {% endif -%}
{{ option_default_uncommented('TCPKeepAlive', 'yes') }} {{ option('TCPKeepAlive') }}
{{ option('UseLogin', 'no') }} {{ option('UseLogin') }}
{{ option('MaxStartups', '10:30:60') }} {{ option('MaxStartups') }}
{{ option('Banner', '/etc/issue.net') }} {{ option('Banner') }}
# Allow client to pass locale environment variables {#- Allow client to pass locale environment variables #}
{{ option_default_uncommented('AcceptEnv', 'LANG LC_*') }} {{ option('AcceptEnv') }}
{{ option_default_uncommented('Subsystem', 'sftp /usr/lib/openssh/sftp-server') }} {{ option('Subsystem') }}
{% if not salt['grains.get']('os') == 'OpenBSD' -%} {% if not salt['grains.get']('os') == 'OpenBSD' -%}
# Set this to 'yes' to enable PAM authentication, account processing, {#- Set this to 'yes' to enable PAM authentication, account processing, #}
# and session processing. If this is enabled, PAM authentication will {#- and session processing. If this is enabled, PAM authentication will #}
# be allowed through the ChallengeResponseAuthentication and {#- be allowed through the ChallengeResponseAuthentication and #}
# PasswordAuthentication. Depending on your PAM configuration, {#- PasswordAuthentication. Depending on your PAM configuration, #}
# PAM authentication via ChallengeResponseAuthentication may bypass {#- PAM authentication via ChallengeResponseAuthentication may bypass #}
# the setting of "PermitRootLogin without-password". {#- the setting of "PermitRootLogin without-password". #}
# If you just want the PAM account and session checks to run without {#- If you just want the PAM account and session checks to run without #}
# PAM authentication, then enable this but set PasswordAuthentication {#- PAM authentication, then enable this but set PasswordAuthentication #}
# and ChallengeResponseAuthentication to 'no'. {#- and ChallengeResponseAuthentication to 'no'. #}
{{ option_default_uncommented('UsePAM', 'yes') }} {{ option('UsePAM') }}
{%- endif %} {%- endif %}
# DNS resolve and map remote IP addresses {#- DNS resolve and map remote IP addresses #}
{{ option('UseDNS', 'yes') }} {{ option('UseDNS') }}
# Restricting Users and Hosts {#- Restricting Users and Hosts #}
# example: {#- example: #}
# AllowUsers vader@10.0.0.1 maul@sproing.evil.com luke {#- AllowUsers vader@10.0.0.1 maul@sproing.evil.com luke #}
# AllowGroups wheel staff {#- AllowGroups wheel staff #}
# #
# Keep in mind that using AllowUsers or AllowGroups means that anyone {#- Keep in mind that using AllowUsers or AllowGroups means that anyone #}
# not Matching one of the supplied patterns will be denied access by default. {#- not Matching one of the supplied patterns will be denied access by default. #}
# Also, in order for sshd to allow access based on full or partial hostnames it {#- Also, in order for sshd to allow access based on full or partial hostnames it #}
# needs to to a DNS lookup {#- needs to to a DNS lookup #}
# #
# DenyUsers {#- DenyUsers #}
{{ option_string_or_list('DenyUsers', '', True , sep=' ')}} {{ option_string_or_list('DenyUsers', sep=' ')}}
# AllowUsers {#- AllowUsers #}
{{ option_string_or_list('AllowUsers', '', True , sep=' ')}} {{ option_string_or_list('AllowUsers', sep=' ')}}
# DenyGroups {#- DenyGroups #}
{{ option_string_or_list('DenyGroups', '', True , sep=' ')}} {{ option_string_or_list('DenyGroups', sep=' ')}}
# AllowGroups {#- AllowGroups #}
{{ option_string_or_list('AllowGroups', '', True , sep=' ')}} {{ option_string_or_list('AllowGroups', sep=' ')}}
# Specifies the available KEX (Key Exchange) algorithms. {#- Specifies the available KEX (Key Exchange) algorithms. #}
{{ option_string_or_list('KexAlgorithms', 'ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1', True) }} {{ option_string_or_list('KexAlgorithms') }}
# Specifies the ciphers allowed for protocol version 2. {#- Specifies the ciphers allowed for protocol version 2. #}
{{ option_string_or_list('Ciphers', 'aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se', True) }} {{ option_string_or_list('Ciphers') }}
# Specifies the available MAC (message authentication code) algorithms. {#- Specifies the available MAC (message authentication code) algorithms. #}
{{ option_string_or_list('MACs', 'hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,hmac-sha2-512-96,hmac-ripemd160,hmac-ripemd160@openssh.com,hmac-sha1-96,hmac-md5-96', True) }} {{ option_string_or_list('MACs') }}
{# Handling unknown in salt template options #} {# Handling unknown in salt template options #}
{%- for keyword in sshd_config.keys() %} {%- for keyword in sshd_config.keys() %}
{#- Matches have to be at the bottom and should be handled differently -#} {#- Matches have to be at the bottom and should be handled differently -#}
{%- if not keyword in processed_options and keyword != 'matches' -%} {%- if not keyword in processed_options and keyword != 'matches' -%}
{#- send a blank default as it doesn't matter #} {{ render_option(keyword) }}
{{ render_option(keyword, '') }}
{%- endif -%} {%- endif -%}
{%- endfor %} {%- endfor %}

1
openssh/map.jinja
View File

@ -86,7 +86,6 @@ that differ from whats in defaults.yaml
{% set os_finger_map = salt['grains.filter_by']({ {% set os_finger_map = salt['grains.filter_by']({
'CentOS-6': { 'CentOS-6': {
'UsePrivilegeSeparation': 'yes',
}, },
'default': {} 'default': {}
} }