puppet 6.16.0-x64-mingw32 → 7.0.0-x64-mingw32

data/spec/integration/application/doc_spec.rb

@@ -1,14 +1,24 @@
 require 'spec_helper'
-require 'puppet_spec/files'
 require 'puppet/application/doc'
 
 describe Puppet::Application::Doc do
   include PuppetSpec::Files
 
-  it "should respect the -o option" do
-    puppetdoc = Puppet::Application[:doc]
-    allow(puppetdoc.command_line).to receive(:args).and_return(['foo', '-o', 'bar'])
-    puppetdoc.parse_options
-    expect(puppetdoc.options[:outputdir]).to eq('bar')
+  let(:app) { Puppet::Application[:doc] }
+
+  it 'lists references' do
+    app.command_line.args = ['-l']
+    expect {
+      app.run
+    }.to exit_with(0)
+     .and output(/configuration - A reference for all settings/).to_stdout
+  end
+
+  it 'generates markdown' do
+    app.command_line.args = ['-r', 'report']
+    expect {
+      app.run
+    }.to exit_with(0)
+     .and output(/# Report Reference/).to_stdout
   end
 end

data/spec/integration/application/filebucket_spec.rb

@@ -10,49 +10,99 @@ describe "puppet filebucket", unless: Puppet::Util::Platform.jruby? do
   let(:server) { PuppetSpec::Puppetserver.new }
   let(:filebucket) { Puppet::Application[:filebucket] }
   let(:backup_file) { tmpfile('backup_file') }
+  let(:text) { 'some random text' }
+  let(:sha256) { Digest::SHA256.file(backup_file).to_s }
 
   before :each do
     Puppet[:log_level] = 'debug'
+    File.binwrite(backup_file, text)
   end
 
-  it "backs up files to the filebucket server" do
-    File.binwrite(backup_file, 'some random text')
-    md5 = Digest::MD5.file(backup_file).to_s
+  it "backs up to and restores from the local filebucket" do
+    filebucket.command_line.args = ['backup', backup_file, '--local']
+    expect {
+      filebucket.run
+    }.to output(/: #{sha256}/).to_stdout
 
+    dest = tmpfile('file_bucket_restore')
+    filebucket.command_line.args = ['restore', dest, sha256, '--local']
+    expect {
+      filebucket.run
+    }.to output(/FileBucket read #{sha256}/).to_stdout
+
+    expect(FileUtils.compare_file(backup_file, dest)).to eq(true)
+  end
+
+  it "backs up text files to the filebucket server" do
     server.start_server do |port|
-      Puppet[:masterport] = port
+      Puppet[:serverport] = port
       expect {
-        filebucket.command_line.args << 'backup'
-        filebucket.command_line.args << backup_file
+        filebucket.command_line.args = ['backup', backup_file]
         filebucket.run
       }.to output(a_string_matching(
-        %r{Debug: HTTP HEAD https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/md5\/#{md5}\/#{File.realpath(backup_file)}\?environment\=production returned 404 Not Found}
+        %r{Debug: HTTP HEAD https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/sha256\/#{sha256}\/#{File.realpath(backup_file)}\?environment\=production returned 404 Not Found}
       ).and matching(
-        %r{Debug: HTTP PUT https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/md5\/#{md5}\/#{File.realpath(backup_file)}\?environment\=production returned 200 OK}
+        %r{Debug: HTTP PUT https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/sha256\/#{sha256}\/#{File.realpath(backup_file)}\?environment\=production returned 200 OK}
       ).and matching(
-        %r{#{backup_file}: #{md5}}
+        %r{#{backup_file}: #{sha256}}
       )).to_stdout
+
+      expect(File.binread(File.join(server.upload_directory, 'filebucket'))).to eq(text)
+    end
+  end
+
+  it "backs up binary files to the filebucket server" do
+    binary = "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT)
+    File.binwrite(backup_file, binary)
+
+    server.start_server do |port|
+      Puppet[:serverport] = port
+      expect {
+        filebucket.command_line.args = ['backup', backup_file]
+        filebucket.run
+      }.to output(a_string_matching(
+        %r{Debug: HTTP HEAD https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file/sha256/f3aee54d781e413862eb068d89661f930385cc81bbafffc68477ff82eb9bea43/}
+      ).and matching(
+        %r{Debug: HTTP PUT https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file/sha256/f3aee54d781e413862eb068d89661f930385cc81bbafffc68477ff82eb9bea43/}
+      )).to_stdout
+
+      expect(File.binread(File.join(server.upload_directory, 'filebucket'))).to eq(binary)
+    end
+  end
+
+  it "backs up utf-8 encoded files to the filebucket server" do
+    utf8 = "\u2603".force_encoding(Encoding::UTF_8)
+    File.binwrite(backup_file, utf8)
+
+    server.start_server do |port|
+      Puppet[:serverport] = port
+      expect {
+        filebucket.command_line.args = ['backup', backup_file]
+        filebucket.run
+      }.to output(a_string_matching(
+        %r{Debug: HTTP HEAD https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file/sha256/51643361c79ecaef25a8de802de24f570ba25d9c2df1d22d94fade11b4f466cc/}
+      ).and matching(
+        %r{Debug: HTTP PUT https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file/sha256/51643361c79ecaef25a8de802de24f570ba25d9c2df1d22d94fade11b4f466cc/}
+      )).to_stdout
+
+      expect(File.read(File.join(server.upload_directory, 'filebucket'), encoding: 'utf-8')).to eq(utf8)
     end
   end
 
   it "doesn't attempt to back up file that already exists on the filebucket server" do
     file_exists_handler = -> (req, res) {
-        res.status = 200
+      res.status = 200
     }
 
-    File.binwrite(backup_file, 'some random text')
-    md5 = Digest::MD5.file(backup_file).to_s
-
     server.start_server(mounts: {filebucket: file_exists_handler}) do |port|
-      Puppet[:masterport] = port
+      Puppet[:serverport] = port
       expect {
-        filebucket.command_line.args << 'backup'
-        filebucket.command_line.args << backup_file
+        filebucket.command_line.args = ['backup', backup_file]
         filebucket.run
       }.to output(a_string_matching(
-        %r{Debug: HTTP HEAD https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/md5\/#{md5}\/#{File.realpath(backup_file)}\?environment\=production returned 200 OK}
+        %r{Debug: HTTP HEAD https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/sha256\/#{sha256}\/#{File.realpath(backup_file)}\?environment\=production returned 200 OK}
       ).and matching(
-        %r{#{backup_file}: #{md5}}
+        %r{#{backup_file}: #{sha256}}
       )).to_stdout
     end
   end
@@ -64,13 +114,12 @@ describe "puppet filebucket", unless: Puppet::Util::Platform.jruby? do
     }
 
     server.start_server(mounts: {filebucket: get_handler}) do |port|
-      Puppet[:masterport] = port
+      Puppet[:serverport] = port
       expect {
-        filebucket.command_line.args << 'get'
-        filebucket.command_line.args << 'fac251367c9e083c6b1f0f3181'
+        filebucket.command_line.args = ['get', 'fac251367c9e083c6b1f0f3181']
         filebucket.run
       }.to output(a_string_matching(
-        %r{Debug: HTTP GET https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/md5\/fac251367c9e083c6b1f0f3181\?environment\=production returned 200 OK}
+        %r{Debug: HTTP GET https:\/\/127.0.0.1:#{port}\/puppet\/v3\/file_bucket_file\/sha256\/fac251367c9e083c6b1f0f3181\?environment\=production returned 200 OK}
       ).and matching(
         %r{something to store}
        )).to_stdout
@@ -88,9 +137,9 @@ describe "puppet filebucket", unless: Puppet::Util::Platform.jruby? do
         }
 
         server.start_server(mounts: {filebucket: get_handler}) do |port|
-          Puppet[:masterport] = port
+          Puppet[:serverport] = port
           expect {
-            filebucket.command_line.args += ['diff', 'fac251367c9e083c6b1f0f3181', backup_file, '--remote']
+            filebucket.command_line.args = ['diff', 'fac251367c9e083c6b1f0f3181', backup_file, '--remote']
             filebucket.run
           }.to output(a_string_matching(
             /[-<] ?foo/
@@ -116,9 +165,9 @@ describe "puppet filebucket", unless: Puppet::Util::Platform.jruby? do
         }
 
         server.start_server(mounts: {filebucket: get_handler}) do |port|
-          Puppet[:masterport] = port
+          Puppet[:serverport] = port
           expect {
-            filebucket.command_line.args += ['diff', 'd3b07384d113edec49eaa6238ad5ff00', "99b999207e287afffc86c053e5693247", '--remote']
+            filebucket.command_line.args = ['diff', 'd3b07384d113edec49eaa6238ad5ff00', "99b999207e287afffc86c053e5693247", '--remote']
             filebucket.run
           }.to output(a_string_matching(
             /[-<] ?foo/
@@ -142,8 +191,8 @@ describe "puppet filebucket", unless: Puppet::Util::Platform.jruby? do
         File.binwrite(f, "bar\nbaz")
         f
       }
-      let(:checksuma) { Digest::MD5.file(filea).to_s }
-      let(:checksumb) { Digest::MD5.file(fileb).to_s }
+      let(:checksuma) { Digest::SHA256.file(filea).to_s }
+      let(:checksumb) { Digest::SHA256.file(fileb).to_s }
 
       it 'compares to files stored in a local bucket' do
         expect {
@@ -187,4 +236,4 @@ describe "puppet filebucket", unless: Puppet::Util::Platform.jruby? do
       end
     end
   end
-end
+end

data/spec/integration/application/help_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'puppet/application/help'
+
+describe "puppet help" do
+  let(:app) { Puppet::Application[:help] }
+
+  it "generates global help" do
+    expect {
+      app.run
+    }.to exit_with(0)
+     .and output(Regexp.new(Regexp.escape(<<~END), Regexp::MULTILINE)).to_stdout
+
+       Usage: puppet <subcommand> [options] <action> [options]
+
+       Available subcommands:
+     END
+  end
+
+  Puppet::Face.faces.sort.each do |face_name|
+    next if face_name == :key
+
+    context "for #{face_name}" do
+      it "generates help" do
+        app.command_line.args = ['help', face_name]
+
+        expect {
+          app.run
+        }.to exit_with(0)
+         .and output(/USAGE: puppet #{face_name} <action>/).to_stdout
+      end
+
+      Puppet::Face[face_name, :current].actions.sort.each do |action_name|
+        it "for action #{action_name}" do
+          app.command_line.args = ['help', face_name, action_name]
+
+          expect {
+            app.run
+          }.to exit_with(0)
+           .and output(/USAGE: puppet #{face_name}/).to_stdout
+        end
+      end
+    end
+  end
+end

data/spec/integration/application/lookup_spec.rb

@@ -90,6 +90,19 @@ describe 'lookup' do
       expect(lookup('a')).to eql('value a')
     end
 
+    it 'loads external facts when running without --node' do
+      expect(Puppet::Util).not_to receive(:skip_external_facts)
+      expect(Facter).not_to receive(:load_external)
+      lookup('a')
+    end
+
+    it 'skip loading of external facts when run with --node' do
+      app.options[:node] = "random_node"
+      expect(Facter).to receive(:load_external).once.with(false)
+      expect(Facter).to receive(:load_external).once.with(true)
+      lookup('a')
+    end
+
     context 'uses node_terminus' do
       require 'puppet/indirector/node/exec'
       require 'puppet/indirector/node/plain'

data/spec/integration/application/module_spec.rb

@@ -0,0 +1,68 @@
+# coding: utf-8
+require 'spec_helper'
+require 'puppet/forge'
+require 'puppet_spec/https'
+
+describe 'puppet module', unless: Puppet::Util::Platform.jruby? do
+  include PuppetSpec::Files
+  include_context "https client"
+
+  let(:app) { Puppet::Application[:module] }
+  let(:wrong_hostname) { 'localhost' }
+  let(:server) { PuppetSpec::HTTPSServer.new }
+  let(:ssl_provider) { Puppet::SSL::SSLProvider.new }
+
+  let(:release_response) { File.read(fixtures('unit/forge/bacula-releases.json')) }
+  let(:release_tarball) { File.binread(fixtures('unit/forge/bacula.tar.gz')) }
+  let(:target_dir) { tmpdir('bacula') }
+
+  before :each do
+    SemanticPuppet::Dependency.clear_sources
+  end
+
+  it 'installs a module' do
+    # create a temp cacert bundle
+    ssl_file = tmpfile('systemstore')
+    File.write(ssl_file, server.ca_cert)
+
+    response_proc = -> (req, res) {
+      if req.path == '/v3/releases'
+        res['Content-Type'] = 'application/json'
+        res.body = release_response
+      else
+        res['Content-Type'] = 'application/octet-stream'
+        res.body = release_tarball
+      end
+      res.status = 200
+    }
+
+    # override path to system cacert bundle, this must be done before
+    # the SSLContext is created and the call to X509::Store.set_default_paths
+    Puppet::Util.withenv("SSL_CERT_FILE" => ssl_file) do
+      server.start_server(response_proc: response_proc) do |port|
+        Puppet[:module_repository] = "https://127.0.0.1:#{port}"
+
+        # On Windows, CP437 encoded output can't be matched against UTF-8 regexp,
+        # so encode the regexp to the external encoding and match against that.
+        app.command_line.args = ['install', 'puppetlabs-bacula', '--target-dir', target_dir]
+        expect {
+          app.run
+        }.to exit_with(0)
+         .and output(Regexp.new("└── puppetlabs-bacula".encode(Encoding.default_external))).to_stdout
+      end
+    end
+  end
+
+  it 'returns a valid exception when there is an SSL verification problem' do
+    server.start_server do |port|
+      Puppet[:module_repository] = "https://#{wrong_hostname}:#{port}"
+
+      expect {
+        app.command_line.args = ['install', 'puppetlabs-bacula', '--target-dir', target_dir]
+        app.run
+      }.to exit_with(1)
+       .and output(%r{Notice: Downloading from https://#{wrong_hostname}:#{port}}).to_stdout
+       .and output(%r{Unable to verify the SSL certificate}).to_stderr
+    end
+  end
+end

data/spec/integration/application/plugin_spec.rb

@@ -9,7 +9,8 @@ describe "puppet plugin" do
   let(:plugin) { Puppet::Application[:plugin] }
   let(:response_body) { "[{\"path\":\"/etc/puppetlabs/code/environments/production/modules\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-03-06 20:14:25 UTC\"},\"type\":\"directory\",\"destination\":null}]" }
 
-  it "downloads from plugins, pluginsfacts and locales mounts" do
+  it "downloads from plugins, pluginsfacts and locales mounts when i18n is enabled" do
+    Puppet[:disable_i18n] = false
     current_version_handler = -> (req, res) {
       res['X-Puppet-Version'] = Puppet.version
       res['Content-Type'] = 'application/json'
@@ -17,7 +18,7 @@ describe "puppet plugin" do
     }
 
     server.start_server(mounts: {file_metadatas: current_version_handler}) do |port|
-      Puppet[:masterport] = port
+      Puppet[:serverport] = port
       expect {
         plugin.command_line.args << 'download'
         plugin.run
@@ -28,6 +29,27 @@ describe "puppet plugin" do
     end
   end
 
+  it "downloads from plugins, pluginsfacts but no locales mounts when i18n is disabled" do
+    Puppet[:disable_i18n] = true
+
+    current_version_handler = -> (req, res) {
+      res['X-Puppet-Version'] = Puppet.version
+      res['Content-Type'] = 'application/json'
+      res.body = response_body
+    }
+
+    server.start_server(mounts: {file_metadatas: current_version_handler}) do |port|
+      Puppet[:serverport] = port
+      expect {
+        plugin.command_line.args << 'download'
+        plugin.run
+      }.to exit_with(0)
+       .and output(matching(
+         "Downloaded these plugins: #{Regexp.escape(Puppet[:pluginfactdest])}, #{Regexp.escape(Puppet[:plugindest])}"
+       )).to_stdout
+    end
+  end
+
   it "downloads from plugins and pluginsfacts from older puppetservers" do
     no_locales_handler = -> (req, res) {
       res['X-Puppet-Version'] = '5.3.3' # locales mount was added in 5.3.4
@@ -36,7 +58,7 @@ describe "puppet plugin" do
     }
 
     server.start_server(mounts: {file_metadatas: no_locales_handler}) do |port|
-      Puppet[:masterport] = port
+      Puppet[:serverport] = port
       expect {
         plugin.command_line.args << 'download'
         plugin.run
@@ -59,7 +81,7 @@ describe "puppet plugin" do
 
     server.start_server(mounts: {file_metadatas: current_version_handler}) do |port|
       Puppet[:environment] = 'doesnotexistontheagent'
-      Puppet[:masterport] = port
+      Puppet[:serverport] = port
       expect {
         plugin.command_line.args << 'download'
         plugin.run
@@ -70,4 +92,54 @@ describe "puppet plugin" do
     end
   end
 
+  context "pluginsync for external facts uses source permissions to preserve fact executable-ness" do
+    before :all do
+      WebMock.enable!
+    end
+
+    after :all do
+      WebMock.disable!
+    end
+
+    before :each do
+      metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":420,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
+      stub_request(:get, %r{/puppet/v3/file_metadatas/(plugins|locales)}).to_return(status: 200, body: metadata, headers: {'Content-Type' => 'application/json'})
+
+      # response retains owner/group/mode due to source_permissions => use
+      facts_metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":500,\"group\":500,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
+      stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(status: 200, body: facts_metadata, headers: {'Content-Type' => 'application/json'})
+    end
+
+    it "processes a download request resulting in no changes" do
+      # Create these so there are no changes
+      Puppet::FileSystem.mkpath(Puppet[:plugindest])
+      Puppet::FileSystem.mkpath(Puppet[:localedest])
+
+      # /opt/puppetlabs/puppet/cache/facts.d will be created based on our umask.
+      # If the mode on disk is not 0755, then the mode from the metadata response
+      # (493 => 0755) will be applied, resulting in "plugins were downloaded"
+      # message. Enforce a umask so the results are consistent.
+      Puppet::FileSystem.mkpath(Puppet[:pluginfactdest])
+      Puppet::FileSystem.chmod(0755, Puppet[:pluginfactdest])
+
+      app = Puppet::Application[:plugin]
+      app.command_line.args << 'download'
+      expect {
+        app.run
+      }.to exit_with(0)
+       .and output(/No plugins downloaded/).to_stdout
+    end
+
+    it "updates the facts.d mode", unless: Puppet::Util::Platform.windows? do
+      Puppet::FileSystem.mkpath(Puppet[:pluginfactdest])
+      Puppet::FileSystem.chmod(0775, Puppet[:pluginfactdest])
+
+      app = Puppet::Application[:plugin]
+      app.command_line.args << 'download'
+      expect {
+        app.run
+      }.to exit_with(0)
+       .and output(/Downloaded these plugins: .*facts\.d/).to_stdout
+    end
+  end
 end