puppet 3.1.1 → 3.2.0.rc1

data/spec/unit/provider/service/upstart_spec.rb

@@ -42,7 +42,7 @@ describe Puppet::Type.type(:service).provider(:upstart) do
     end
 
     it "should not find excluded services" do
-      processes = "wait-for-state stop/waiting"
+      processes = "wait-for-state stop/waiting\nportmap-wait start/running"
       provider_class.stubs(:execpipe).yields(processes)
       provider_class.instances.should be_empty
     end

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

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:user).provider(:aix)
+
+describe provider_class do
+
+  let(:lsuser_all_example) do
+    <<-OUTPUT
+root id=0 pgrp=system groups=system,bin,sys,security,cron,audit,lp home=/root shell=/usr/bin/bash auditclasses=general login=true su=true rlogin=true daemon=true admin=true sugroups=ALL admgroups=lolt,allstaff tpath=nosak ttys=ALL expires=0 auth1=SYSTEM auth2=NONE umask=22 registry=files SYSTEM=compat logintimes= loginretries=0 pwdwarntime=0 account_locked=false minage=0 maxage=0 maxexpired=-1 minalpha=0 minother=0 mindiff=0 maxrepeats=8 minlen=0 histexpire=0 histsize=0 pwdchecks= dictionlist= default_roles= fsize=2097151 cpu=-1 data=262144 stack=65536 core=2097151 rss=65536 nofiles=2000 time_last_login=1358465855 time_last_unsuccessful_login=1358378454 tty_last_login=ssh tty_last_unsuccessful_login=ssh host_last_login=rpm-builder.puppetlabs.lan host_last_unsuccessful_login=192.168.100.78 unsuccessful_login_count=0 roles=
+guest id=100 pgrp=usr groups=usr home=/home/guest login=true su=true rlogin=true daemon=true admin=false sugroups=ALL admgroups= tpath=nosak ttys=ALL expires=0 auth1=SYSTEM auth2=NONE umask=22 registry=files SYSTEM=compat logintimes= loginretries=0 pwdwarntime=0 account_locked=false minage=0 maxage=0 maxexpired=-1 minalpha=0 minother=0 mindiff=0 maxrepeats=8 minlen=0 histexpire=0 histsize=0 pwdchecks= dictionlist= default_roles= fsize=2097151 cpu=-1 data=262144 stack=65536 core=2097151 rss=65536 nofiles=2000 roles=
+    OUTPUT
+  end
+
+  let(:lsgroup_all_example) do
+    <<-OUTPUT
+root id=0 pgrp=system groups=system,bin,sys,security,cron,audit,lp home=/root shell=/usr/bin/bash
+guest id=100 pgrp=usr groups=usr home=/home/guest
+    OUTPUT
+  end
+
+  before do
+    @resource = stub('resource')
+    @provider = provider_class.new(@resource)
+  end
+
+  it "should be able to return a group name based on a group ID" do
+    @provider.stubs(:lsgroupscmd)
+
+    @provider.stubs(:execute).returns(lsgroup_all_example)
+
+    @provider.groupname_by_id(100).should == 'guest'
+  end
+
+  it "should be able to list all users" do
+    provider_class.stubs(:command)
+
+    provider_class.stubs(:execute).returns(lsuser_all_example)
+
+    provider_class.list_all.should == ['root', 'guest']
+  end
+
+end

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

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby -S rspec
+# encoding: ASCII-8BIT
 require 'spec_helper'
 require 'facter/util/plist'
 

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

@@ -17,55 +17,61 @@ describe provider_class do
 
     it "should run pw with no additional flags when no properties are given" do
       provider.addcmd.must == [provider_class.command(:pw), "useradd", "testuser"]
-      provider.expects(:execute).with([provider_class.command(:pw), "useradd", "testuser"])
+      provider.expects(:execute).with([provider_class.command(:pw), "useradd", "testuser"], kind_of(Hash))
       provider.create
     end
 
     it "should use -o when allowdupe is enabled" do
       resource[:allowdupe] = true
-      provider.expects(:execute).with(includes("-o"))
+      provider.expects(:execute).with(includes("-o"), kind_of(Hash))
       provider.create
     end
 
     it "should use -c with the correct argument when the comment property is set" do
       resource[:comment] = "Testuser Name"
