libretic/ansible-sshd
6
0
Fork 0
mirror of https://github.com/willshersystems/ansible-sshd synced 2024-11-28 13:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: Add new options from OpenSSH 9.3

Browse source 
This version is now available in Alpine.

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Jakub Jelen 2023-06-15 11:05:53 +02:00 committed by Jakub Jelen
parent 1a7d995b96
commit 484da0584b
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meta/options_body
View file

@ -19,6 +19,7 @@ AuthorizedPrincipalsFile
Banner Banner
CASignatureAlgorithms CASignatureAlgorithms
ChallengeResponseAuthentication ChallengeResponseAuthentication
ChannelTimeout
ChrootDirectory ChrootDirectory
Ciphers Ciphers
ClientAliveCountMax ClientAliveCountMax
@ -109,6 +110,7 @@ SyslogFacility
TCPKeepAlive TCPKeepAlive
TcpRcvBufPoll TcpRcvBufPoll
TrustedUserCAKeys TrustedUserCAKeys
UnusedConnectionTimeout
UseDNS UseDNS
UseLogin UseLogin
UsePAM UsePAM

2
meta/options_match
View file

@ -13,6 +13,7 @@ AuthorizedPrincipalsCommandUser
AuthorizedPrincipalsFile AuthorizedPrincipalsFile
Banner Banner
ChrootDirectory ChrootDirectory
ChannelTimeout
ClientAliveCountMax ClientAliveCountMax
ClientAliveInterval ClientAliveInterval
DenyGroups DenyGroups
@ -55,6 +56,7 @@ SetEnv
StreamLocalBindMask StreamLocalBindMask
StreamLocalBindUnlink StreamLocalBindUnlink
TrustedUserCAKeys TrustedUserCAKeys
UnusedConnectionTimeout
X11DisplayOffset X11DisplayOffset
X11MaxDisplays X11MaxDisplays
X11Forwarding X11Forwarding

4
templates/sshd_config.j2
View file

@ -59,6 +59,7 @@ Match {{ match["Condition"] }}
{{ render_option("AuthorizedPrincipalsFile",match["AuthorizedPrincipalsFile"],true) -}} {{ render_option("AuthorizedPrincipalsFile",match["AuthorizedPrincipalsFile"],true) -}}
{{ render_option("Banner",match["Banner"],true) -}} {{ render_option("Banner",match["Banner"],true) -}}
{{ render_option("ChrootDirectory",match["ChrootDirectory"],true) -}} {{ render_option("ChrootDirectory",match["ChrootDirectory"],true) -}}
{{ render_option("ChannelTimeout",match["ChannelTimeout"],true) -}}
{{ render_option("ClientAliveCountMax",match["ClientAliveCountMax"],true) -}} {{ render_option("ClientAliveCountMax",match["ClientAliveCountMax"],true) -}}
{{ render_option("ClientAliveInterval",match["ClientAliveInterval"],true) -}} {{ render_option("ClientAliveInterval",match["ClientAliveInterval"],true) -}}
{{ render_option("DenyGroups",match["DenyGroups"],true) -}} {{ render_option("DenyGroups",match["DenyGroups"],true) -}}
@ -101,6 +102,7 @@ Match {{ match["Condition"] }}
{{ render_option("StreamLocalBindMask",match["StreamLocalBindMask"],true) -}} {{ render_option("StreamLocalBindMask",match["StreamLocalBindMask"],true) -}}
{{ render_option("StreamLocalBindUnlink",match["StreamLocalBindUnlink"],true) -}} {{ render_option("StreamLocalBindUnlink",match["StreamLocalBindUnlink"],true) -}}
{{ render_option("TrustedUserCAKeys",match["TrustedUserCAKeys"],true) -}} {{ render_option("TrustedUserCAKeys",match["TrustedUserCAKeys"],true) -}}
{{ render_option("UnusedConnectionTimeout",match["UnusedConnectionTimeout"],true) -}}
{{ render_option("X11DisplayOffset",match["X11DisplayOffset"],true) -}} {{ render_option("X11DisplayOffset",match["X11DisplayOffset"],true) -}}
{{ render_option("X11MaxDisplays",match["X11MaxDisplays"],true) -}} {{ render_option("X11MaxDisplays",match["X11MaxDisplays"],true) -}}
{{ render_option("X11Forwarding",match["X11Forwarding"],true) -}} {{ render_option("X11Forwarding",match["X11Forwarding"],true) -}}
@ -138,6 +140,7 @@ Match {{ match["Condition"] }}
{{ body_option("Banner",sshd_Banner) -}} {{ body_option("Banner",sshd_Banner) -}}
{{ body_option("CASignatureAlgorithms",sshd_CASignatureAlgorithms) -}} {{ body_option("CASignatureAlgorithms",sshd_CASignatureAlgorithms) -}}
{{ body_option("ChallengeResponseAuthentication",sshd_ChallengeResponseAuthentication) -}} {{ body_option("ChallengeResponseAuthentication",sshd_ChallengeResponseAuthentication) -}}
{{ body_option("ChannelTimeout",sshd_ChannelTimeout) -}}
{{ body_option("ChrootDirectory",sshd_ChrootDirectory) -}} {{ body_option("ChrootDirectory",sshd_ChrootDirectory) -}}
{{ body_option("Ciphers",sshd_Ciphers) -}} {{ body_option("Ciphers",sshd_Ciphers) -}}
{{ body_option("ClientAliveCountMax",sshd_ClientAliveCountMax) -}} {{ body_option("ClientAliveCountMax",sshd_ClientAliveCountMax) -}}
@ -228,6 +231,7 @@ Match {{ match["Condition"] }}
{{ body_option("TCPKeepAlive",sshd_TCPKeepAlive) -}} {{ body_option("TCPKeepAlive",sshd_TCPKeepAlive) -}}
{{ body_option("TcpRcvBufPoll",sshd_TcpRcvBufPoll) -}} {{ body_option("TcpRcvBufPoll",sshd_TcpRcvBufPoll) -}}
{{ body_option("TrustedUserCAKeys",sshd_TrustedUserCAKeys) -}} {{ body_option("TrustedUserCAKeys",sshd_TrustedUserCAKeys) -}}
{{ body_option("UnusedConnectionTimeout",sshd_UnusedConnectionTimeout) -}}
{{ body_option("UseDNS",sshd_UseDNS) -}} {{ body_option("UseDNS",sshd_UseDNS) -}}
{{ body_option("UseLogin",sshd_UseLogin) -}} {{ body_option("UseLogin",sshd_UseLogin) -}}
{{ body_option("UsePAM",sshd_UsePAM) -}} {{ body_option("UsePAM",sshd_UsePAM) -}}

