puppet 7.5.0-universal-darwin → 7.9.0-universal-darwin

data/spec/integration/http/client_spec.rb

@@ -153,7 +153,7 @@ describe Puppet::HTTP::Client, unless: Puppet::Util::Platform.jruby? do
   end
 
   context 'ciphersuites' do
-    it "does not connect when using an SSLv3 ciphersuite" do
+    it "does not connect when using an SSLv3 ciphersuite", :if => Puppet::Util::Package.versioncmp(OpenSSL::OPENSSL_LIBRARY_VERSION.split[1], '1.1.1e') > 0 do
       Puppet[:ciphers] = "DES-CBC3-SHA"
 
       https_server.start_server do |port|

data/spec/integration/indirector/facts/facter_spec.rb

@@ -6,6 +6,7 @@ require 'puppet/indirector/facts/facter'
 describe Puppet::Node::Facts::Facter do
   include PuppetSpec::Files
   include PuppetSpec::Compiler
+  include PuppetSpec::Settings
 
   before :each do
     Puppet::Node::Facts.indirection.terminus_class = :facter
@@ -66,49 +67,102 @@ describe Puppet::Node::Facts::Facter do
     end
   end
 
-  it "adds the puppetversion fact" do
-    allow(Facter).to receive(:reset)
-
-    cat = compile_to_catalog('notify { $::puppetversion: }',
-                             Puppet::Node.indirection.find('foo'))
-    expect(cat.resource("Notify[#{Puppet.version.to_s}]")).to be
-  end
+  context "adding facts" do
+    it "adds the puppetversion fact" do
+      allow(Facter).to receive(:reset)
 
-  it "the agent_specified_environment fact is nil when not set" do
-    expect do
-      compile_to_catalog('notify { $::agent_specified_environment: }',
-                         Puppet::Node.indirection.find('foo'))
-    end.to raise_error(Puppet::PreformattedError)
-  end
-
-  it "adds the agent_specified_environment fact when set in puppet.conf" do
-    FileUtils.mkdir_p(Puppet[:confdir])
-    File.open(File.join(Puppet[:confdir], 'puppet.conf'), 'w') do |f|
-      f.puts("environment=bar")
+      cat = compile_to_catalog('notify { $::puppetversion: }',
+                               Puppet::Node.indirection.find('foo'))
+      expect(cat.resource("Notify[#{Puppet.version.to_s}]")).to be
     end
 
-    Puppet.initialize_settings
-    cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+    context "when adding the agent_specified_environment fact" do
+      it "does not add the fact if the agent environment is not set" do
+        expect do
+          compile_to_catalog('notify { $::agent_specified_environment: }',
                              Puppet::Node.indirection.find('foo'))
-    expect(cat.resource("Notify[bar]")).to be
-  end
+        end.to raise_error(Puppet::PreformattedError)
+      end
 
-  it "adds the agent_specified_environment fact when set via command-line" do
-    Puppet.initialize_settings(['--environment', 'bar'])
-    cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+      it "does not add the fact if the agent environment is set in sections other than agent or main" do
+        set_puppet_conf(Puppet[:confdir], <<~CONF)
+        [user]
+        environment=bar
+        CONF
+
+        Puppet.initialize_settings
+        expect do
+          compile_to_catalog('notify { $::agent_specified_environment: }',
                              Puppet::Node.indirection.find('foo'))
-    expect(cat.resource("Notify[bar]")).to be
-  end
+        end.to raise_error(Puppet::PreformattedError)
+      end
 
-  it "adds the agent_specified_environment fact, preferring cli, when set in puppet.conf and via command-line" do
-    FileUtils.mkdir_p(Puppet[:confdir])
-    File.open(File.join(Puppet[:confdir], 'puppet.conf'), 'w') do |f|
-      f.puts("environment=bar")
-    end
+      it "adds the agent_specified_environment fact when set in the agent section in puppet.conf" do
+        set_puppet_conf(Puppet[:confdir], <<~CONF)
+        [agent]
+        environment=bar
+        CONF
 