-      provider.expects(:execute).with(all_of(includes("-c"), includes("Testuser Name")))
+      provider.expects(:execute).with(all_of(includes("-c"), includes("Testuser Name")), kind_of(Hash))
       provider.create
     end
 
     it "should use -e with the correct argument when the expiry property is set" do
       resource[:expiry] = "2010-02-19"
-      provider.expects(:execute).with(all_of(includes("-e"), includes("19-02-2010")))
+      provider.expects(:execute).with(all_of(includes("-e"), includes("19-02-2010")), kind_of(Hash))
+      provider.create
+    end
+
+    it "should use -e 00-00-0000 if the expiry property has to be removed" do
+      resource[:expiry] = :absent
+      provider.expects(:execute).with(all_of(includes("-e"), includes("00-00-0000")), kind_of(Hash))
       provider.create
     end
 
     it "should use -g with the correct argument when the gid property is set" do
       resource[:gid] = 12345
-      provider.expects(:execute).with(all_of(includes("-g"), includes(12345)))
+      provider.expects(:execute).with(all_of(includes("-g"), includes(12345)), kind_of(Hash))
       provider.create
     end
 
     it "should use -G with the correct argument when the groups property is set" do
       resource[:groups] = "group1"
-      provider.expects(:execute).with(all_of(includes("-G"), includes("group1")))
+      provider.expects(:execute).with(all_of(includes("-G"), includes("group1")), kind_of(Hash))
       provider.create
     end
 
     it "should use -G with all the given groups when the groups property is set to an array" do
       resource[:groups] = ["group1", "group2"]
-      provider.expects(:execute).with(all_of(includes("-G"), includes("group1,group2")))
+      provider.expects(:execute).with(all_of(includes("-G"), includes("group1,group2")), kind_of(Hash))
       provider.create
     end
 
     it "should use -d with the correct argument when the home property is set" do
       resource[:home] = "/home/testuser"
-      provider.expects(:execute).with(all_of(includes("-d"), includes("/home/testuser")))
+      provider.expects(:execute).with(all_of(includes("-d"), includes("/home/testuser")), kind_of(Hash))
       provider.create
     end
 
     it "should use -m when the managehome property is enabled" do
       resource[:managehome] = true
-      provider.expects(:execute).with(includes("-m"))
+      provider.expects(:execute).with(includes("-m"), kind_of(Hash))
       provider.create
     end
 
@@ -78,13 +84,13 @@ describe provider_class do
 
     it "should use -s with the correct argument when the shell property is set" do
       resource[:shell] = "/bin/sh"
-      provider.expects(:execute).with(all_of(includes("-s"), includes("/bin/sh")))
+      provider.expects(:execute).with(all_of(includes("-s"), includes("/bin/sh")), kind_of(Hash))
       provider.create
     end
 
     it "should use -u with the correct argument when the uid property is set" do
       resource[:uid] = 12345
-      provider.expects(:execute).with(all_of(includes("-u"), includes(12345)))
+      provider.expects(:execute).with(all_of(includes("-u"), includes(12345)), kind_of(Hash))
       provider.create
     end
 
@@ -93,7 +99,7 @@ describe provider_class do
       resource[:password] = "*"
       provider.addcmd.should_not include("-p")
       provider.expects(:password=)
-      provider.expects(:execute).with(Not(includes("-p")))
+      provider.expects(:execute).with(Not(includes("-p")), kind_of(Hash))
       provider.create
     end
   end
@@ -150,6 +156,12 @@ describe provider_class do
       provider.expiry = "2011-02-19"
     end
 
+    it "should use -e with the correct argument when the expiry property is removed" do
+      resource[:expiry] = :absent
+      provider.expects(:execute).with(all_of(includes("-e"), includes("00-00-0000")))
+      provider.expiry = :absent
+    end
+
     it "should use -g with the correct argument when the gid property is changed" do
       resource[:gid] = 12345
       provider.expects(:execute).with(all_of(includes("-g"), includes(54321)))

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

@@ -116,7 +116,7 @@ describe Puppet::Type.type(:user).provider(:user_role_add), :unless => Puppet.fe
 
   describe "with :allow_duplicates" do
     before do
-      resource.expects(:allowdupe?).returns true
+      resource.stubs(:allowdupe?).returns true
       provider.stubs(:is_role?).returns(false)
       provider.stubs(:execute)
       resource.stubs(:system?).returns false

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

