add user/group/mode parameter to custom types

lib/puppet/provider/dhparam/openssl.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 require 'pathname'
-Puppet::Type.type(:dhparam).provide(:openssl) do
+require File.join(__dir__, '..', '..', '..', 'puppet/provider/openssl')
+
+Puppet::Type.type(:dhparam).provide(
+  :openssl,
+  parent: Puppet::Provider::Openssl,
+) do
   desc 'Manages dhparam files with OpenSSL'
 
   commands openssl: 'openssl'
@@ -19,6 +24,7 @@ def create
     options.insert(1, '-dsaparam') if resource[:fastmode]
 
     openssl options
+    set_file_perm(resource[:path], resource[:owner], resource[:group], resource[:mode])
   end
 
   def destroy

lib/puppet/provider/openssl.rb

@@ -0,0 +1,54 @@
+require 'etc'
+
+# class to use in openssl providers to handle file permission (mode, group and owner)
+class Puppet::Provider::Openssl < Puppet::Provider
+  include Puppet::Util::POSIX
+
+  def owner
+    if File.exist?(@resource[:path])
+      Etc.getpwuid(File.stat(@resource[:path]).uid).name
+    else
+      :absent
+    end
+  end
+
+  def owner=(should)
+    File.chown(uid(should), nil, resource[:path])
+  rescue => detail
+    raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
+  end
+
+  def group
+    if File.exist?(@resource[:path])
+      Etc.getgrgid(File.stat(@resource[:path]).gid).name
+    else
+      :absent
+    end
+  end
+
+  def group=(should)
+    File.chown(nil, gid(should), resource[:path])
+  rescue => detail
+    raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
+  end
+
+  # Return the mode as an octal string, not as an integer.
+  def mode
+    if File.exist?(@resource[:path])
+      '0%o' % (File.stat(@resource[:path]).mode & 0o07777)
+    else
+      :absent
+    end
+  end
+
+  # Set the file mode, converting from a string to an integer.
+  def mode=(should)
+    File.chmod(Integer('0' + should), @resource[:path])
+  end
+
+  def set_file_perm(filename, owner = nil, group = nil, mode = nil)
+    File.chown(uid(owner), nil, resource[:path]) if owner
+    File.chown(nil, gid(group), resource[:path]) if group
+    File.chmod(Integer('0' + mode), filename) if mode
+  end
+end

lib/puppet/provider/ssl_pkey/openssl.rb

@@ -2,7 +2,11 @@
 
 require 'pathname'
 require 'openssl'
-Puppet::Type.type(:ssl_pkey).provide(:openssl) do
+require File.join(__dir__, '..', '..', '..', 'puppet/provider/openssl')
+Puppet::Type.type(:ssl_pkey).provide(
+  :openssl,
+  parent: Puppet::Provider::Openssl,
+) do
   desc 'Manages private keys with OpenSSL'
 
   def self.dirname(resource)
@@ -42,6 +46,7 @@ def create
     File.open(resource[:path], 'w') do |f|
       f.write(pem)
     end
+    set_file_perm(resource[:path], resource[:owner], resource[:group], resource[:mode])
   end
 
   def destroy

lib/puppet/provider/x509_cert/openssl.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 require 'pathname'
-Puppet::Type.type(:x509_cert).provide(:openssl) do
+require File.join(__dir__, '..', '..', '..', 'puppet/provider/openssl')
+Puppet::Type.type(:x509_cert).provide(
+  :openssl,
+  parent: Puppet::Provider::Openssl,
+) do
   desc 'Manages certificates with OpenSSL'
 
   commands openssl: 'openssl'
@@ -78,6 +82,7 @@ def create
     options << ['-passin', "pass:#{resource[:password]}"] if resource[:password]
     options << ['-extensions', 'req_ext'] if resource[:req_ext] != :false
     openssl options
+    set_file_perm(resource[:path], resource[:owner], resource[:group], resource[:mode])
   end
 
   def destroy

lib/puppet/provider/x509_request/openssl.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 require 'pathname'
-Puppet::Type.type(:x509_request).provide(:openssl) do
+require File.join(__dir__, '..', '..', '..', 'puppet/provider/openssl')
+Puppet::Type.type(:x509_request).provide(
+  :openssl,
+  parent: Puppet::Provider::Openssl,
+) do
   desc 'Manages certificate signing requests with OpenSSL'
 
   commands openssl: 'openssl'
@@ -53,6 +57,7 @@ def create
     cmd_args.push('-nodes') unless resource[:encrypted]
 
     openssl(*cmd_args)
+    set_file_perm(resource[:path], resource[:owner], resource[:group], resource[:mode])
   end
 
   def destroy

lib/puppet/type/dhparam.rb

@@ -35,4 +35,31 @@
   autorequire(:file) do
     Pathname.new(self[:path]).parent.to_s
   end