-    Puppet.initialize_settings(['--environment', 'baz'])
-    cat = compile_to_catalog('notify { $::agent_specified_environment: }',
-                             Puppet::Node.indirection.find('foo'))
-    expect(cat.resource("Notify[baz]")).to be
+        Puppet.initialize_settings
+        cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+                                 Puppet::Node.indirection.find('foo'))
+        expect(cat.resource("Notify[bar]")).to be
+      end
+
+      it "prefers agent_specified_environment from main if set in section other than agent" do
+        set_puppet_conf(Puppet[:confdir], <<~CONF)
+        [main]
+        environment=baz
+
+        [user]
+        environment=bar
+        CONF
+
+        Puppet.initialize_settings
+        cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+                                 Puppet::Node.indirection.find('foo'))
+        expect(cat.resource("Notify[baz]")).to be
+      end
+
+      it "prefers agent_specified_environment from agent if set in multiple sections" do
+        set_puppet_conf(Puppet[:confdir], <<~CONF)
+        [main]
+        environment=baz
+
+        [agent]
+        environment=bar
+        CONF
+
+        Puppet.initialize_settings
+        cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+                                 Puppet::Node.indirection.find('foo'))
+        expect(cat.resource("Notify[bar]")).to be
+      end
+
+      it "adds the agent_specified_environment fact when set in puppet.conf" do
+        set_puppet_conf(Puppet[:confdir], 'environment=bar')
+
+        Puppet.initialize_settings
+        cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+                                 Puppet::Node.indirection.find('foo'))
+        expect(cat.resource("Notify[bar]")).to be
+      end
+
+      it "adds the agent_specified_environment fact when set via command-line" do
+        Puppet.initialize_settings(['--environment', 'bar'])
+        cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+                                 Puppet::Node.indirection.find('foo'))
+        expect(cat.resource("Notify[bar]")).to be
+      end
+
+      it "adds the agent_specified_environment fact, preferring cli, when set in puppet.conf and via command-line" do
+        set_puppet_conf(Puppet[:confdir], 'environment=bar')
+
+        Puppet.initialize_settings(['--environment', 'baz'])
+        cat = compile_to_catalog('notify { $::agent_specified_environment: }',
+                                 Puppet::Node.indirection.find('foo'))
+        expect(cat.resource("Notify[baz]")).to be
+      end
+    end
   end
 end

data/spec/integration/type/exec_spec.rb

@@ -7,70 +7,95 @@ describe Puppet::Type.type(:exec), unless: Puppet::Util::Platform.jruby? do
 
   let(:catalog) { Puppet::Resource::Catalog.new }
   let(:path) { tmpfile('exec_provider') }
-  let(:command) { "ruby -e 'File.open(\"#{path}\", \"w\") { |f| f.print \"foo\" }'" }
 
   before :each do
     catalog.host_config = false
   end
 
-  it "should execute the command" do
-    exec = described_class.new :command => command, :path => ENV['PATH']
+  shared_examples_for 'a valid exec resource' do
+    it "should execute the command" do
+      exec = described_class.new :command => command, :path => ENV['PATH']
 
-    catalog.add_resource exec
-    catalog.apply
+      catalog.add_resource exec
+      catalog.apply
 
-    expect(File.read(path)).to eq('foo')
-  end
+      expect(File.read(path)).to eq('foo')
+    end
 
-  it "should not execute the command if onlyif returns non-zero" do
-    exec = described_class.new(
-      :command => command,
-      :onlyif => "ruby -e 'exit 44'",
-      :path => ENV['PATH']
-    )
+    it "should not execute the command if onlyif returns non-zero" do
+      exec = described_class.new(
+        :command => command,
+        :onlyif => "ruby -e 'exit 44'",
+        :path => ENV['PATH']
+      )
 
-    catalog.add_resource exec
-    catalog.apply
+      catalog.add_resource exec
+      catalog.apply
 
-    expect(Puppet::FileSystem.exist?(path)).to be_falsey
-  end
+      expect(Puppet::FileSystem.exist?(path)).to be_falsey
+    end
 
-  it "should execute the command if onlyif returns zero" do
-    exec = described_class.new(
-      :command => command,
-      :onlyif => "ruby -e 'exit 0'",
-      :path => ENV['PATH']
-    )
+    it "should execute the command if onlyif returns zero" do
+      exec = described_class.new(
+        :command => command,
+        :onlyif => "ruby -e 'exit 0'",
+        :path => ENV['PATH']
+      )
 
-    catalog.add_resource exec
-    catalog.apply
+      catalog.add_resource exec
+      catalog.apply
 
-    expect(File.read(path)).to eq('foo')
-  end
+      expect(File.read(path)).to eq('foo')
+    end
+
+    it "should execute the command if unless returns non-zero" do
+      exec = described_class.new(
+        :command => command,
+        :unless => "ruby -e 'exit 45'",
+        :path => ENV['PATH']
+      )
+
+      catalog.add_resource exec
+      catalog.apply
+
+      expect(File.read(path)).to eq('foo')
+    end
 
-  it "should execute the command if unless returns non-zero" do
-    exec = described_class.new(
-      :command => command,
-      :unless => "ruby -e 'exit 45'",
-      :path => ENV['PATH']
-    )
+    it "should not execute the command if unless returns zero" do
+      exec = described_class.new(
+        :command => command,
+        :unless => "ruby -e 'exit 0'",
+        :path => ENV['PATH']
+      )
 
-    catalog.add_resource exec
-    catalog.apply
+      catalog.add_resource exec
+      catalog.apply
 
