diff options
| author | Gabriel Nagy <gabriel.nagy@puppet.com> | 2020-09-07 10:26:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 10:26:59 +0300 |
| commit | bd8183b968b7c3340fdff9c8325e571353e2ab63 (patch) | |
| tree | 9dafa0a93a3f0f822488cc89906e4a98ab4e8c7c /lib | |
| parent | 53e65867c7974910189e62476e08258689333e47 (diff) | |
| parent | 53b29db4a99f970b99141ae143cddb60f263de72 (diff) | |
| download | puppet-sshkeys_core-bd8183b968b7c3340fdff9c8325e571353e2ab63.tar.gz puppet-sshkeys_core-bd8183b968b7c3340fdff9c8325e571353e2ab63.tar.bz2 | |
Merge pull request #35 from bastelfreak/MODULES-10765
(MODULES-10765) Implement public key certificate support
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/type/ssh_authorized_key.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb index 953b1a6..9749e29 100644 --- a/lib/puppet/type/ssh_authorized_key.rb +++ b/lib/puppet/type/ssh_authorized_key.rb @@ -63,7 +63,9 @@ module Puppet desc 'The encryption type used.' newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521', :'ssh-ed25519', - :'sk-ecdsa-sha2-nistp256@openssh.com', :'sk-ssh-ed25519@openssh.com' + :'sk-ecdsa-sha2-nistp256@openssh.com', :'sk-ssh-ed25519@openssh.com', :'ssh-rsa-cert-v01@openssh.com', + :'ssh-ed25519-cert-v01@openssh.com', :'ssh-dss-cert-v01@openssh.com', :'ecdsa-sha2-nistp256-cert-v01@openssh.com', + :'ecdsa-sha2-nistp384-cert-v01@openssh.com', :'ecdsa-sha2-nistp521-cert-v01@openssh.com' aliasvalue(:dsa, :'ssh-dss') aliasvalue(:ed25519, :'ssh-ed25519') @@ -164,7 +166,10 @@ module Puppet # regular expression suitable for use by a ParsedFile based provider REGEX = %r{^(?:(.+)\s+)?(ssh-dss|ssh-ed25519|ssh-rsa|ecdsa-sha2-nistp256| ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ecdsa-sk|ed25519-sk| - sk-ecdsa-sha2-nistp256@openssh.com|sk-ssh-ed25519@openssh.com)\s+([^ ]+)\s*(.*)$}x + sk-ecdsa-sha2-nistp256@openssh.com|sk-ssh-ed25519@openssh.com| + ssh-rsa-cert-v01@openssh.com|ssh-ed25519-cert-v01@openssh.com| + ssh-dss-cert-v01@openssh.com|ecdsa-sha2-nistp256-cert-v01@openssh.com| + ecdsa-sha2-nistp384-cert-v01@openssh.com|ecdsa-sha2-nistp521-cert-v01@openssh.com)\s+([^ ]+)\s*(.*)$}x def self.keyline_regex REGEX end |