+
+  newproperty(:owner) do
+    desc 'owner of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid user name' % value
+      end
+    end
+  end
+
+  newproperty(:group) do
+    desc 'group of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid group name' % value
+      end
+    end
+  end
+
+  newproperty(:mode) do
+    desc 'mode of the file'
+    validate do |value|
+      unless value =~ %r{^0\d\d\d$}
+        raise ArgumentError, '%s is not a valid file mode' % value
+      end
+    end
+  end
 end

lib/puppet/type/ssl_pkey.rb

@@ -42,4 +42,31 @@
   autorequire(:file) do
     Pathname.new(self[:path]).parent.to_s
   end
+
+  newproperty(:owner) do
+    desc 'owner of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid user name' % value
+      end
+    end
+  end
+
+  newproperty(:group) do
+    desc 'group of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid group name' % value
+      end
+    end
+  end
+
+  newproperty(:mode) do
+    desc 'mode of the file'
+    validate do |value|
+      unless value =~ %r{^0\d\d\d$}
+        raise ArgumentError, '%s is not a valid file mode' % value
+      end
+    end
+  end
 end

lib/puppet/type/x509_cert.rb

@@ -66,6 +66,33 @@
     defaultto :rsa
   end
 
+  newproperty(:owner) do
+    desc 'owner of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid user name' % value
+      end
+    end
+  end
+
+  newproperty(:group) do
+    desc 'group of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid group name' % value
+      end
+    end
+  end
+
+  newproperty(:mode) do
+    desc 'mode of the file'
+    validate do |value|
+      unless value =~ %r{^0\d\d\d$}
+        raise ArgumentError, '%s is not a valid file mode' % value
+      end
+    end
+  end
+
   autorequire(:file) do
     self[:template]
   end

lib/puppet/type/x509_request.rb

@@ -60,6 +60,33 @@
     defaultto true
   end
 
+  newproperty(:owner) do
+    desc 'owner of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid user name' % value
+      end
+    end
+  end
+
+  newproperty(:group) do
+    desc 'group of the file'
+    validate do |value|
+      unless value =~ %r{^\w+}
+        raise ArgumentError, '%s is not a valid group name' % value
+      end
+    end
+  end
+
+  newproperty(:mode) do
+    desc 'mode of the file'
+    validate do |value|
+      unless value =~ %r{^0\d\d\d$}
+        raise ArgumentError, '%s is not a valid file mode' % value
+      end
+    end
+  end
+
   autorequire(:x509_cert) do
     path = Pathname.new(self[:private_key])
     "#{path.dirname}/#{path.basename(path.extname)}"

spec/unit/puppet/type/dhparam_spec.rb

@@ -38,4 +38,20 @@
       resource[:size] = 1.5
     end.to raise_error(Puppet::Error, %r{Size must be a positive integer: 1.5})
   end
+
+  it 'accepts mode' do
+    resource[:mode] = '0700'
+    expect(resource[:mode]).to eq('0700')
+  end
+
+  it 'accepts owner' do
+    resource[:owner] = 'someone'
+    expect(resource[:owner]).to eq('someone')
+  end
+
+  it 'accepts group' do
+    resource[:group] = 'party'
+    expect(resource[:group]).to eq('party')
+  end
+
 end

spec/unit/puppet/type/ssl_pkey_spec.rb

@@ -51,4 +51,20 @@
     resource[:password] = 'foox2$bar'
     expect(resource[:password]).to eq('foox2$bar')
   end
+
+  it 'accepts mode' do
+    resource[:mode] = '0700'
+    expect(resource[:mode]).to eq('0700')
+  end
+
+  it 'accepts owner' do
+    resource[:owner] = 'someone'
+    expect(resource[:owner]).to eq('someone')
+  end
+
+  it 'accepts group' do
+    resource[:group] = 'party'
+    expect(resource[:group]).to eq('party')
+  end
+
 end

spec/unit/puppet/type/x509_cert_spec.rb

@@ -79,4 +79,20 @@
       resource[:authentication] = :foo
     end.to raise_error(Puppet::Error, %r{Invalid value :foo})
   end
+
+  it 'accepts mode' do
+    resource[:mode] = '0700'
+    expect(resource[:mode]).to eq('0700')
+  end
+
+  it 'accepts owner' do
+    resource[:owner] = 'someone'
+    expect(resource[:owner]).to eq('someone')
+  end
+
+  it 'accepts group' do
+    resource[:group] = 'party'
+    expect(resource[:group]).to eq('party')
+  end
+
 end

spec/unit/puppet/type/x509_request_spec.rb

@@ -68,4 +68,19 @@
       resource[:authentication] = :foo
     end.to raise_error(Puppet::Error, %r{Invalid value :foo})
   end
+
+  it 'accepts mode' do
+    resource[:mode] = '0700'
+    expect(resource[:mode]).to eq('0700')
+  end
+
+  it 'accepts owner' do
+    resource[:owner] = 'someone'
+    expect(resource[:owner]).to eq('someone')
+  end
+
+  it 'accepts group' do
+    resource[:group] = 'party'
+    expect(resource[:group]).to eq('party')
+  end
 end