puppet 5.3.7-x64-mingw32 → 5.4.0-x64-mingw32

data/spec/unit/provider/user/user_role_add_spec.rb

@@ -70,11 +70,11 @@ describe Puppet::Type.type(:user).provider(:user_role_add), :unless => Puppet.fe
     end
 
     it "should set password age rules" do
-      resource = Puppet::Type.type(:user).new :name => "myuser", :password_min_age => 5, :password_max_age => 10, :provider => :user_role_add
+      resource = Puppet::Type.type(:user).new :name => "myuser", :password_min_age => 5, :password_max_age => 10, :password_warn_days => 15, :provider => :user_role_add
       provider = described_class.new(resource)
       provider.stubs(:user_attributes)
       provider.stubs(:execute)
-      provider.expects(:execute).with { |cmd, *args| args == ["-n", 5, "-x", 10, "myuser"] }
+      provider.expects(:execute).with { |cmd, *args| args == ["-n", 5, "-x", 10, '-w', 15, "myuser"] }
       provider.create
     end
   end
@@ -354,4 +354,21 @@ EOT
       expect(provider.password_min_age).to eq(-1)
     end
   end
+
+  describe "#password_warn_days" do
+    it "should return a warn days number" do
+      File.stubs(:readlines).returns(["fakeval:NP:12345:10:50:30:::\n"])
+      expect(provider.password_warn_days).to eq("30")
+    end
+
+    it "should return -1 for no warn days" do
+      File.stubs(:readlines).returns(["fakeval:NP:12345::::::\n"])
+      expect(provider.password_warn_days).to eq(-1)
+    end
+
+    it "should return -1 for no warn days when failed attempts are present" do
+      File.stubs(:readlines).returns(["fakeval:NP:12345::::::3\n"])
+      expect(provider.password_warn_days).to eq(-1)
+    end
+  end
 end

data/spec/unit/provider/user/useradd_spec.rb

@@ -5,10 +5,13 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   before :each do
     described_class.stubs(:command).with(:password).returns '/usr/bin/chage'
+    described_class.stubs(:command).with(:localpassword).returns '/usr/sbin/lchage'
     described_class.stubs(:command).with(:add).returns '/usr/sbin/useradd'
     described_class.stubs(:command).with(:localadd).returns '/usr/sbin/luseradd'
     described_class.stubs(:command).with(:modify).returns '/usr/sbin/usermod'
+    described_class.stubs(:command).with(:localmodify).returns '/usr/sbin/lusermod'
     described_class.stubs(:command).with(:delete).returns '/usr/sbin/userdel'
+    described_class.stubs(:command).with(:localdelete).returns '/usr/sbin/luserdel'
   end
 
   let(:resource) do
@@ -94,8 +97,9 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       described_class.has_feature :manages_password_age
       resource[:password_min_age] = 5
       resource[:password_max_age] = 10
+      resource[:password_warn_days] = 15
       provider.expects(:execute).with(includes('/usr/sbin/useradd'), kind_of(Hash))
-      provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, 'myuser'])
+      provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], has_entry(:custom_environment, {}))
       provider.create
     end
 
@@ -121,10 +125,10 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         expect { provider.create }.to raise_error(Puppet::Error, "UID 505 already exists, use allowdupe to force user creation")
       end
 
