bolt 0.21.1 → 0.21.2

data/vendored/puppet/lib/puppet/util/feature.rb

@@ -49,14 +49,14 @@ class Puppet::Util::Feature
   end
 
   def load
-    @loader.loadall
+    @loader.loadall(Puppet.lookup(:current_environment))
   end
 
   def method_missing(method, *args)
     return super unless method.to_s =~ /\?$/
 
     feature = method.to_s.sub(/\?$/, '')
-    @loader.load(feature)
+    @loader.load(feature, Puppet.lookup(:current_environment))
 
     respond_to?(method) && self.send(method)
   end

data/vendored/puppet/lib/puppet/util/instance_loader.rb

@@ -32,24 +32,6 @@ module Puppet::Util::InstanceLoader
     @instances[type].keys
   end
 
-  # Collect the docs for all of our instances.
-  def instance_docs(type)
-    docs = ""
-
-    # Load all instances.
-    instance_loader(type).loadall
-
-    # Use this method so they all get loaded
-    loaded_instances(type).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-      mod = self.loaded_instance(type, name)
-      docs << "#{name}\n#{"-" * name.to_s.length}\n"
-
-      docs << Puppet::Util::Docs.scrub(mod.doc) << "\n\n"
-    end
-
-    docs
-  end
-
   # Return the instance hash for our type.
   def instance_hash(type)
     @instances[type.intern]
@@ -65,7 +47,7 @@ module Puppet::Util::InstanceLoader
     name = name.intern
     return nil unless instances = instance_hash(type)
     unless instances.include? name
-      if instance_loader(type).load(name)
+      if instance_loader(type).load(name, Puppet.lookup(:current_environment))
         unless instances.include? name
           Puppet.warning(_("Loaded %{type} file for %{name} but %{type} was not defined") % { type: type, name: name })
           return nil

data/vendored/puppet/lib/puppet/util/json.rb

@@ -59,14 +59,6 @@ module Puppet::Util
 
     def self.dump(object, options = {})
       if defined? MultiJson
-        # MultiJson calls `merge` on the options it is passed, which relies
-        # on the options' defining a `to_hash` method. In Ruby 1.9.3,
-        # JSON::Ext::Generator::State only defines `to_h`, not `to_hash`, so we
-        # need to convert it first, similar to what is done in the `else` block
-        # below. Later versions of the JSON gem alias `to_h` to `to_hash`, so this
-        # can be removed once we drop Ruby 1.9.3 support.
-        options = options.to_h if options.class.name == "JSON::Ext::Generator::State"
-
         MultiJson.dump(object, options)
       else
         options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h) if options.delete(:pretty)

data/vendored/puppet/lib/puppet/util/log/destinations.rb

@@ -109,7 +109,7 @@ Puppet::Util::Log.newdesttype :file do
   def handle(msg)
     if @json > 0
       @json > 1 ? @file.puts(',') : @json = 2
-      Puppet::Util::Json.dump(msg.to_structured_hash, @file)
+      @file.puts(Puppet::Util::Json.dump(msg.to_structured_hash))
     else
       @file.puts("#{msg.time} #{msg.source} (#{msg.level}): #{msg}")
     end

data/vendored/puppet/lib/puppet/util/network_device/base.rb

@@ -12,7 +12,7 @@ class Puppet::Util::NetworkDevice::Base
 
     @autoloader = Puppet::Util::Autoload.new(self, "puppet/util/network_device/transport")
 
-    if @autoloader.load(@url.scheme)
+    if @autoloader.load(@url.scheme, Puppet.lookup(:current_environment))
       @transport = Puppet::Util::NetworkDevice::Transport.const_get(@url.scheme.capitalize).new(options[:debug])
       @transport.host = @url.host
       @transport.port = @url.port || case @url.scheme ; when "ssh" ; 22 ; when "telnet" ; 23 ; end

data/vendored/puppet/lib/puppet/util/platform.rb

@@ -30,6 +30,9 @@ module Puppet
       end
       module_function :fips_enabled?
 
+      def self.jruby?
+        RUBY_PLATFORM == 'java'
+      end
     end
   end
 end

