puppet 6.12.0-universal-darwin → 6.13.0-universal-darwin

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

@@ -124,7 +124,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
     describe "on systems with the libuser and forcelocal=true" do
       before do
-         described_class.has_feature :libuser
+         described_class.has_feature :manages_local_users_and_groups
          resource[:forcelocal] = true
       end
 
@@ -188,7 +188,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   describe 'when modifying the password' do
     before do
-      described_class.has_feature :libuser
+      described_class.has_feature :manages_local_users_and_groups
       described_class.has_feature :manages_passwords
       #Setting any resource value here initializes needed variables and methods in the resource and provider
       #Setting a password value here initializes the existence and management of the password parameter itself
@@ -210,7 +210,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   describe '#modify' do
     describe "on systems with the libuser and forcelocal=false" do
       before do
-         described_class.has_feature :libuser
+         described_class.has_feature :manages_local_users_and_groups
          resource[:forcelocal] = false
       end
 
@@ -318,13 +318,13 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   end
 
   describe "#comment" do
-    before { described_class.has_feature :libuser }
+    before { described_class.has_feature :manages_local_users_and_groups }
 
     let(:content) { "myuser:x:x:x:local comment:x:x" }
 
     it "should return the local comment string when forcelocal is true" do
       resource[:forcelocal] = true
-      allow(File).to receive(:open).with('/etc/passwd').and_yield(content)
+      allow(File).to receive(:read).with('/etc/passwd').and_return(content)
       expect(provider.comment).to eq('local comment')
     end
 
@@ -337,7 +337,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   end
 
   describe "#finduser" do
-    before { allow(File).to receive(:open).with('/etc/passwd').and_yield(content) }
+    before { allow(File).to receive(:read).with('/etc/passwd').and_return(content) }
 
     let(:content) { "sample_account:sample_password:sample_uid:sample_gid:sample_gecos:sample_directory:sample_shell" }
     let(:output) do
@@ -361,6 +361,11 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     it "returns false when specified key/value pair is not found" do
       expect(provider.finduser(:account, 'invalid_account')).to eq(false)
     end
+
+    it "reads the user file only once per resource" do
+      expect(File).to receive(:read).with('/etc/passwd').once
+      5.times { provider.finduser(:account, 'sample_account') }
+    end
   end
 
   describe "#check_allow_dup" do
@@ -696,7 +701,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
     describe "on systems with the libuser and forcelocal=false" do
       before do
-         described_class.has_feature :libuser
+         described_class.has_feature :manages_local_users_and_groups
          resource[:forcelocal] = false
       end
 
@@ -708,7 +713,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
     describe "on systems with the libuser and forcelocal=true" do
       before do
-         described_class.has_feature :libuser
+         described_class.has_feature :manages_local_users_and_groups
          resource[:forcelocal] = true
       end
 

data/spec/unit/puppet_pal_2pec.rb

@@ -710,6 +710,9 @@ describe 'Puppet Pal' do
 
       context 'facts are supported such that' do
         it 'they are obtained if they are not given' do
+          facts = Puppet::Node::Facts.new(Puppet[:certname], 'puppetversion' => Puppet.version)
+          Puppet::Node::Facts.indirection.save(facts)
+
           testing_env_dir # creates the structure
           result = Puppet::Pal.in_tmp_environment('pal_env', modulepath: modulepath ) do |ctx|
             ctx.with_script_compiler {|c| c.evaluate_string("$facts =~ Hash and $facts[puppetversion] == '#{Puppet.version}'") }

data/spec/unit/puppet_pal_catalog_spec.rb

@@ -722,6 +722,9 @@ describe 'Puppet Pal' do
 
       context 'facts are supported such that' do
         it 'they are obtained if they are not given' do
+          facts = Puppet::Node::Facts.new(Puppet[:certname], 'puppetversion' => Puppet.version)
+          Puppet::Node::Facts.indirection.save(facts)
+
           testing_env_dir # creates the structure
           result = Puppet::Pal.in_tmp_environment('pal_env', modulepath: modulepath ) do |ctx|
             ctx.with_catalog_compiler {|c| c.evaluate_string("$facts =~ Hash and $facts[puppetversion] == '#{Puppet.version}'") }

data/spec/unit/puppet_spec.rb

@@ -69,4 +69,18 @@ describe Puppet do
       expect(SemanticPuppet::Version).to be_valid(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION)
     end
   end
+
+  context "Settings" do
+    before(:each) do
+      @old_settings = Puppet.settings
+    end
+    after(:each) do
+      Puppet.replace_settings_object(@old_settings)
+    end
+    it "should allow for settings to be redefined with a custom object" do
+      new_settings = double()
+      Puppet.replace_settings_object(new_settings)
+      expect(Puppet.settings).to eq(new_settings)
+    end
+  end
 end

data/spec/unit/ssl/certificate_spec.rb