@@ -6,6 +6,7 @@ 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(: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(:delete).returns '/usr/sbin/userdel'
   end
@@ -21,11 +22,38 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   let(:provider) { described_class.new(:name => 'myuser') }
 
+
+  let(:shadow_entry) {
+    return unless Puppet.features.libshadow?
+    Struct::PasswdEntry.new(
+      'myuser', # login name
+      '$6$FvW8Ib8h$qQMI/CR9m.QzIicZKutLpBgCBBdrch1IX0rTnxuI32K1pD9.RXZrmeKQlaC.RzODNuoUtPPIyQDufunvLOQWF0', # encrypted password
+      15573, # date of last password change
+      10,    # minimum password age
+      20,    # maximum password age
+      7,     # password warning period
+      -1,    # password inactivity period
+      15706, # account expiration date
+      -1     # reserved field
+    )
+  }
+
   describe "#create" do
 
+    before do
+      provider.stubs(:exists?).returns(false)
+    end
+
+    it "should add -g when no gid is specified and group already exists" do
+      Puppet::Util.stubs(:gid).returns(true)
+      resource[:ensure] = :present
+      provider.expects(:execute).with(includes('-g'), kind_of(Hash))
+      provider.create
+    end
+
     it "should add -o when allowdupe is enabled and the user is being created" do
       resource[:allowdupe] = true
-      provider.expects(:execute).with(includes('-o'))
+      provider.expects(:execute).with(includes('-o'), kind_of(Hash))
       provider.create
     end
 
@@ -33,7 +61,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       it "should add -r when system is enabled" do
         resource[:system] = :true
         provider.should be_system_users
-        provider.expects(:execute).with(includes('-r'))
+        provider.expects(:execute).with(includes('-r'), kind_of(Hash))
         provider.create
       end
     end
@@ -42,7 +70,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       it "should not add -r when system is enabled" do
         resource[:system] = :true
         provider.should_not be_system_users
-        provider.expects(:execute).with(['/usr/sbin/useradd', 'myuser'])
+        provider.expects(:execute).with(['/usr/sbin/useradd', 'myuser'], kind_of(Hash))
         provider.create
       end
     end
@@ -51,10 +79,54 @@ 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
-      provider.expects(:execute).with(includes('/usr/sbin/useradd'))
+      provider.expects(:execute).with(includes('/usr/sbin/useradd'), kind_of(Hash))
       provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, 'myuser'])
       provider.create
     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 luseradd instead of useradd" do