data/vendored/puppet/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -127,7 +127,7 @@ module RDoc::PuppetParserCore
     container, name  = get_class_or_module(container,name)
     mod = container.add_module(RDoc::PuppetModule, name)
     mod.record_location(@top_level)
-    mod.add_comment(comment, @input_file_name)
+    mod.add_comment(comment, @top_level)
 
     if @input_file_name =~ /\.rb$/
       parse_plugins(mod)

data/vendored/puppet/lib/puppet/util/reference.rb

@@ -56,8 +56,8 @@ class Puppet::Util::Reference
 
   end
 
-  def self.references
-    instance_loader(:reference).loadall
+  def self.references(environment)
+    instance_loader(:reference).loadall(environment)
     loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
   end
 

data/vendored/puppet/lib/puppet/util/rubygems.rb

@@ -21,7 +21,7 @@ module Puppet::Util::RubyGems
       # @api private
       def source
         if has_rubygems?
-          Gem::Specification.respond_to?(:latest_specs) ? Gems18Source : OldGemsSource
+          Gems18Source
         else
           NoGemsSource
         end
@@ -51,18 +51,6 @@ module Puppet::Util::RubyGems
     end
   end
 
-  # RubyGems < 1.8.0
-  # @api private
-  class OldGemsSource < Source
-    def directories
-      @paths ||= Gem.latest_load_paths
-    end
-
-    def clear_paths
-      Gem.clear_paths
-    end
-  end
-
   # @api private
   class NoGemsSource < Source
     def directories

data/vendored/puppet/lib/puppet/util/ssl.rb

@@ -1,6 +1,8 @@
+require 'openssl'
+
 ##
 # SSL is a private module with class methods that help work with x.509
-# subjects.
+# subjects and errors.
 #
 # @api private
 module Puppet::Util::SSL
@@ -50,4 +52,41 @@ module Puppet::Util::SSL
   def self.is_possibly_valid_dn?(dn)
     dn =~ /=/
   end
+
+  ##
+  # Extract and format meaningful error messages from OpenSSL::OpenSSLErrors
+  # and a Validator. Re-raises the error if unknown.
+  #
+  # @api private
+  #
+  # @param [OpenSSL::OpenSSLError] error An error thrown during creating a
+  #   connection
+  # @param [Puppet::SSL::DefaultValidator] verifier A Validator who may have
+  #   invalidated the connection
+  # @param [String] host The DNS name of the other end of the SSL connection
+  #
+  # @raises [Puppet::Error, OpenSSL::OpenSSLError]
+  def self.handle_connection_error(error, verifier, host)
+    # can be nil
+    peer_cert = verifier.peer_certs.last
+
+    if error.message.include? "certificate verify failed"
+      msg = error.message
+      msg << ": [" + verifier.verify_errors.join('; ') + "]"
+      raise Puppet::Error, msg, error.backtrace
+    elsif peer_cert && !OpenSSL::SSL.verify_certificate_identity(peer_cert, host)
+      valid_certnames = [peer_cert.subject.to_s.sub(/.*=/, ''),
+                         *Puppet::SSL::Certificate.subject_alt_names_for(peer_cert)].uniq
+      if valid_certnames.size > 1
+        expected_certnames = _("expected one of %{certnames}") % { certnames: valid_certnames.join(', ') }
+      else
+        expected_certnames = _("expected %{certname}") % { certname: valid_certnames.first }
+      end
+
+      msg = _("Server hostname '%{host}' did not match server certificate; %{expected_certnames}") % { host: host, expected_certnames: expected_certnames }
+      raise Puppet::Error, msg, error.backtrace
+    else
+      raise error
+    end
+  end
 end

data/vendored/puppet/lib/puppet/util/windows.rb

@@ -1,3 +1,4 @@
+require 'puppet/util/platform'
 module Puppet::Util::Windows
   module ADSI
     class User; end

data/vendored/puppet/lib/puppet/util/windows/file.rb