-      it "should not use -G for luseradd and should call usermod with -G after luseradd when groups property is set" do
+      it "should not use -G for luseradd and should call lusermod with -G after luseradd when groups property is set" do
         resource[:groups] = ['group1', 'group2']
         provider.expects(:execute).with(Not(includes("-G")), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.expects(:execute).with(includes('/usr/sbin/usermod'))
+        provider.expects(:execute).with(includes('/usr/sbin/lusermod'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
         provider.create
       end
 
@@ -134,18 +138,21 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         provider.create
       end
 
-      it "should not use -e with luseradd, should call usermod with -e after luseradd when expiry is set" do
+      it "should not use -e with luseradd, should call lusermod with -e after luseradd when expiry is set" do
         resource[:expiry] = '2038-01-24'
         provider.expects(:execute).with(all_of(includes('/usr/sbin/luseradd'), Not(includes('-e'))), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.expects(:execute).with(all_of(includes('/usr/sbin/usermod'), includes('-e')))
+        provider.expects(:execute).with(all_of(includes('/usr/sbin/lusermod'), includes('-e')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
         provider.create
       end
 
-      it "should use userdel to delete users" do
-        resource[:ensure] = :absent
-        provider.stubs(:exists?).returns(true)
-        provider.expects(:execute).with(includes('/usr/sbin/userdel'))
-        provider.delete
+      it 'should set password age rules locally' do
+        described_class.has_feature :manages_password_age
+        resource[:password_min_age] = 5
+        resource[:password_max_age] = 10
+        resource[:password_warn_days] = 15
+        provider.expects(:execute).with(includes('/usr/sbin/luseradd'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.expects(:execute).with(['/usr/sbin/lchage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.create
       end
     end
 
@@ -160,10 +167,84 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   end
 
+  describe '#modify' do
+    describe "on systems with the libuser and forcelocal=false" do
+      before do
+         described_class.has_feature :libuser
+         resource[:forcelocal] = false
+      end
+
+      it "should use usermod" do
+        provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, 'myuser'], has_entry(:custom_environment, {}))
+        provider.uid = 150
+      end
+
+      it "should use -o when allowdupe=true" do
+        resource[:allowdupe] = :true
+        provider.expects(:execute).with(includes('-o'), has_entry(:custom_environment, {}))
+        provider.uid = 505
+      end
+
+      it 'should use chage for password_min_age' do
+        provider.expects(:execute).with(['/usr/bin/chage', '-m', 100, 'myuser'], has_entry(:custom_environment, {}))
+        provider.password_min_age = 100
+      end
+
+      it 'should use chage for password_max_age' do
+        provider.expects(:execute).with(['/usr/bin/chage', '-M', 101, 'myuser'], has_entry(:custom_environment, {}))
+        provider.password_max_age = 101
+      end
+
+      it 'should use chage for password_warn_days' do
+        provider.expects(:execute).with(['/usr/bin/chage', '-W', 99, 'myuser'], has_entry(:custom_environment, {}))
+        provider.password_warn_days = 99
+      end
+    end
+
+    describe "on systems with the libuser and forcelocal=true" do
+      before do
+         described_class.has_feature :libuser
+         resource[:forcelocal] = true
+      end
+
+      it "should use lusermod and not usermod" do
+        provider.expects(:execute).with(['/usr/sbin/lusermod', '-u', 150, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.uid = 150
+      end
+
+      it "should NOT use -o when allowdupe=true" do
+        resource[:allowdupe] = :true
+        provider.expects(:execute).with(Not(includes('-o')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.uid = 505
+      end
+
+      it "should raise an exception for duplicate UIDs" do
+        resource[:uid] = 505
+        provider.stubs(:finduser).returns(true)
+        expect { provider.uid = 505 }.to raise_error(Puppet::Error, "UID 505 already exists, use allowdupe to force user creation")
+      end
+
+      it 'should use lchage for password_warn_days' do
+        provider.expects(:execute).with(['/usr/sbin/lchage', '-W', 99, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.password_warn_days = 99
+      end
+
+      it 'should use lchage for password_min_age' do
+        provider.expects(:execute).with(['/usr/sbin/lchage', '-m', 100, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.password_min_age = 100
+      end
+
+      it 'should use lchage for password_max_age' do
+        provider.expects(:execute).with(['/usr/sbin/lchage', '-M', 101, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.password_max_age = 101
+      end
+    end
+  end
+
   describe "#uid=" do
     it "should add -o when allowdupe is enabled and the uid is being modified" do
       resource[:allowdupe] = :true
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, '-o', 'myuser'])
+      provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, '-o', 'myuser'], has_entry(:custom_environment, {}))
       provider.uid = 150
     end
   end
@@ -172,20 +253,20 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     it "should pass expiry to usermod as MM/DD/YY when on Solaris" do
       Facter.expects(:value).with(:operatingsystem).returns 'Solaris'
       resource[:expiry] = '2012-10-31'
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '10/31/2012', 'myuser'])
+      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '10/31/2012', 'myuser'], has_entry(:custom_environment, {}))
       provider.expiry = '2012-10-31'
     end
 
     it "should pass expiry to usermod as YYYY-MM-DD when not on Solaris" do
       Facter.expects(:value).with(:operatingsystem).returns 'not_solaris'
       resource[:expiry] = '2012-10-31'
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '2012-10-31', 'myuser'])
+      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '2012-10-31', 'myuser'], has_entry(:custom_environment, {}))
       provider.expiry = '2012-10-31'
     end
 
     it "should use -e with an empty string when the expiry property is removed" do
       resource[:expiry] = :absent
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '', 'myuser'])
+      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '', 'myuser'], has_entry(:custom_environment, {}))
       provider.expiry = :absent
     end
   end
@@ -232,7 +313,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   describe "#check_manage_home" do
     it "should return an array with -m flag if home is managed" do
       resource[:managehome] = :true
-      provider.expects(:execute).with(includes('-m'), kind_of(Hash))
+      provider.expects(:execute).with(includes('-m'), has_entry(:custom_environment, {}))
       provider.create
     end
 
@@ -240,7 +321,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       resource[:managehome] = :true
       resource[:ensure] = :absent
       provider.stubs(:exists?).returns(true)
-      provider.expects(:execute).with(includes('-r'))
+      provider.expects(:execute).with(includes('-r'), has_entry(:custom_environment, {}))
       provider.delete
     end
 
@@ -337,12 +418,46 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
       expect(provider.addcmd).to eq(['/usr/sbin/useradd', '-e', '', '-G', 'somegroup', '-o', '-m', '-r', 'myuser'])
     end
+
+    it "should use lgroupadd with forcelocal=true" do
+      resource[:forcelocal] = :true
+      expect(provider.addcmd[0]).to eq('/usr/sbin/luseradd')
+    end
+
+    it "should not pass -o with forcelocal=true and allowdupe=true" do
+      resource[:forcelocal] = :true
+      resource[:allowdupe] = :true
+      expect(provider.addcmd).not_to include("-o")
+    end
+
+    context 'when forcelocal=true' do
+      before do
+        resource[:forcelocal] = :true
+      end
+
+      it 'does not pass lchage options to luseradd for password_max_age' do
+        resource[:password_max_age] = 100
+        expect(provider.addcmd).not_to include('-M')
+      end
+
+      it 'does not pass lchage options to luseradd for password_min_age' do
+        resource[:managehome] = false  # This needs to be set so that we don't pass in -m to create the home
+        resource[:password_min_age] = 100
+        expect(provider.addcmd).not_to include('-m')
+      end
+
+      it 'does not pass lchage options to luseradd for password_warn_days' do
+        resource[:password_warn_days] = 100
+        expect(provider.addcmd).not_to include('-W')
+      end
+    end
   end
 
   {
-    :password_min_age => 10,
-    :password_max_age => 20,
-    :password         => '$6$FvW8Ib8h$qQMI/CR9m.QzIicZKutLpBgCBBdrch1IX0rTnxuI32K1pD9.RXZrmeKQlaC.RzODNuoUtPPIyQDufunvLOQWF0'
+    :password_min_age   => 10,
+    :password_max_age   => 20,
+    :password_warn_days => 30,
+    :password           => '$6$FvW8Ib8h$qQMI/CR9m.QzIicZKutLpBgCBBdrch1IX0rTnxuI32K1pD9.RXZrmeKQlaC.RzODNuoUtPPIyQDufunvLOQWF0'
   }.each_pair do |property, expected_value|
     describe "##{property}" do
       before :each do
@@ -429,18 +544,43 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
     it "should return a chage command array with -m <value> and the user name if password_min_age is set" do
       resource[:password_min_age] = 123
-      expect(provider.passcmd).to eq(['/usr/bin/chage','-m',123,'myuser'])
+      expect(provider.passcmd).to eq(['/usr/bin/chage', '-m', 123, 'myuser'])
     end
 
     it "should return a chage command array with -M <value> if password_max_age is set" do
       resource[:password_max_age] = 999
-      expect(provider.passcmd).to eq(['/usr/bin/chage','-M',999,'myuser'])
+      expect(provider.passcmd).to eq(['/usr/bin/chage', '-M', 999, 'myuser'])
+    end
+
+    it "should return a chage command array with -W <value> if password_warn_days is set" do
+      resource[:password_warn_days] = 999
+      expect(provider.passcmd).to eq(['/usr/bin/chage', '-W', 999, 'myuser'])
     end
 
     it "should return a chage command array with -M <value> -m <value> if both password_min_age and password_max_age are set" do
       resource[:password_min_age] = 123
       resource[:password_max_age] = 999
-      expect(provider.passcmd).to eq(['/usr/bin/chage','-m',123,'-M',999,'myuser'])
+      expect(provider.passcmd).to eq(['/usr/bin/chage', '-m', 123, '-M', 999, 'myuser'])
+    end
+
+    it "should return a chage command array with -M <value> -m <value> -W <value> if password_min_age, password_max_age and password_warn_days are set" do
+      resource[:password_min_age] = 123
+      resource[:password_max_age] = 999
+      resource[:password_warn_days] = 555
+      expect(provider.passcmd).to eq(['/usr/bin/chage', '-m', 123, '-M', 999, '-W', 555, 'myuser'])
+    end
+
+    context 'with forcelocal=true' do
+      before do
+        resource[:forcelocal] = true
+      end
+
+      it 'should return a lchage command array with -M <value> -m <value> -W <value> if password_min_age, password_max_age and password_warn_days are set' do
+        resource[:password_min_age] = 123
+        resource[:password_max_age] = 999
+        resource[:password_warn_days] = 555
+        expect(provider.passcmd).to eq(['/usr/sbin/lchage', '-m', 123, '-M', 999, '-W', 555, 'myuser'])
+      end
     end
   end
 
@@ -457,4 +597,30 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     end
   end
 
+  describe "#delete" do
+    before do
+       provider.stubs(:exists?).returns(true)
+       resource[:ensure] = :absent
+    end
+    describe "on systems with the libuser and forcelocal=false" do
+      before do
+         described_class.has_feature :libuser
+         resource[:forcelocal] = false
+      end
+      it "should use userdel to delete users" do
+        provider.expects(:execute).with(includes('/usr/sbin/userdel'), has_entry(:custom_environment, {}))
+        provider.delete
+      end
+    end
+    describe "on systems with the libuser and forcelocal=true" do
+      before do
+         described_class.has_feature :libuser
+         resource[:forcelocal] = true
+      end
+      it "should use luserdel to delete users" do
+        provider.expects(:execute).with(includes('/usr/sbin/luserdel'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.delete
+      end
+    end
+  end
 end

data/spec/unit/provider/user/windows_adsi_spec.rb

@@ -81,9 +81,9 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
     let(:group3) { stub(:account => 'group3', :domain => '.', :sid => 'group3sid') }
 
     before :each do
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('group1').returns(group1)
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('group2').returns(group2)
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('group3').returns(group3)
+      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('group1').returns(group1)
+      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('group2').returns(group2)
+      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('group3').returns(group3)
     end
 
     it "should return true for same lists of members" do
@@ -267,7 +267,7 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
   end
 
   it 'should be able to test whether a user exists' do
-    Puppet::Util::Windows::SID.stubs(:name_to_principal).returns(nil)
+    Puppet::Util::Windows::SID.stubs(:name_to_sid_object).returns(nil)
     Puppet::Util::Windows::ADSI.stubs(:connect).returns stub('connection', :Class => 'User')
     expect(provider).to be_exists
 

data/spec/unit/provider/zfs/zfs_spec.rb

@@ -95,7 +95,7 @@ describe Puppet::Type.type(:zfs).provider(:zfs) do
      :mountpoint, :nbmand,  :primarycache, :quota, :readonly,
      :recordsize, :refquota, :refreservation, :reservation,
      :secondarycache, :setuid, :shareiscsi, :sharenfs, :sharesmb,
-     :snapdir, :version, :volsize, :vscan, :xattr, :zoned].each do |prop|
+     :snapdir, :version, :volsize, :vscan, :xattr].each do |prop|
       it "should get #{prop}" do
         provider.expects(:zfs).with(:get, '-H', '-o', 'value', prop, name).returns("value\n")
 
@@ -109,4 +109,58 @@ describe Puppet::Type.type(:zfs).provider(:zfs) do
       end
     end
   end
+  describe "zoned" do
+    context "on FreeBSD" do
+      before do
+        Facter.stubs(:value).with(:operatingsystem).returns("FreeBSD")
+      end
+      it "should get 'jailed' property" do
+        provider.expects(:zfs).with(:get, '-H', '-o', 'value', :jailed, name).returns("value\n")
+        expect(provider.send("zoned")).to eq('value')
+      end
+
+      it "should set jalied=value" do
+        provider.expects(:zfs).with(:set, "jailed=value", name)
+        provider.send("zoned=", "value")
+      end
+    end
+
+    context "when not running FreeBSD" do
+      before do
+        Facter.stubs(:value).with(:operatingsystem).returns("Solaris")
+      end
+      it "should get 'zoned' property" do
+        provider.expects(:zfs).with(:get, '-H', '-o', 'value', :zoned, name).returns("value\n")
+        expect(provider.send("zoned")).to eq('value')
+      end
+
+      it "should set zoned=value" do
+        provider.expects(:zfs).with(:set, "zoned=value", name)
+        provider.send("zoned=", "value")
+      end
+    end
+  end
+  describe "acltype" do
+    context "when available" do
+      it "should get 'acltype' property" do
+        provider.expects(:zfs).with(:get, '-H', '-o', 'value', :acltype, name).returns("value\n")
+        expect(provider.send("acltype")).to eq('value')
+      end
+      it "should set acltype=value" do
+        provider.expects(:zfs).with(:set, "acltype=value", name)
+        provider.send("acltype=", "value")
+      end
+    end
+
+    context "when not available" do
+      it "should get '-' for the acltype property" do
+        provider.expects(:zfs).with(:get, '-H', '-o', 'value', :acltype, name).raises(RuntimeError, 'not valid')
+        expect(provider.send("acltype")).to eq('-')
+      end
+      it "should not error out when trying to set acltype" do
+        provider.expects(:zfs).with(:set, "acltype=value", name).raises(RuntimeError, 'not valid')
+        expect{provider.send("acltype=", "value")}.to_not raise_error
+      end
+    end
+  end
 end

data/spec/unit/provider_spec.rb

@@ -279,6 +279,45 @@ describe Puppet::Provider do
       expect(subject.name).to eq(type.defaultprovider.name)
     end
 
+    describe "regex matches" do
+      it "should match a singular regex" do
+        Facter.expects(:value).with(:osfamily).at_least_once.returns "solaris"
+
+        one = type.provide(:one) do
+          defaultfor :osfamily => /solaris/
+        end
+
+        expect(one).to be_default
+      end
+
+      it "should not match a non-matching regex " do
+        Facter.expects(:value).with(:osfamily).at_least_once.returns "redhat"
+
+        one = type.provide(:one) do
+          defaultfor :osfamily => /solaris/
+        end
+
+        expect(one).to_not be_default
+      end
+
+      it "should allow a mix of regex and string" do
+
+        Facter.expects(:value).with(:operatingsystem).at_least_once.returns "fedora"
+        Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns "24"
+
+        one = type.provide(:one) do
+          defaultfor :operatingsystem => "fedora", :operatingsystemmajrelease => /^2[2-9]$/
+        end
+
+        two = type.provide(:two) do
+          defaultfor :operatingsystem => /fedora/, :operatingsystemmajrelease => '24'
+        end
+
+        expect(one).to be_default
+        expect(two).to be_default
+      end
+    end
+
     describe "when there are multiple defaultfor's of equal specificity" do
       before :each do
         subject.defaultfor :operatingsystem => :os1
@@ -306,6 +345,7 @@ describe Puppet::Provider do
       before :each do
         subject.defaultfor :operatingsystem => :os1
         subject.defaultfor :operatingsystem => :os2, :operatingsystemmajrelease => "42"
+        subject.defaultfor :operatingsystem => :os3, :operatingsystemmajrelease => /^4[2-9]$/
       end
 
       let(:alternate) { type.provide(:alternate) {} }
@@ -318,6 +358,14 @@ describe Puppet::Provider do
         expect(alternate).not_to be_default
       end
 
+      it "should be default for a more specific, but matching, defaultfor with regex" do
+        Facter.expects(:value).with(:operatingsystem).at_least_once.returns :os3
+        Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns "42"
+
+        expect(provider).to be_default
+        expect(alternate).not_to be_default
+      end
+
       it "should be default for a less specific, but matching, defaultfor" do
         Facter.expects(:value).with(:operatingsystem).at_least_once.returns :os1