4
templates/sshd_config_snippet.j2
View file

@ -57,6 +57,7 @@ Match {{ match["Condition"] }}
{{ render_option("AuthorizedPrincipalsFile",match["AuthorizedPrincipalsFile"],true) -}} {{ render_option("AuthorizedPrincipalsFile",match["AuthorizedPrincipalsFile"],true) -}}
{{ render_option("Banner",match["Banner"],true) -}} {{ render_option("Banner",match["Banner"],true) -}}
{{ render_option("ChrootDirectory",match["ChrootDirectory"],true) -}} {{ render_option("ChrootDirectory",match["ChrootDirectory"],true) -}}
{{ render_option("ChannelTimeout",match["ChannelTimeout"],true) -}}
{{ render_option("ClientAliveCountMax",match["ClientAliveCountMax"],true) -}} {{ render_option("ClientAliveCountMax",match["ClientAliveCountMax"],true) -}}
{{ render_option("ClientAliveInterval",match["ClientAliveInterval"],true) -}} {{ render_option("ClientAliveInterval",match["ClientAliveInterval"],true) -}}
{{ render_option("DenyGroups",match["DenyGroups"],true) -}} {{ render_option("DenyGroups",match["DenyGroups"],true) -}}
@ -99,6 +100,7 @@ Match {{ match["Condition"] }}
{{ render_option("StreamLocalBindMask",match["StreamLocalBindMask"],true) -}} {{ render_option("StreamLocalBindMask",match["StreamLocalBindMask"],true) -}}
{{ render_option("StreamLocalBindUnlink",match["StreamLocalBindUnlink"],true) -}} {{ render_option("StreamLocalBindUnlink",match["StreamLocalBindUnlink"],true) -}}
{{ render_option("TrustedUserCAKeys",match["TrustedUserCAKeys"],true) -}} {{ render_option("TrustedUserCAKeys",match["TrustedUserCAKeys"],true) -}}
{{ render_option("UnusedConnectionTimeout",match["UnusedConnectionTimeout"],true) -}}
{{ render_option("X11DisplayOffset",match["X11DisplayOffset"],true) -}} {{ render_option("X11DisplayOffset",match["X11DisplayOffset"],true) -}}
{{ render_option("X11MaxDisplays",match["X11MaxDisplays"],true) -}} {{ render_option("X11MaxDisplays",match["X11MaxDisplays"],true) -}}
{{ render_option("X11Forwarding",match["X11Forwarding"],true) -}} {{ render_option("X11Forwarding",match["X11Forwarding"],true) -}}
@ -136,6 +138,7 @@ Match {{ match["Condition"] }}
{{ body_option("Banner",sshd_Banner) -}} {{ body_option("Banner",sshd_Banner) -}}
{{ body_option("CASignatureAlgorithms",sshd_CASignatureAlgorithms) -}} {{ body_option("CASignatureAlgorithms",sshd_CASignatureAlgorithms) -}}
{{ body_option("ChallengeResponseAuthentication",sshd_ChallengeResponseAuthentication) -}} {{ body_option("ChallengeResponseAuthentication",sshd_ChallengeResponseAuthentication) -}}
{{ body_option("ChannelTimeout",sshd_ChannelTimeout) -}}
{{ body_option("ChrootDirectory",sshd_ChrootDirectory) -}} {{ body_option("ChrootDirectory",sshd_ChrootDirectory) -}}
{{ body_option("Ciphers",sshd_Ciphers) -}} {{ body_option("Ciphers",sshd_Ciphers) -}}
{{ body_option("ClientAliveCountMax",sshd_ClientAliveCountMax) -}} {{ body_option("ClientAliveCountMax",sshd_ClientAliveCountMax) -}}
@ -226,6 +229,7 @@ Match {{ match["Condition"] }}
{{ body_option("TCPKeepAlive",sshd_TCPKeepAlive) -}} {{ body_option("TCPKeepAlive",sshd_TCPKeepAlive) -}}
{{ body_option("TcpRcvBufPoll",sshd_TcpRcvBufPoll) -}} {{ body_option("TcpRcvBufPoll",sshd_TcpRcvBufPoll) -}}
{{ body_option("TrustedUserCAKeys",sshd_TrustedUserCAKeys) -}} {{ body_option("TrustedUserCAKeys",sshd_TrustedUserCAKeys) -}}
{{ body_option("UnusedConnectionTimeout",sshd_UnusedConnectionTimeout) -}}
{{ body_option("UseDNS",sshd_UseDNS) -}} {{ body_option("UseDNS",sshd_UseDNS) -}}
{{ body_option("UseLogin",sshd_UseLogin) -}} {{ body_option("UseLogin",sshd_UseLogin) -}}
{{ body_option("UsePAM",sshd_UsePAM) -}} {{ body_option("UsePAM",sshd_UsePAM) -}}