@@ -135,6 +135,13 @@ describe Puppet::SSL::Certificate do
         expect(cert.custom_extensions).to include('oid' => '1.3.6.1.4.1.34380.1.2.1', 'value' => 'x509 :(')
       end
 
+      it "returns extensions under the ppAuthCertExt" do
+        exts = {'pp_auth_role' => 'taketwo'}
+        cert = build_cert(:extension_requests => exts)
+        sign_wrapped_cert(cert)
+        expect(cert.custom_extensions).to include('oid' => 'pp_auth_role', 'value' => 'taketwo')
+      end
+
       it "doesn't return standard extensions" do
         cert = build_cert(:dns_alt_names => 'foo')
         expect(cert.custom_extensions).to be_empty

data/spec/unit/transaction/persistence_spec.rb

@@ -146,16 +146,7 @@ describe Puppet::Transaction::Persistence do
       Dir.mkdir(Puppet[:transactionstorefile])
       persistence = Puppet::Transaction::Persistence.new
 
-      if Puppet::Util::Platform.windows?
-        expect do
-          persistence.save
-        end.to raise_error do |error|
-          expect(error).to be_a(Puppet::Util::Windows::Error)
-          expect(error.code).to eq(5) # ERROR_ACCESS_DENIED
-        end
-      else
-        expect { persistence.save }.to raise_error(Errno::EISDIR, /Is a directory/)
-      end
+      expect { persistence.save }.to raise_error(Errno::EISDIR, /Is a directory/)
 
       Dir.rmdir(Puppet[:transactionstorefile])
     end

data/spec/unit/type/package_spec.rb

@@ -30,6 +30,10 @@ describe Puppet::Type.type(:package) do
     expect(Puppet::Type.type(:package).provider_feature(:versionable)).not_to be_nil
   end
 
+  it "should have a :supports_flavors feature" do
+    expect(Puppet::Type.type(:package).provider_feature(:supports_flavors)).not_to be_nil
+  end
+
   it "should have a :package_settings feature that requires :package_settings_insync?, :package_settings and :package_settings=" do
     expect(Puppet::Type.type(:package).provider_feature(:package_settings).methods).to eq([:package_settings_insync?, :package_settings, :package_settings=])
   end
@@ -53,6 +57,10 @@ describe Puppet::Type.type(:package) do
     it "should have a package_settings property" do
       expect(Puppet::Type.type(:package).attrtype(:package_settings)).to eq(:property)
     end
+
+    it "should have a flavor property" do
+      expect(Puppet::Type.type(:package).attrtype(:flavor)).to eq(:property)
+    end
   end
 
   describe "when validating attribute values" do

data/spec/unit/type/user_spec.rb

@@ -408,7 +408,6 @@ describe Puppet::Type.type(:user) do
       Puppet::Resource::Catalog.new :testing do |conf|
         [testuser, testrole].each { |resource| conf.add_resource resource }
       end
-      allow(Puppet::Type::User::ProviderDirectoryservice).to receive(:get_macosx_version_major).and_return("10.5")
 
       rel = testuser.autorequire[0]
       expect(rel.source.ref).to eq(testrole.ref)

data/spec/unit/util/pidlock_spec.rb

@@ -9,6 +9,28 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
   before(:each) do
     @lockfile = tmpfile("lock")
     @lock = Puppet::Util::Pidlock.new(@lockfile)
+    @ps_argument_for_current_kernel = @lock.send(:ps_argument_for_current_kernel)
+  end
+
+  describe "#ps pid argument on posix", unless: Puppet::Util::Platform.windows? do
+    before(:each) do
+      @lock.lock
+    end
+
+    it "should allow ps execution" do
+      expect { Puppet::Util::Execution.execute(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-o', 'comm=']) }.not_to raise_error
+      expect { Puppet::Util::Execution.execute(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-o', 'args=']) }.not_to raise_error
+      expect(@lock).to be_locked
+    end
+
+    it "should fallback to -p when default argument fails ps execution" do
+      allow(@lock).to receive(:ps_argument_for_current_kernel).and_return("-eq")
+      allow(Puppet::Util::Execution).to receive(:execute).with(['ps', "-eq", @lock.lock_pid, '-o', 'comm=']).and_raise(Puppet::ExecutionFailure, 'Execution of command returned 1: error')
+
+      expect(Puppet::Util::Execution).to receive(:execute).with(['ps', "-p", @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
+      expect(Puppet::Util::Execution).to receive(:execute).with(['ps', "-p", @lock.lock_pid, '-o', 'args=']).and_return('puppet')
+      expect(@lock).to be_locked
+    end
   end
 
   describe "#lock" do
@@ -25,19 +47,19 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
       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')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @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
+      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:\tools\ruby25\bin\ruby.exe')
+      else
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-o', 'comm=']).and_return('ruby')
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-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
@@ -120,19 +142,19 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
       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')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @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
+      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:\tools\ruby25\bin\ruby.exe')
+      else
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-o', 'comm=']).and_return('ruby')
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, @lock.lock_pid, '-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
@@ -182,8 +204,8 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? 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')
+          allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, 6789, '-o', 'comm=']).and_return('puppet')
+          allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, 6789, '-o', 'args=']).and_return('puppet')
         end
         @lock.lock
         expect(Puppet::FileSystem.exist?(@lockfile)).to be_truthy
@@ -212,8 +234,8 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
       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('puppet')
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'args=']).and_return('puppet')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, 1234, '-o', 'comm=']).and_return('puppet')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', @ps_argument_for_current_kernel, 1234, '-o', 'args=']).and_return('puppet')
       end
       # lock the file
       @lock.lock