@@ -7,11 +7,29 @@ module Puppet::Util::Windows::File
 
   FILE_ATTRIBUTE_READONLY      = 0x00000001
 
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379607(v=vs.85).aspx
+  # The right to use the object for synchronization. This enables a thread to
+  # wait until the object is in the signaled state. Some object types do not
+  # support this access right.
   SYNCHRONIZE                 = 0x100000
+  # The right to delete the object.
+  DELETE                      = 0x00010000
+  # The right to read the information in the object's security descriptor, not including the information in the system access control list (SACL).
+  # READ_CONTROL              = 0x00020000
+  # The right to modify the discretionary access control list (DACL) in the object's security descriptor.
+  WRITE_DAC                   = 0x00040000
+  # The right to change the owner in the object's security descriptor.
+  WRITE_OWNER                 = 0x00080000
+
+  # Combines DELETE, READ_CONTROL, WRITE_DAC, and WRITE_OWNER access.
   STANDARD_RIGHTS_REQUIRED    = 0xf0000
+  # Currently defined to equal READ_CONTROL.
   STANDARD_RIGHTS_READ        = 0x20000
+  # Currently defined to equal READ_CONTROL.
   STANDARD_RIGHTS_WRITE       = 0x20000
+  # Currently defined to equal READ_CONTROL.
   STANDARD_RIGHTS_EXECUTE     = 0x20000
+  # Combines DELETE, READ_CONTROL, WRITE_DAC, WRITE_OWNER, and SYNCHRONIZE access.
   STANDARD_RIGHTS_ALL         = 0x1F0000
   SPECIFIC_RIGHTS_ALL         = 0xFFFF
 

data/vendored/puppet/lib/puppet/util/windows/security.rb

@@ -283,6 +283,8 @@ module Puppet::Util::Windows::Security
     owner_allow = FILE::STANDARD_RIGHTS_ALL  |
       FILE::FILE_READ_ATTRIBUTES |
       FILE::FILE_WRITE_ATTRIBUTES
+    # this prevents a mode that is not 7 from taking ownership of a file based
+    # on group membership and rewriting it / making it executable
     group_allow = FILE::STANDARD_RIGHTS_READ |
       FILE::FILE_READ_ATTRIBUTES |
       FILE::SYNCHRONIZE
@@ -304,6 +306,15 @@ module Puppet::Util::Windows::Security
       end
     end
 
+    # With a mode value of '7' for group / other, the value must then include
+    # additional perms beyond STANDARD_RIGHTS_READ to allow DACL modification
+    if ((mode & S_IRWXG) == S_IRWXG)
+      group_allow |= FILE::DELETE | FILE::WRITE_DAC | FILE::WRITE_OWNER
+    end
+    if ((mode & S_IRWXO) == S_IRWXO)
+      other_allow |= FILE::DELETE | FILE::WRITE_DAC | FILE::WRITE_OWNER
+    end
+
     if (mode & S_ISVTX).nonzero?
       nobody_allow |= FILE::FILE_APPEND_DATA;
     end
@@ -315,18 +326,16 @@ module Puppet::Util::Windows::Security
       system_allow = FILE::FILE_ALL_ACCESS
     end
 
-    isdir = File.directory?(path)
-
-    if isdir
-      if (mode & (S_IWUSR | S_IXUSR)) == (S_IWUSR | S_IXUSR)
-        owner_allow |= FILE::FILE_DELETE_CHILD
-      end
-      if (mode & (S_IWGRP | S_IXGRP)) == (S_IWGRP | S_IXGRP) && (mode & S_ISVTX) == 0
-        group_allow |= FILE::FILE_DELETE_CHILD
-      end
-      if (mode & (S_IWOTH | S_IXOTH)) == (S_IWOTH | S_IXOTH) && (mode & S_ISVTX) == 0
-        other_allow |= FILE::FILE_DELETE_CHILD
-      end
+    # even though FILE_DELETE_CHILD only applies to directories, it can be set on files
+    # this is necessary to do to ensure a file ends up with (F) FullControl
+    if (mode & (S_IWUSR | S_IXUSR)) == (S_IWUSR | S_IXUSR)
+      owner_allow |= FILE::FILE_DELETE_CHILD
+    end
+    if (mode & (S_IWGRP | S_IXGRP)) == (S_IWGRP | S_IXGRP) && (mode & S_ISVTX) == 0
+      group_allow |= FILE::FILE_DELETE_CHILD
+    end
+    if (mode & (S_IWOTH | S_IXOTH)) == (S_IWOTH | S_IXOTH) && (mode & S_ISVTX) == 0
+      other_allow |= FILE::FILE_DELETE_CHILD
     end
 
     # if owner and group the same, then map group permissions to the one owner ACE
