puppet 6.4.4 → 6.4.5

data/spec/unit/util/logging_spec.rb

@@ -13,6 +13,39 @@ class LoggingTester
   include Puppet::Util::Logging
 end
 
+class PuppetStackCreator
+  def raise_error(exception_class)
+    case exception_class
+    when Puppet::ParseErrorWithIssue
+      raise exception_class.new('Oops', '/tmp/test.pp', 30, 15, nil, :SYNTAX_ERROR)
+    when Puppet::ParseError
+      raise exception_class.new('Oops', '/tmp/test.pp', 30, 15)
+    else
+      raise exception_class.new('Oops')
+    end
+  end
+
+  def call_raiser(exception_class)
+    Puppet::Pops::PuppetStack.stack('/tmp/test2.pp', 20, self, :raise_error, [exception_class])
+  end
+
+  def two_frames_and_a_raise(exception_class)
+    Puppet::Pops::PuppetStack.stack('/tmp/test3.pp', 15, self, :call_raiser, [exception_class])
+  end
+
+  def outer_rescue(exception_class)
+    begin
+      two_frames_and_a_raise(exception_class)
+    rescue Puppet::Error => e
+      Puppet.log_exception(e)
+    end
+  end
+
+  def run(exception_class)
+    Puppet::Pops::PuppetStack.stack('/tmp/test4.pp', 10, self, :outer_rescue, [exception_class])
+  end
+end
+
 describe Puppet::Util::Logging do
   before do
     @logger = LoggingTester.new
