puppet 6.11.1 → 6.12.0

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

@@ -251,11 +251,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
@@ -345,11 +345,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
@@ -446,6 +446,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
@@ -485,6 +495,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.11.1
+  version: 6.12.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -345,6 +345,10 @@ files:
 - lib/puppet/application_support.rb
 - lib/puppet/coercion.rb
 - lib/puppet/compilable_resource_type.rb
+- lib/puppet/concurrent.rb
+- lib/puppet/concurrent/lock.rb
+- lib/puppet/concurrent/synchronized.rb
+- lib/puppet/concurrent/thread_local_singleton.rb
 - lib/puppet/configurer.rb
 - lib/puppet/configurer/downloader.rb
 - lib/puppet/configurer/fact_handler.rb
@@ -483,6 +487,7 @@ files:
 - lib/puppet/functions/eyaml_lookup_key.rb
 - lib/puppet/functions/filter.rb
 - lib/puppet/functions/find_file.rb
+- lib/puppet/functions/find_template.rb
 - lib/puppet/functions/flatten.rb
 - lib/puppet/functions/floor.rb
 - lib/puppet/functions/get.rb
@@ -559,12 +564,14 @@ files:
 - lib/puppet/http/errors.rb
 - lib/puppet/http/redirector.rb
 - lib/puppet/http/resolver.rb
+- lib/puppet/http/resolver/server_list.rb
 - lib/puppet/http/resolver/settings.rb
 - lib/puppet/http/resolver/srv.rb
 - lib/puppet/http/response.rb
 - lib/puppet/http/retry_after_handler.rb
 - lib/puppet/http/service.rb
 - lib/puppet/http/service/ca.rb
+- lib/puppet/http/service/report.rb
 - lib/puppet/http/session.rb
 - lib/puppet/indirector.rb
 - lib/puppet/indirector/catalog/compiler.rb
@@ -1501,6 +1508,7 @@ files:
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/functions/data.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/metadata.json
+- spec/fixtures/unit/forge/bacula.json
 - spec/fixtures/unit/functions/hiera/hiera/backend/hieraspec_backend.rb
 - spec/fixtures/unit/functions/lookup/data/common.yaml
 - spec/fixtures/unit/functions/lookup/hiera/backend/custom_backend.rb
@@ -1778,11 +1786,13 @@ files:
 - spec/integration/file_serving/metadata_spec.rb
 - spec/integration/file_serving/terminus_helper_spec.rb
 - spec/integration/file_system/uniquefile_spec.rb
+- spec/integration/http/client_spec.rb
 - spec/integration/indirector/catalog/compiler_spec.rb
 - spec/integration/indirector/direct_file_server_spec.rb
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
+- spec/integration/module_tool/forge_spec.rb
 - spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
@@ -1874,7 +1884,6 @@ files:
 - spec/lib/puppet_spec/settings.rb
 - spec/lib/puppet_spec/ssl.rb
 - spec/lib/puppet_spec/unindent.rb
-- spec/lib/puppet_spec/validators.rb
 - spec/lib/puppet_spec/verbose.rb
 - spec/shared_behaviours/all_parsedfile_providers.rb
 - spec/shared_behaviours/an_indirector_face.rb
@@ -1912,6 +1921,7 @@ files:
 - spec/unit/application_spec.rb
 - spec/unit/capability_spec.rb
 - spec/unit/certificate_factory_spec.rb
+- spec/unit/concurrent/lock_spec.rb
 - spec/unit/configurer/downloader_spec.rb
 - spec/unit/configurer/fact_handler_spec.rb
 - spec/unit/configurer/plugin_handler_spec.rb
@@ -2004,6 +2014,7 @@ files:
 - spec/unit/functions/epp_spec.rb
 - spec/unit/functions/filter_spec.rb
 - spec/unit/functions/find_file_spec.rb
+- spec/unit/functions/find_template_spec.rb
 - spec/unit/functions/flatten_spec.rb
 - spec/unit/functions/floor_spec.rb
 - spec/unit/functions/get_spec.rb
@@ -2067,6 +2078,7 @@ files:
 - spec/unit/http/client_spec.rb
 - spec/unit/http/resolver_spec.rb
 - spec/unit/http/service/ca_spec.rb
+- spec/unit/http/service/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
@@ -2388,6 +2400,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
@@ -2615,7 +2628,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
@@ -2750,6 +2763,7 @@ test_files:
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/functions/data.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/metadata.json
+- spec/fixtures/unit/forge/bacula.json
 - spec/fixtures/unit/functions/hiera/hiera/backend/hieraspec_backend.rb
 - spec/fixtures/unit/functions/lookup/data/common.yaml
 - spec/fixtures/unit/functions/lookup/hiera/backend/custom_backend.rb
@@ -3027,11 +3041,13 @@ test_files:
 - spec/integration/file_serving/metadata_spec.rb
 - spec/integration/file_serving/terminus_helper_spec.rb
 - spec/integration/file_system/uniquefile_spec.rb
+- spec/integration/http/client_spec.rb
 - spec/integration/indirector/catalog/compiler_spec.rb
 - spec/integration/indirector/direct_file_server_spec.rb
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
+- spec/integration/module_tool/forge_spec.rb
 - spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
@@ -3123,7 +3139,6 @@ test_files:
 - spec/lib/puppet_spec/settings.rb
 - spec/lib/puppet_spec/ssl.rb
 - spec/lib/puppet_spec/unindent.rb
-- spec/lib/puppet_spec/validators.rb
 - spec/lib/puppet_spec/verbose.rb
 - spec/shared_behaviours/all_parsedfile_providers.rb
 - spec/shared_behaviours/an_indirector_face.rb
@@ -3161,6 +3176,7 @@ test_files:
 - spec/unit/application_spec.rb
 - spec/unit/capability_spec.rb
 - spec/unit/certificate_factory_spec.rb
+- spec/unit/concurrent/lock_spec.rb
 - spec/unit/configurer/downloader_spec.rb
 - spec/unit/configurer/fact_handler_spec.rb
 - spec/unit/configurer/plugin_handler_spec.rb
@@ -3253,6 +3269,7 @@ test_files:
 - spec/unit/functions/epp_spec.rb
 - spec/unit/functions/filter_spec.rb
 - spec/unit/functions/find_file_spec.rb
+- spec/unit/functions/find_template_spec.rb
 - spec/unit/functions/flatten_spec.rb
 - spec/unit/functions/floor_spec.rb
 - spec/unit/functions/get_spec.rb
@@ -3316,6 +3333,7 @@ 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/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
@@ -3637,6 +3655,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

data/spec/lib/puppet_spec/validators.rb

@@ -1,37 +0,0 @@
-class ConstantErrorValidator
-  def initialize(args)
-    @fails_with = args[:fails_with]
-    @error_string = args[:error_string] || ""
-    @peer_certs = args[:peer_certs] || []
-  end
-
-  def setup_connection(connection)
-    connection.stubs(:start).raises(OpenSSL::SSL::SSLError.new(@fails_with))
-  end
-
-  def peer_certs
-    @peer_certs
-  end
-
-  def verify_errors
-    [@error_string]
-  end
-end
-
-class NoProblemsValidator
-  def initialize(cert)
-    @cert = cert
-  end
-
-  def setup_connection(connection)
-  end
-
-  def peer_certs
-    [@cert]
-  end
-
-  def verify_errors
-    []
-  end
-end
-