@@ -341,6 +350,7 @@ module Puppet::Util::Windows::Security
       FILE.remove_attributes(path, FILE::FILE_ATTRIBUTE_READONLY)
     end
 
+    isdir = File.directory?(path)
     dacl = Puppet::Util::Windows::AccessControlList.new
     dacl.allow(sd.owner, owner_allow)
     unless isownergroup
@@ -363,8 +373,10 @@ module Puppet::Util::Windows::Security
       dacl.allow(Puppet::Util::Windows::SID::CreatorGroup, group_allow, inherit)
 
       inherit = inherit_only | Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE
-      dacl.allow(Puppet::Util::Windows::SID::CreatorOwner, owner_allow & ~FILE::FILE_EXECUTE, inherit)
-      dacl.allow(Puppet::Util::Windows::SID::CreatorGroup, group_allow & ~FILE::FILE_EXECUTE, inherit)
+      # allow any previously set bits *except* for these
+      perms_to_strip = ~(FILE::FILE_EXECUTE + FILE::WRITE_OWNER + FILE::WRITE_DAC)
+      dacl.allow(Puppet::Util::Windows::SID::CreatorOwner, owner_allow & perms_to_strip, inherit)
+      dacl.allow(Puppet::Util::Windows::SID::CreatorGroup, group_allow & perms_to_strip, inherit)
     end
 
     new_sd = Puppet::Util::Windows::SecurityDescriptor.new(sd.owner, sd.group, dacl, protected)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -206,62 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: win32-dir
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.9
-- !ruby/object:Gem::Dependency
-  name: win32-process
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-- !ruby/object:Gem::Dependency
-  name: win32-security
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-- !ruby/object:Gem::Dependency
-  name: win32-service
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +268,6 @@ email:
 executables:
 - bolt
 - bolt-inventory-pdb
-- bolt_catalog
 extensions: []
 extra_rdoc_files: []
 files:
@@ -350,9 +293,9 @@ files:
 - bolt-modules/boltlib/types/targetspec.pp
 - exe/bolt
 - exe/bolt-inventory-pdb
-- exe/bolt_catalog
 - lib/bolt.rb
 - lib/bolt/analytics.rb
+- lib/bolt/applicator.rb
 - lib/bolt/bolt_option_parser.rb
 - lib/bolt/catalog.rb
 - lib/bolt/cli.rb
@@ -390,6 +333,8 @@ files:
 - lib/bolt/util/on_access.rb
 - lib/bolt/version.rb
 - lib/bolt_ext/puppetdb_inventory.rb
+- libexec/apply_catalog.rb
+- libexec/bolt_catalog
 - modules/aggregate/lib/puppet/functions/aggregate/count.rb
 - modules/aggregate/lib/puppet/functions/aggregate/nodes.rb
 - modules/aggregate/plans/count.pp
@@ -913,7 +858,6 @@ files:
 - vendored/puppet/lib/puppet/module_tool.rb
 - vendored/puppet/lib/puppet/module_tool/applications.rb
 - vendored/puppet/lib/puppet/module_tool/applications/application.rb
-- vendored/puppet/lib/puppet/module_tool/applications/builder.rb
 - vendored/puppet/lib/puppet/module_tool/applications/checksummer.rb
 - vendored/puppet/lib/puppet/module_tool/applications/installer.rb
 - vendored/puppet/lib/puppet/module_tool/applications/searcher.rb
@@ -934,7 +878,6 @@ files:
 - vendored/puppet/lib/puppet/module_tool/local_tarball.rb
 - vendored/puppet/lib/puppet/module_tool/metadata.rb
 - vendored/puppet/lib/puppet/module_tool/shared_behaviors.rb