-    expect(File.read(path)).to eq('foo')
+      expect(Puppet::FileSystem.exist?(path)).to be_falsey
+    end
   end
 
-  it "should not execute the command if unless returns zero" do
-    exec = described_class.new(
-      :command => command,
-      :unless => "ruby -e 'exit 0'",
-      :path => ENV['PATH']
-    )
+  context 'when command is a string' do
+    let(:command) { "ruby -e 'File.open(\"#{path}\", \"w\") { |f| f.print \"foo\" }'" }
+
+    it_behaves_like 'a valid exec resource'
+  end
+
+  context 'when command is an array' do
+    let(:command) { ['ruby', '-e', "File.open(\"#{path}\", \"w\") { |f| f.print \"foo\" }"] }
+
+    it_behaves_like 'a valid exec resource'
+
+    context 'when is invalid' do
+      let(:command) { [ "ruby -e 'puts 1'" ] }
 
-    catalog.add_resource exec
-    catalog.apply
+      it 'logs error' do
+        exec = described_class.new :command => command, :path => ENV['PATH']
+        catalog.add_resource exec
+        logs = catalog.apply.report.logs
 
-    expect(Puppet::FileSystem.exist?(path)).to be_falsey
+        expect(logs[0].message).to eql("Could not find command 'ruby -e 'puts 1''")
+      end
+    end
   end
 end

data/spec/integration/type/file_spec.rb

@@ -895,7 +895,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
             # Change the source file.
             File.open(checksum_file, "wb") { |f| f.write "some content" }
-            FileUtils.touch target_file, :mtime => Time.now - 20
+            FileUtils.touch target_file, mtime: Time.now - 20
 
             # The 2nd time should update the resource.
             second_catalog.add_resource Puppet::Type.send(:newfile, @options)
@@ -1399,7 +1399,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         it "should fetch if no header specified" do
           File.open(httppath, "wb") { |f| f.puts "Content originally on disk\n" }
           # make sure the mtime is not "right now", lest we get a race
-          FileUtils.touch httppath, :mtime => Time.parse("Sun, 22 Mar 2015 22:57:43 GMT")
+          FileUtils.touch httppath, mtime: Time.parse("Sun, 22 Mar 2015 22:57:43 GMT")
           catalog.add_resource resource
           catalog.apply
           expect(Puppet::FileSystem.exist?(httppath)).to be_truthy
@@ -1409,7 +1409,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         it "should fetch if mtime is older on disk" do
           File.open(httppath, "wb") { |f| f.puts "Content originally on disk\n" }
           # fixture has Last-Modified: Sun, 22 Mar 2015 22:25:34 GMT
-          FileUtils.touch httppath, :mtime => Time.parse("Sun, 22 Mar 2015 22:22:34 GMT")
+          FileUtils.touch httppath, mtime: Time.parse("Sun, 22 Mar 2015 22:22:34 GMT")
           catalog.add_resource resource
           catalog.apply
           expect(Puppet::FileSystem.exist?(httppath)).to be_truthy
@@ -1455,7 +1455,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         it "should not update if content on disk is up-to-date" do
           File.open(httppath, "wb") { |f| f.puts "Content via HTTP\n" }
           disk_mtime = Time.parse("Sun, 22 Mar 2015 22:22:34 GMT")
-          FileUtils.touch httppath, :mtime => disk_mtime
+          FileUtils.touch httppath, mtime: disk_mtime
           catalog.add_resource resource
           catalog.apply
           expect(Puppet::FileSystem.exist?(httppath)).to be_truthy
@@ -2002,7 +2002,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     it "should not update mtime on an old directory" do
       disk_mtime = Time.parse("Sun, 22 Mar 2015 22:22:34 GMT")
       FileUtils.mkdir_p path
-      FileUtils.touch path, :mtime => disk_mtime
+      FileUtils.touch path, mtime: disk_mtime
       status = catalog.apply.report.resource_statuses["File[#{path}]"]
       expect(status).to be_nil
       expect(Puppet::FileSystem).to be_directory(path)

data/spec/lib/puppet/test_ca.rb

@@ -30,7 +30,7 @@ module Puppet
     end
 
     def create_request(name)
-      key = OpenSSL::PKey::RSA.new(1024)
+      key = OpenSSL::PKey::RSA.new(2048)
       csr = OpenSSL::X509::Request.new
       csr.public_key = key.public_key
       csr.subject = OpenSSL::X509::Name.new([["CN", name]])
@@ -46,6 +46,11 @@ module Puppet
         ext = ef.create_extension(["subjectAltName", opts[:subject_alt_names], false])
         cert.add_extension(ext)
       end
+      if exts = opts[:extensions]
+        exts.each do |e|
+          cert.add_extension(OpenSSL::X509::Extension.new(*e))
+        end
+      end
       cert.sign(issuer_key, @digest)
       { private_key: key, cert: cert }
     end
