puppet 5.5.19-x64-mingw32 → 5.5.20-x64-mingw32

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

@@ -78,9 +78,9 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
     let(:group3) { double(:account => 'group3', :domain => '.', :sid => 'group3sid') }
 
     before :each do
-      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group1').and_return(group1)
-      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group2').and_return(group2)
-      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group3').and_return(group3)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group1', any_args).and_return(group1)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group2', any_args).and_return(group2)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group3', any_args).and_return(group3)
     end
 
     it "should return true for same lists of members" do

data/spec/unit/util/pidlock_spec.rb

@@ -22,23 +22,6 @@ describe Puppet::Util::Pidlock do
 
     it "should become locked" do
       @lock.lock
-      if Puppet::Util::Platform.windows?
-        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
-      else
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('puppet')
-      end
-      expect(@lock).to be_locked
-    end
-
-    it "should become locked if puppet is a gem" do
-      @lock.lock
-      unless Puppet::Util::Platform.windows?
-        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('ruby')
-        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
-      else
-        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\tools\ruby25\bin\ruby.exe')
-      end
       expect(@lock).to be_locked
     end
 
@@ -117,23 +100,6 @@ describe Puppet::Util::Pidlock do
   describe "#locked?" do
     it "should return true if locked" do
       @lock.lock
-      if Puppet::Util::Platform.windows?
-        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
-      else
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('puppet')
-      end
-      expect(@lock).to be_locked
-    end
-
-    it "should return true if locked when puppet as gem" do
-      @lock.lock
-      unless Puppet::Util::Platform.windows?
-        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('ruby')
-        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
-      else
-        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\tools\ruby25\bin\ruby.exe')
-      end
       expect(@lock).to be_locked
     end
 
@@ -179,12 +145,6 @@ describe Puppet::Util::Pidlock do
       end
 
       it "should replace with new locks" do
-        if Puppet::Util::Platform.windows?
-          allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(6789).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
-        else
-          allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 6789, '-o', 'comm=']).and_return('puppet')
-          allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 6789, '-o', 'args=']).and_return('puppet')
-        end
         @lock.lock
         expect(Puppet::FileSystem.exist?(@lockfile)).to be_truthy
         expect(@lock.lock_pid).to eq(6789)
@@ -205,6 +165,49 @@ describe Puppet::Util::Pidlock do
     end
   end
 
+  describe "with no access to open the process on Windows", :if => Puppet.features.microsoft_windows? do
+    before(:each) do
+      allow(Process).to receive(:pid).and_return(6789)
+      @lock.lock
+      allow(Process).to receive(:pid).and_return(1234)
+      exception = Puppet::Util::Windows::Error.new('Access Denied', 5) # ERROR_ACCESS_DENIED
+      allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(6789).and_raise(exception)
+      allow(Process).to receive(:kill).with(0, 6789)
+      allow(Process).to receive(:kill).with(0, 1234)
+    end
+
+    it "should be locked" do
+      expect(@lock).to be_locked
+    end
+
+    describe "#lock" do
+      it "should not be possible" do
+        expect(@lock.lock).to be_falsey
+      end
+
+      it "should not overwrite the lock" do
+        @lock.lock
+        expect(@lock).not_to be_mine
+      end
+    end
+
+    describe "#unlock" do
+      it "should not be possible" do
+        expect(@lock.unlock).to be_falsey
+      end
+
+      it "should not remove the lock file" do
+        @lock.unlock
+        expect(Puppet::FileSystem.exist?(@lockfile)).to be_truthy
+      end
+
+      it "should still not be our lock" do
+        @lock.unlock
+        expect(@lock).not_to be_mine
+      end
+    end
+  end
+
   describe "with another process lock" do
     before(:each) do
       # fake our pid to be 1234
@@ -233,6 +236,30 @@ describe Puppet::Util::Pidlock do
       expect(@lock).not_to be_mine
     end
 