-- vendored/puppet/lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb
 - vendored/puppet/lib/puppet/module_tool/tar.rb
 - vendored/puppet/lib/puppet/module_tool/tar/gnu.rb
 - vendored/puppet/lib/puppet/module_tool/tar/mini.rb
@@ -1258,8 +1201,6 @@ files:
 - vendored/puppet/lib/puppet/provider/interface/cisco.rb
 - vendored/puppet/lib/puppet/provider/ldap.rb
 - vendored/puppet/lib/puppet/provider/macauthorization/macauthorization.rb
-- vendored/puppet/lib/puppet/provider/mailalias/aliases.rb
-- vendored/puppet/lib/puppet/provider/maillist/mailman.rb
 - vendored/puppet/lib/puppet/provider/mcx/mcxcontent.rb
 - vendored/puppet/lib/puppet/provider/mount.rb
 - vendored/puppet/lib/puppet/provider/mount/parsed.rb
@@ -1348,9 +1289,6 @@ files:
 - vendored/puppet/lib/puppet/provider/user/windows_adsi.rb
 - vendored/puppet/lib/puppet/provider/vlan/cisco.rb
 - vendored/puppet/lib/puppet/provider/yumrepo/inifile.rb
-- vendored/puppet/lib/puppet/provider/zfs/zfs.rb
-- vendored/puppet/lib/puppet/provider/zone/solaris.rb
-- vendored/puppet/lib/puppet/provider/zpool/zpool.rb
 - vendored/puppet/lib/puppet/reference/configuration.rb
 - vendored/puppet/lib/puppet/reference/function.rb
 - vendored/puppet/lib/puppet/reference/indirection.rb
@@ -1374,6 +1312,7 @@ files:
 - vendored/puppet/lib/puppet/rest/response.rb
 - vendored/puppet/lib/puppet/rest/route.rb
 - vendored/puppet/lib/puppet/rest/routes.rb
+- vendored/puppet/lib/puppet/rest/ssl_context.rb
 - vendored/puppet/lib/puppet/scheduler.rb
 - vendored/puppet/lib/puppet/scheduler/job.rb
 - vendored/puppet/lib/puppet/scheduler/scheduler.rb
@@ -1460,8 +1399,6 @@ files:
 - vendored/puppet/lib/puppet/type/interface.rb
 - vendored/puppet/lib/puppet/type/k5login.rb
 - vendored/puppet/lib/puppet/type/macauthorization.rb
-- vendored/puppet/lib/puppet/type/mailalias.rb
-- vendored/puppet/lib/puppet/type/maillist.rb
 - vendored/puppet/lib/puppet/type/mcx.rb
 - vendored/puppet/lib/puppet/type/mount.rb
 - vendored/puppet/lib/puppet/type/notify.rb
@@ -1481,9 +1418,6 @@ files:
 - vendored/puppet/lib/puppet/type/vlan.rb
 - vendored/puppet/lib/puppet/type/whit.rb
 - vendored/puppet/lib/puppet/type/yumrepo.rb
-- vendored/puppet/lib/puppet/type/zfs.rb
-- vendored/puppet/lib/puppet/type/zone.rb
-- vendored/puppet/lib/puppet/type/zpool.rb
 - vendored/puppet/lib/puppet/util.rb
 - vendored/puppet/lib/puppet/util/at_fork.rb
 - vendored/puppet/lib/puppet/util/at_fork/noop.rb
@@ -1497,6 +1431,7 @@ files:
 - vendored/puppet/lib/puppet/util/command_line.rb
 - vendored/puppet/lib/puppet/util/command_line/puppet_option_parser.rb
 - vendored/puppet/lib/puppet/util/command_line/trollop.rb
+- vendored/puppet/lib/puppet/util/connection.rb
 - vendored/puppet/lib/puppet/util/constant_inflector.rb
 - vendored/puppet/lib/puppet/util/diff.rb
 - vendored/puppet/lib/puppet/util/docs.rb
@@ -1638,7 +1573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Execute commands remotely over SSH and WinRM