@@ -127,7 +132,7 @@ module Puppet
       key = if opts[:key_type] == :ec
               key = OpenSSL::PKey::EC.generate('prime256v1')
             else
-              key = OpenSSL::PKey::RSA.new(1024)
+              key = OpenSSL::PKey::RSA.new(2048)
             end
       cert = OpenSSL::X509::Certificate.new
       cert.public_key = if key.is_a?(OpenSSL::PKey::EC)

data/spec/lib/puppet_spec/files.rb

@@ -9,7 +9,7 @@ module PuppetSpec::Files
     $global_tempfiles ||= []
     while path = $global_tempfiles.pop do
       begin
-        FileUtils.rm_rf path, :secure => true
+        FileUtils.rm_rf path, secure: true
       rescue Errno::ENOENT
         # nothing to do
       end

data/spec/lib/puppet_spec/settings.rb

@@ -21,6 +21,7 @@ module PuppetSpec::Settings
   end.freeze
 
   def set_puppet_conf(confdir, settings)
+    FileUtils.mkdir_p(confdir)
     write_file(File.join(confdir, "puppet.conf"), settings)
   end
 

data/spec/shared_contexts/provider.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+RSpec.shared_context('provider specificity') do
+  around do |example|
+    old_defaults = described_class.instance_variable_get(:@defaults)
+    old_notdefaults = described_class.instance_variable_get(:@notdefaults)
+    begin
+      described_class.instance_variable_set(:@defaults, [])
+      described_class.instance_variable_set(:@notdefaults, [])
+      example.run
+    ensure
+      described_class.instance_variable_set(:@defaults, old_defaults)
+      described_class.instance_variable_set(:@notdefaults, old_notdefaults)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -162,10 +162,20 @@ RSpec.configure do |config|
   PUPPET_FACTER_2_GCE_URL = %r{^http://metadata/computeMetadata/v1(beta1)?}.freeze
   PUPPET_FACTER_3_GCE_URL = "http://metadata.google.internal/computeMetadata/v1/?recursive=true&alt=json".freeze
 
+  # Facter azure metadata endpoint
+  PUPPET_FACTER_AZ_URL = "http://169.254.169.254/metadata/instance?api-version=2020-09-01"
+
+  # Facter EC2 endpoint
+  PUPPET_FACTER_EC2_METADATA = 'http://169.254.169.254/latest/meta-data/'
+  PUPPET_FACTER_EC2_USERDATA = 'http://169.254.169.254/latest/user-data/'
+
   config.around :each do |example|
-    # Ignore requests from Facter GCE fact in Travis
+    # Ignore requests from Facter to external services
     stub_request(:get, PUPPET_FACTER_2_GCE_URL)
     stub_request(:get, PUPPET_FACTER_3_GCE_URL)
+    stub_request(:get, PUPPET_FACTER_AZ_URL)
+    stub_request(:get, PUPPET_FACTER_EC2_METADATA)
+    stub_request(:get, PUPPET_FACTER_EC2_USERDATA)
 
     # Enable VCR if the example is tagged with `:vcr` metadata.
     if example.metadata[:vcr]

data/spec/unit/application/agent_spec.rb

@@ -546,11 +546,16 @@ describe Puppet::Application::Agent do
         @puppetd.options[:digest] = :MD5
       end
 
+      def expected_fingerprint(name, x509)
+        digest = OpenSSL::Digest.new(name).hexdigest(x509.to_der)
+        digest.scan(/../).join(':').upcase
+      end
+
       it "should fingerprint the certificate if it exists" do
         cert = cert_fixture('signed.pem')
         allow_any_instance_of(Puppet::X509::CertProvider).to receive(:load_client_cert).and_return(cert)
 
-        expect(@puppetd).to receive(:puts).with('(MD5) E2:BA:9A:EF:20:A8:7D:10:8D:82:9A:61:5D:FD:5B:33')
+        expect(@puppetd).to receive(:puts).with("(MD5) #{expected_fingerprint('md5', cert)}")
 
         @puppetd.fingerprint
       end
@@ -560,7 +565,7 @@ describe Puppet::Application::Agent do
         allow_any_instance_of(Puppet::X509::CertProvider).to receive(:load_client_cert).and_return(nil)
         allow_any_instance_of(Puppet::X509::CertProvider).to receive(:load_request).and_return(request)
 
-        expect(@puppetd).to receive(:puts).with('(MD5) B8:4C:FB:31:AE:17:86:E3:AD:53:97:CA:F6:3C:4A:CB')
+        expect(@puppetd).to receive(:puts).with("(MD5) #{expected_fingerprint('md5', request)}")
 
         @puppetd.fingerprint
       end