+        provider.expects(:execute).with(includes('/usr/sbin/luseradd'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.create
+      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.create
+      end
+
+      it "should raise an exception for duplicate UIDs" do
+        resource[:uid] = 505
+        provider.stubs(:finduser).returns(true)
+        lambda { provider.create }.should 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
+        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.create 
+      end
+
+      it "should not use -m when managehome set" do
+        resource[:managehome] = :true
+        provider.expects(:execute).with(Not(includes('-m')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.create 
+      end
+
+      it "should not use -e with luseradd, should call usermod 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.create
+      end
+    end
+
   end
 
   describe "#uid=" do
@@ -65,11 +137,29 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     end
   end
 
-  describe "#check_allow_dup" do
-    it "should check allow dup" do
-      resource.expects(:allowdupe?)
-      provider.check_allow_dup
+  describe "#expiry=" 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.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.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.expiry = :absent
     end
+  end
+
+  describe "#check_allow_dup" do
 
     it "should return an array with a flag if dup is allowed" do
       resource[:allowdupe] = :true
@@ -111,10 +201,16 @@ 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'))
+      provider.expects(:execute).with(includes('-m'), kind_of(Hash))
       provider.create
     end
 
+    it "should return an array with -m flag if home is managed and the home directory is modified" do
+      resource[:managehome] = :true
+      provider.expects(:execute).with(includes('-m'))
+      provider.home = '/tmp/myuser'
+    end
+
     it "should return an array with -r flag if home is managed" do
       resource[:managehome] = :true
       resource[:ensure] = :absent
@@ -126,14 +222,14 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     it "should use -M flag if home is not managed and on Redhat" do
       Facter.stubs(:value).with(:osfamily).returns("RedHat")
       resource[:managehome] = :false
-      provider.expects(:execute).with(includes('-M'))
+      provider.expects(:execute).with(includes('-M'), kind_of(Hash))
       provider.create
     end
 
     it "should not use -M flag if home is not managed and not on Redhat" do
       Facter.stubs(:value).with(:osfamily).returns("not RedHat")
       resource[:managehome] = :false
-      provider.expects(:execute).with(Not(includes('-M')))
+      provider.expects(:execute).with(Not(includes('-M')), kind_of(Hash))
       provider.create
     end
   end
@@ -143,6 +239,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       resource[:allowdupe] = :true
       resource[:managehome] = :true
       resource[:system] = :true
+      resource[:groups] = [ 'somegroup' ]
     end
 
     it "should call command with :add" do
@@ -190,19 +287,86 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       end
     end
 
-    it "should return an array with full command" do
+    it "should return an array with the full command and expiry as MM/DD/YY when on Solaris" do
+      Facter.stubs(:value).with(:operatingsystem).returns 'Solaris'
       described_class.expects(:system_users?).returns true
-      provider.stubs(:add_properties).returns(["-G", "somegroup"])
       resource[:expiry] = "2012-08-18"
+      provider.addcmd.must == ['/usr/sbin/useradd', '-e', '08/18/2012', '-G', 'somegroup', '-o', '-m', '-r', 'myuser']
+    end
 
-      provider.addcmd.must == ["/usr/sbin/useradd", "-G", "somegroup", "-o", "-m", '-e 2012-08-18', "-r", "myuser"]
+    it "should return an array with the full command and expiry as YYYY-MM-DD when not on Solaris" do
+      Facter.stubs(:value).with(:operatingsystem).returns 'not_solaris'
+      described_class.expects(:system_users?).returns true
+      resource[:expiry] = "2012-08-18"
+      provider.addcmd.must == ['/usr/sbin/useradd', '-e', '2012-08-18', '-G', 'somegroup', '-o', '-m', '-r', 'myuser']
     end
 
     it "should return an array without -e if expiry is undefined full command" do
       described_class.expects(:system_users?).returns true
-      provider.stubs(:add_properties).returns(["-G", "somegroup"])
       provider.addcmd.must == ["/usr/sbin/useradd", "-G", "somegroup", "-o", "-m", "-r", "myuser"]
     end
+
+    it "should pass -e \"\" if the expiry has to be removed" do
+      described_class.expects(:system_users?).returns true
+      resource[:expiry] = :absent
+
+      provider.addcmd.must == ['/usr/sbin/useradd', '-e', '', '-G', 'somegroup', '-o', '-m', '-r', 'myuser']
+    end
+  end
+
+  {
+    :password_min_age => 10,
+    :password_max_age => 20,
+    :password         => '$6$FvW8Ib8h$qQMI/CR9m.QzIicZKutLpBgCBBdrch1IX0rTnxuI32K1pD9.RXZrmeKQlaC.RzODNuoUtPPIyQDufunvLOQWF0'
+  }.each_pair do |property, expected_value|
+    describe "##{property}" do
+      before :each do
+        resource # just to link the resource to the provider
+      end
+
+      it "should return absent if libshadow feature is not present" do
+        Puppet.features.stubs(:libshadow?).returns false
+        # Shadow::Passwd.expects(:getspnam).never # if we really don't have libshadow we dont have Shadow::Passwd either
+        provider.send(property).should == :absent
+      end
+
+      it "should return absent if user cannot be found", :if => Puppet.features.libshadow? do
+        Shadow::Passwd.expects(:getspnam).with('myuser').returns nil
+        provider.send(property).should == :absent
+      end
+
+      it "should return the correct value if libshadow is present", :if => Puppet.features.libshadow? do
+        Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+        provider.send(property).should == expected_value
+      end
+    end
+  end
+
+  describe '#expiry' do
+    before :each do
+      resource # just to link the resource to the provider
+    end
+
+    it "should return absent if libshadow feature is not present" do
+      Puppet.features.stubs(:libshadow?).returns false
+      provider.expiry.should == :absent
+    end
+
+    it "should return absent if user cannot be found", :if => Puppet.features.libshadow? do
+      Shadow::Passwd.expects(:getspnam).with('myuser').returns nil
+      provider.expiry.should == :absent
+    end
+
+    it "should return absent if expiry is -1", :if => Puppet.features.libshadow? do
+      shadow_entry.sp_expire = -1
+      Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+      provider.expiry.should == :absent
+    end
+
+    it "should convert to YYYY-MM-DD", :if => Puppet.features.libshadow? do
+      Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+      provider.expiry.should == '2013-01-01'
+    end
   end
 
   describe "#passcmd" do