@@ -340,6 +373,173 @@ original
 .*2\.rb:2:in `b'
 .*3\.rb:1/)
     end
+
+    describe "when trace is disabled" do
+      it 'excludes backtrace for RuntimeError in log message' do
+        begin
+          raise RuntimeError, 'Oops'
+        rescue RuntimeError => e
+          Puppet.log_exception(e)
+        end
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+        expect(log.message).to_not match('/logging_spec.rb')
+        expect(log.backtrace).to be_nil
+      end
+
+      it "backtrace member is unset when logging ParseErrorWithIssue" do
+        begin
+          raise Puppet::ParseErrorWithIssue.new('Oops', '/tmp/test.pp', 30, 15, nil, :SYNTAX_ERROR)
+        rescue RuntimeError => e
+          Puppet.log_exception(e)
+        end
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+        expect(log.message).to_not match('/logging_spec.rb')
+        expect(log.backtrace).to be_nil
+      end
+    end
+
+    describe "when trace is enabled" do
+      it 'includes backtrace for RuntimeError in log message when enabled globally' do
+        Puppet[:trace] = true
+        begin
+          raise RuntimeError, 'Oops'
+        rescue RuntimeError => e
+          Puppet.log_exception(e, :default)
+        end
+        Puppet[:trace] = false
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+        expect(log.message).to match('/logging_spec.rb')
+        expect(log.backtrace).to be_nil
+      end
+
+      it 'includes backtrace for RuntimeError in log message when enabled via option' do
+        begin
+          raise RuntimeError, 'Oops'
+        rescue RuntimeError => e
+          Puppet.log_exception(e, :default, :trace => true)
+        end
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+        expect(log.message).to match('/logging_spec.rb')
+        expect(log.backtrace).to be_nil
+      end
+
+
+      it "backtrace member is set when logging ParseErrorWithIssue" do
+        begin
+          raise Puppet::ParseErrorWithIssue.new('Oops', '/tmp/test.pp', 30, 15, nil, :SYNTAX_ERROR)
+        rescue RuntimeError => e
+          Puppet.log_exception(e, :default, :trace => true)
+        end
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+        expect(log.message).to_not match('/logging_spec.rb')
+        expect(log.backtrace).to be_a(Array)
+        expect(log.backtrace[0]).to match('/logging_spec.rb')
+      end
+      it "backtrace has interleaved PuppetStack when logging ParseErrorWithIssue" do
+        Puppet[:trace] = true
+        PuppetStackCreator.new.run(Puppet::ParseErrorWithIssue)
+        Puppet[:trace] = false
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+        expect(log.message).to_not match('/logging_spec.rb')
+        expect(log.backtrace[0]).to match('/logging_spec.rb')
+
+        expect(log.backtrace[1]).to match('/tmp/test2.pp:20')
+        puppetstack = log.backtrace.select { |l| l =~ /tmp\/test\d\.pp/ }
+
+        expect(puppetstack.length).to equal 3
+      end
+
+      it "message has interleaved PuppetStack when logging ParseError" do
+        Puppet[:trace] = true
+        PuppetStackCreator.new.run(Puppet::ParseError)
+        Puppet[:trace] = false
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+
+        log_lines = log.message.split("\n")
+        expect(log_lines[1]).to match('/logging_spec.rb')
+        expect(log_lines[2]).to match('/tmp/test2.pp:20')
+        puppetstack = log_lines.select { |l| l =~ /tmp\/test\d\.pp/ }
+
+        expect(puppetstack.length).to equal 3
+      end
+    end
+
+    describe "when trace is disabled but puppet_trace is enabled" do
+      it "includes only PuppetStack as backtrace member with ParseErrorWithIssue" do
+        Puppet[:trace] = false
+        Puppet[:puppet_trace] = true
+        PuppetStackCreator.new.run(Puppet::ParseErrorWithIssue)
+        Puppet[:trace] = false
+        Puppet[:puppet_trace] = false
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+
+        expect(log.backtrace[0]).to match('/tmp/test2.pp:20')
+        expect(log.backtrace.length).to equal 3
+      end
+
+      it "includes only PuppetStack in message with ParseError" do
+        Puppet[:trace] = false
+        Puppet[:puppet_trace] = true
+        PuppetStackCreator.new.run(Puppet::ParseError)
+        Puppet[:trace] = false
+        Puppet[:puppet_trace] = false
+
+        expect(@logs.size).to eq(1)
+        log = @logs[0]
+
+        log_lines = log.message.split("\n")
+        expect(log_lines[1]).to match('/tmp/test2.pp:20')
+        puppetstack = log_lines.select { |l| l =~ /tmp\/test\d\.pp/ }
+
+        expect(puppetstack.length).to equal 3
+      end
+    end
+
+    it 'includes position details for ParseError in log message' do
+      begin
+        raise Puppet::ParseError.new('Oops', '/tmp/test.pp', 30, 15)
+      rescue RuntimeError => e
+        Puppet.log_exception(e)
+      end
+
+      expect(@logs.size).to eq(1)
+      log = @logs[0]
+      expect(log.message).to match(/ \(file: \/tmp\/test\.pp, line: 30, column: 15\)/)
+      expect(log.message).to be(log.to_s)
+    end
+
+    it 'excludes position details for ParseErrorWithIssue from log message' do
+      begin
+        raise Puppet::ParseErrorWithIssue.new('Oops', '/tmp/test.pp', 30, 15, nil, :SYNTAX_ERROR)
+      rescue RuntimeError => e
+        Puppet.log_exception(e)
+      end
+
+      expect(@logs.size).to eq(1)
+      log = @logs[0]
+      expect(log.message).to_not match(/ \(file: \/tmp\/test\.pp, line: 30, column: 15\)/)
+      expect(log.to_s).to match(/ \(file: \/tmp\/test\.pp, line: 30, column: 15\)/)
+      expect(log.issue_code).to eq(:SYNTAX_ERROR)
+      expect(log.file).to eq('/tmp/test.pp')
+      expect(log.line).to eq(30)
+      expect(log.pos).to eq(15)
+    end
   end
 
   describe 'when Facter' do

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

@@ -41,6 +41,19 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
     end
   end
 
+  describe ".domain_role" do
+    DOMAIN_ROLES = Puppet::Util::Platform.windows? ? Puppet::Util::Windows::ADSI::DOMAIN_ROLES : {}
+
+    DOMAIN_ROLES.each do |id, role|
+      it "should be able to return #{role} as the domain role of the computer" do
+        Puppet::Util::Windows::ADSI.instance_variable_set(:@domain_role, nil)
+        domain_role = [double('WMI', :DomainRole => id)]
+        allow(Puppet::Util::Windows::ADSI).to receive(:execquery).with('select DomainRole from Win32_ComputerSystem').and_return(domain_role)
+        expect(Puppet::Util::Windows::ADSI.domain_role).to eq(role)
+      end
+    end
+  end
+
   describe ".sid_uri" do
     it "should raise an error when the input is not a SID Principal" do
       [Object.new, {}, 1, :symbol, '', nil].each do |input|
@@ -56,6 +69,32 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
     end
   end
 
+  shared_examples 'a local only resource query' do |klass, account_type|
+    before(:each) do
+      allow(Puppet::Util::Windows::ADSI).to receive(:domain_role).and_return(:MEMBER_SERVER)
+    end
+
+    it "should be able to check for a local resource" do
+      local_domain = 'testcomputername'
+      principal = double('Principal', :account => resource_name, :domain => local_domain, :account_type => account_type)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with(resource_name).and_return(principal)
+      expect(klass.exists?(resource_name)).to eq(true)
+    end
+
+    it "should be case insensitive when comparing the domain with the computer name" do
+      local_domain = 'TESTCOMPUTERNAME'
+      principal = double('Principal', :account => resource_name, :domain => local_domain, :account_type => account_type)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with(resource_name).and_return(principal)
+      expect(klass.exists?(resource_name)).to eq(true)
+    end
+
+    it "should return false if no local resource exists" do
+      principal = double('Principal', :account => resource_name, :domain => 'AD_DOMAIN', :account_type => account_type)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with(resource_name).and_return(principal)
+      expect(klass.exists?(resource_name)).to eq(false)
+    end
+  end
+
   describe Puppet::Util::Windows::ADSI::User do
     let(:username)  { 'testuser' }
     let(:domain)    { 'DOMAIN' }
@@ -103,6 +142,12 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
       expect(user.native_object).to eq(adsi_user)
     end
 
+    context "when domain-joined" do
+      it_should_behave_like 'a local only resource query', Puppet::Util::Windows::ADSI::User, :SidTypeUser do
+        let(:resource_name) { username }
+      end
+    end
+
     it "should be able to check the existence of a user" do
       expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with(username).and_return(nil)
       expect(Puppet::Util::Windows::ADSI).to receive(:connect).with("WinNT://./#{username},user").and_return(connection)
@@ -543,6 +588,12 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
       expect(Puppet::Util::Windows::ADSI::Group.uri(groupname, ntauthority_localized)).to eq("WinNT://./#{groupname},group")
     end
 
+    context "when domain-joined" do
+      it_should_behave_like 'a local only resource query', Puppet::Util::Windows::ADSI::Group, :SidTypeGroup do
+        let(:resource_name) { groupname }
+      end
+    end
+
     it "should be able to create a group" do
       adsi_group = double("adsi")
 

data/spec/unit/x509/cert_provider_spec.rb

@@ -260,11 +260,11 @@ describe Puppet::X509::CertProvider do
         }.to raise_error(RuntimeError, 'Certname "signed/../key" must not contain unprintable or non-ASCII characters')
       end
 
-      it 'returns nil if `hostprivkey` is overridden' do
+      it 'prefers `hostprivkey` if set' do
         Puppet[:certname] = 'foo'
         Puppet[:hostprivkey] = File.join(fixture_dir, "signed-key.pem")
 
-        expect(provider.load_private_key('foo')).to be_nil
+        expect(provider.load_private_key('foo')).to be_a(OpenSSL::PKey::RSA)
       end
 
       it 'raises if the private key is unreadable' do
@@ -318,11 +318,11 @@ describe Puppet::X509::CertProvider do
         }.to raise_error(RuntimeError, 'Certname "tom/../key" must not contain unprintable or non-ASCII characters')
       end
 
-      it 'returns nil if `hostcert` is overridden' do
+      it 'prefers `hostcert` if set' do
         Puppet[:certname] = 'foo'
         Puppet[:hostcert] = File.join(fixture_dir, "signed.pem")
 
-        expect(provider.load_client_cert('foo')).to be_nil
+        expect(provider.load_client_cert('foo')).to be_a(OpenSSL::X509::Certificate)
       end
 
       it 'raises if the certificate is unreadable' do
@@ -413,6 +413,16 @@ describe Puppet::X509::CertProvider do
           provider.save_private_key(name, private_key)
         }.to raise_error(Puppet::Error, "Failed to save private key for '#{name}'")
       end
+
+      it 'prefers `hostprivkey` if set' do
+        overridden_path = tmpfile('hostprivkey')
+        Puppet[:hostprivkey] = overridden_path
+
+        provider.save_private_key(name, private_key)
+
+        expect(File).to_not exist(path)
+        expect(File).to exist(overridden_path)
+      end
     end
 
     context 'certs' do
@@ -452,6 +462,16 @@ describe Puppet::X509::CertProvider do
           provider.save_client_cert(name, client_cert)
         }.to raise_error(Puppet::Error, "Failed to save client certificate for '#{name}'")
       end
+
+      it 'prefers `hostcert` if set' do
+        overridden_path = tmpfile('hostcert')
+        Puppet[:hostcert] = overridden_path
+
+        provider.save_client_cert(name, client_cert)
+
+        expect(File).to_not exist(path)
+        expect(File).to exist(overridden_path)
+      end
     end
 
     context 'requests' do

data/tasks/manpages.rake

@@ -43,6 +43,7 @@ task :gen_manpages do
 #   IO.popen("#{ronn} #{ronn_args} > ./man/man5/puppet.conf.5", 'w') do |fh|
 #     fh.write %x{RUBYLIB=./lib:$RUBYLIB bin/puppetdoc --reference configuration}
 #   end
+  %x{mkdir -p ./man/man5 ./man/man8}
   %x{RUBYLIB=./lib:$RUBYLIB bin/puppet doc --reference configuration > ./man/man5/puppetconf.5.ronn}
   %x{#{ronn} #{ronn_args} ./man/man5/puppetconf.5.ronn}
   FileUtils.mv("./man/man5/puppetconf.5", "./man/man5/puppet.conf.5")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.4.4
+  version: 6.4.5
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -827,7 +827,6 @@ files:
 - lib/puppet/pops/loader/loader.rb
 - lib/puppet/pops/loader/loader_paths.rb
 - lib/puppet/pops/loader/module_loaders.rb
-- lib/puppet/pops/loader/null_loader.rb
 - lib/puppet/pops/loader/predefined_loader.rb
 - lib/puppet/pops/loader/puppet_function_instantiator.rb
 - lib/puppet/pops/loader/puppet_plan_instantiator.rb
@@ -994,6 +993,7 @@ files:
 - lib/puppet/provider/package/aptrpm.rb
 - lib/puppet/provider/package/blastwave.rb
 - lib/puppet/provider/package/dnf.rb
+- lib/puppet/provider/package/dnfmodule.rb
 - lib/puppet/provider/package/dpkg.rb
 - lib/puppet/provider/package/fink.rb
 - lib/puppet/provider/package/freebsd.rb
@@ -1664,6 +1664,7 @@ files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.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
@@ -1714,9 +1715,6 @@ files:
 - spec/fixtures/unit/util/filetype/suntab_output
 - spec/fixtures/unit/util/monkey_patches/x509.pem
 - spec/fixtures/unit/util/rdoc/basic.pp
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_get/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_head/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_post/should_yield_to_the_block.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml
@@ -1790,6 +1788,7 @@ files:
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/file_spec.rb
+- spec/integration/type/notify_spec.rb
 - spec/integration/type/package_spec.rb
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type_spec.rb
@@ -2319,6 +2318,7 @@ files:
 - spec/unit/provider/package/aptrpm_spec.rb
 - spec/unit/provider/package/base_spec.rb
 - spec/unit/provider/package/dnf_spec.rb
+- spec/unit/provider/package/dnfmodule_spec.rb
 - spec/unit/provider/package/dpkg_spec.rb
 - spec/unit/provider/package/freebsd_spec.rb
 - spec/unit/provider/package/gem_spec.rb
@@ -2348,6 +2348,7 @@ files:
 - spec/unit/provider/package/windows_spec.rb
 - spec/unit/provider/package/yum_spec.rb
 - spec/unit/provider/package/zypper_spec.rb
+- spec/unit/provider/package_targetable_spec.rb
 - spec/unit/provider/parsedfile_spec.rb
 - spec/unit/provider/service/base_spec.rb
 - spec/unit/provider/service/bsd_spec.rb
@@ -2574,7 +2575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Puppet, an automated configuration management tool
@@ -2900,6 +2901,7 @@ test_files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.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
@@ -2950,9 +2952,6 @@ test_files:
 - spec/fixtures/unit/util/filetype/suntab_output
 - spec/fixtures/unit/util/monkey_patches/x509.pem
 - spec/fixtures/unit/util/rdoc/basic.pp
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_get/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_head/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_post/should_yield_to_the_block.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml
@@ -3026,6 +3025,7 @@ test_files:
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/file_spec.rb
+- spec/integration/type/notify_spec.rb
 - spec/integration/type/package_spec.rb
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type_spec.rb
@@ -3555,6 +3555,7 @@ test_files:
 - spec/unit/provider/package/aptrpm_spec.rb
 - spec/unit/provider/package/base_spec.rb
 - spec/unit/provider/package/dnf_spec.rb
+- spec/unit/provider/package/dnfmodule_spec.rb
 - spec/unit/provider/package/dpkg_spec.rb
 - spec/unit/provider/package/freebsd_spec.rb
 - spec/unit/provider/package/gem_spec.rb
@@ -3584,6 +3585,7 @@ test_files:
 - spec/unit/provider/package/windows_spec.rb
 - spec/unit/provider/package/yum_spec.rb
 - spec/unit/provider/package/zypper_spec.rb
+- spec/unit/provider/package_targetable_spec.rb
 - spec/unit/provider/parsedfile_spec.rb
 - spec/unit/provider/service/base_spec.rb
 - spec/unit/provider/service/bsd_spec.rb