+    it "should be locked if the other process is a puppet gem" do
+      File.write(@lockfile, "1234")
+
+      if Puppet::Util::Platform.windows?
+        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(1234).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
+      else
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).and_return('ruby')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
+      end
+      expect(@lock).to be_locked
+    end
+
+    it "should not be mine if the other process is a puppet gem" do
+      File.write(@lockfile, "1234")
+
+      if Puppet::Util::Platform.windows?
+        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(1234).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
+      else
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).and_return('ruby')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
+      end
+      expect(@lock).to_not be_mine
+    end
+
     describe "#lock" do
       it "should not be possible" do
         expect(@lock.lock).to be_falsey

data/spec/unit/util/windows/adsi_spec.rb

@@ -466,8 +466,8 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
           expect(Puppet::Util::Windows::SID).to receive(:octet_string_to_principal).with([0]).and_return(sids[0])
           expect(Puppet::Util::Windows::SID).to receive(:octet_string_to_principal).with([1]).and_return(sids[1])
 
-          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user2').and_return(sids[1])
-          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('DOMAIN2\user3').and_return(sids[2])
+          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user2', false).and_return(sids[1])
+          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('DOMAIN2\user3', false).and_return(sids[2])
 
           expect(Puppet::Util::Windows::ADSI).to receive(:sid_uri).with(sids[0]).and_return("WinNT://DOMAIN/user1,user")
           expect(Puppet::Util::Windows::ADSI).to receive(:sid_uri).with(sids[2]).and_return("WinNT://DOMAIN2/user3,user")
@@ -493,8 +493,8 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
           expect(Puppet::Util::Windows::SID).to receive(:octet_string_to_principal).with([0]).and_return(sids[0])
           expect(Puppet::Util::Windows::SID).to receive(:octet_string_to_principal).with([1]).and_return(sids[1])
 
-          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user2').and_return(sids[1])
-          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('DOMAIN2\user3').and_return(sids[2])
+          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user2', any_args).and_return(sids[1])
+          expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('DOMAIN2\user3', any_args).and_return(sids[2])
 
           expect(Puppet::Util::Windows::ADSI).to receive(:sid_uri).with(sids[2]).and_return("WinNT://DOMAIN2/user3,user")
 

data/spec/unit/util/windows/sid_spec.rb

@@ -201,9 +201,9 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
       principal = subject.ads_to_principal(unresolvable_user)
 
       expect(principal).to be_an_instance_of(Puppet::Util::Windows::SID::Principal)
-      expect(principal.account).to eq('S-1-1-1 (unresolvable)')
+      expect(principal.account).to eq('S-1-1-1')
       expect(principal.domain).to eq(nil)
-      expect(principal.domain_account).to eq('S-1-1-1 (unresolvable)')
+      expect(principal.domain_account).to eq('S-1-1-1')
       expect(principal.sid).to eq('S-1-1-1')
       expect(principal.sid_bytes).to eq(valid_octet_invalid_user)
       expect(principal.account_type).to eq(:SidTypeUnknown)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 5.5.19
+  version: 5.5.20
 platform: x64-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1800,7 +1800,7 @@ files:
 - spec/fixtures/unit/provider/mount/parsed/solaris.fstab
 - spec/fixtures/unit/provider/mount/parsed/solaris.mount
 - spec/fixtures/unit/provider/naginator/define_empty_param
-- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.txt
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-enabled.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -1829,6 +1829,7 @@ files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-plugin-output.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-security.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
+- spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
 - spec/fixtures/unit/provider/parsedfile/simple.txt
@@ -3118,7 +3119,7 @@ test_files:
 - spec/fixtures/unit/provider/mount/parsed/solaris.fstab
 - spec/fixtures/unit/provider/mount/parsed/solaris.mount
 - spec/fixtures/unit/provider/naginator/define_empty_param
-- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.txt
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-enabled.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -3147,6 +3148,7 @@ test_files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-plugin-output.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-security.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
+- spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
 - spec/fixtures/unit/provider/parsedfile/simple.txt