data/spec/unit/util/plist_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 require 'puppet/util/plist'
 require 'puppet_spec/files'
@@ -52,6 +54,19 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
     </dict>
     </plist>'
   end
+  let(:ascii_xml_plist) do
+    '<?xml version="1.0" encoding="UTF-8"?>
+     <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+     <plist version="1.0">
+     <dict>
+       <key>RecordName</key>
+         <array>
+           <string>Timișoara</string>
+           <string>Tōkyō</string>
+         </array>
+     </dict>
+     </plist>'.force_encoding(Encoding::US_ASCII)
+  end
   let(:non_plist_data) do
     "Take my love, take my land
      Take me where I cannot stand
@@ -62,6 +77,7 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
     "\xCF\xFA\xED\xFE\a\u0000\u0000\u0001\u0003\u0000\u0000\x80\u0002\u0000\u0000\u0000\u0012\u0000\u0000\u0000\b"
   end
   let(:valid_xml_plist_hash) { {"LastUsedPrinters"=>[{"Network"=>"10.85.132.1", "PrinterID"=>"baskerville_corp_puppetlabs_net"}, {"Network"=>"10.14.96.1", "PrinterID"=>"Statler"}]} }
+  let(:ascii_xml_plist_hash) { {"RecordName"=>["Timișoara", "Tōkyō"]} }
   let(:plist_path) { file_containing('sample.plist', valid_xml_plist) }
   let(:binary_plist_magic_number) { 'bplist00' }
   let(:bad_xml_doctype) { '<!DOCTYPE plist PUBLIC -//Apple Computer' }
@@ -132,6 +148,10 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
       expect(subject.parse_plist(valid_xml_plist)).to eq(valid_xml_plist_hash)
     end
 
+    it "returns a valid hash when an ASCII XML plist is provided" do
+      expect(subject.parse_plist(ascii_xml_plist)).to eq(ascii_xml_plist_hash)
+    end
+
     it "raises a debug message and replaces a bad XML plist doctype should one be encountered" do
       expect(subject).to receive(:new_cfpropertylist).with({:data => good_xml_doctype}).and_return('plist_object')
       allow(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object')

data/spec/unit/util/storage_spec.rb

@@ -201,14 +201,7 @@ describe Puppet::Util::Storage do
       Dir.mkdir(Puppet[:statefile])
       Puppet::Util::Storage.cache(:yayness)
 
-      if Puppet::Util::Platform.windows?
-        expect { Puppet::Util::Storage.store }.to raise_error do |error|
-          expect(error).to be_a(Puppet::Util::Windows::Error)
-          expect(error.code).to eq(5) # ERROR_ACCESS_DENIED
-        end
-      else
-        expect { Puppet::Util::Storage.store }.to raise_error(Errno::EISDIR, /Is a directory/)
-      end
+      expect { Puppet::Util::Storage.store }.to raise_error(Errno::EISDIR, /Is a directory/)
 
       Dir.rmdir(Puppet[:statefile])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.12.0
+  version: 6.13.0
 platform: universal-darwin
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -19,7 +19,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
@@ -585,6 +585,8 @@ files:
 - lib/puppet/http/retry_after_handler.rb
 - lib/puppet/http/service.rb
 - lib/puppet/http/service/ca.rb
+- lib/puppet/http/service/compiler.rb
+- lib/puppet/http/service/file_server.rb
 - lib/puppet/http/service/report.rb
 - lib/puppet/http/session.rb
 - lib/puppet/indirector.rb
@@ -2092,6 +2094,8 @@ files:
 - spec/unit/http/client_spec.rb
 - spec/unit/http/resolver_spec.rb
 - spec/unit/http/service/ca_spec.rb
+- spec/unit/http/service/compiler_spec.rb
+- spec/unit/http/service/file_server_spec.rb
 - spec/unit/http/service/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb
@@ -3347,6 +3351,8 @@ test_files:
 - spec/unit/http/client_spec.rb
 - spec/unit/http/resolver_spec.rb
 - spec/unit/http/service/ca_spec.rb
+- spec/unit/http/service/compiler_spec.rb
+- spec/unit/http/service/file_server_spec.rb
 - spec/unit/http/service/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb