chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/lib/chef/json_compat.rb

@@ -42,7 +42,7 @@ class Chef
         # JSON gem requires top level object to be a Hash or Array (otherwise
         # you get the "must contain two octets" error). Yajl doesn't impose the
         # same limitation. For compatibility, we re-impose this condition.
-        unless obj.kind_of?(Hash) || obj.kind_of?(Array)
+        unless obj.is_a?(Hash) || obj.is_a?(Array)
           raise Chef::Exceptions::JSON::ParseError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
         end
 

data/lib/chef/key.rb

@@ -77,23 +77,24 @@ class Chef
 
     def actor(arg = nil)
       set_or_return(:actor, arg,
-                    regex: /^[a-z0-9\-_]+$/)
+        regex: /^[a-z0-9\-_]+$/)
     end
 
     def name(arg = nil)
       set_or_return(:name, arg,
-                    kind_of: String)
+        kind_of: String)
     end
 
     def public_key(arg = nil)
       raise Chef::Exceptions::InvalidKeyAttribute, "you cannot set the public_key if create_key is true" if !arg.nil? && @create_key
+
       set_or_return(:public_key, arg,
-                    kind_of: String)
+        kind_of: String)
     end
 
     def private_key(arg = nil)
       set_or_return(:private_key, arg,
-                    kind_of: String)
+        kind_of: String)
     end
 
     def delete_public_key
@@ -106,13 +107,14 @@ class Chef
 
     def create_key(arg = nil)
       raise Chef::Exceptions::InvalidKeyAttribute, "you cannot set create_key to true if the public_key field exists" if arg == true && !@public_key.nil?
+
       set_or_return(:create_key, arg,
-                    kind_of: [TrueClass, FalseClass])
+        kind_of: [TrueClass, FalseClass])
     end
 
     def expiration_date(arg = nil)
       set_or_return(:expiration_date, arg,
-                    regex: /^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|infinity)$/)
+        regex: /^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|infinity)$/)
     end
 
     def to_h

data/lib/chef/knife.rb

@@ -231,9 +231,7 @@ class Chef
     end
 
     def self.load_deps
-      dependency_loaders.each do |dep_loader|
-        dep_loader.call
-      end
+      dependency_loaders.each(&:call)
     end
 
     OFFICIAL_PLUGINS = %w{ec2 rackspace windows openstack azure google linode push vcenter lpar}.freeze
@@ -244,6 +242,7 @@ class Chef
         msg "Available #{category_desc}subcommands: (for details, knife SUB-COMMAND --help)\n\n"
         subcommand_loader.list_commands(preferred_category).sort.each do |category, commands|
           next if category =~ /deprecated/i
+
           msg "** #{category.upcase} COMMANDS **"
           commands.sort.each do |command|
             subcommand_loader.load_command(command)
@@ -264,7 +263,7 @@ class Chef
       # user could not be resolved to a subcommand.
       # @api private
       def subcommand_not_found!(args)
-        ui.fatal("Cannot find subcommand for: '#{args.join(' ')}'")
+        ui.fatal("Cannot find subcommand for: '#{args.join(" ")}'")
 
         # Mention rehash when the subcommands cache(plugin_manifest.json) is used
         if subcommand_loader.is_a?(Chef::Knife::SubcommandLoader::HashedCommandLoader)
@@ -386,6 +385,7 @@ class Chef
       return :cli if @original_config.include? key
       return :config if config_file_settings.key? key
       return :cli_default if default_config.include? key
+
       nil
     end
 
@@ -476,6 +476,7 @@ class Chef
       end
     rescue Exception => e
       raise if raise_exception || ( Chef::Config[:verbosity] && Chef::Config[:verbosity] >= 2 )
+
       humanize_exception(e)
       exit 100
     end
@@ -640,7 +641,7 @@ class Chef
     end
 
     def maybe_setup_fips
-      if !config[:fips].nil?
+      unless config[:fips].nil?
         Chef::Config[:fips] = config[:fips]
       end
       Chef::Config.init_openssl

data/lib/chef/knife/bootstrap.rb

@@ -195,6 +195,7 @@ class Chef
           unless valid_values.include?(v)
             raise "Invalid value '#{v}' for --node-ssl-verify-mode. Valid values are: #{valid_values.join(", ")}"
           end
+
           v
         }
 
@@ -282,9 +283,9 @@ class Chef
         long: "--hint HINT_NAME[=HINT_FILE]",
         description: "Specify an Ohai hint to be set on the bootstrap target. Use multiple --hint options to specify multiple hints.",
         proc: Proc.new { |h|
-          Chef::Config[:knife][:hints] ||= Hash.new
+          Chef::Config[:knife][:hints] ||= {}
           name, path = h.split("=")
-          Chef::Config[:knife][:hints][name] = path ? Chef::JSONCompat.parse(::File.read(path)) : Hash.new
+          Chef::Config[:knife][:hints][name] = path ? Chef::JSONCompat.parse(::File.read(path)) : {}
         }
 
       # bootstrap override: url of a an installer shell script touse in place of omnitruck
@@ -647,6 +648,7 @@ class Chef
               q.echo = false
             end
           end
+
           opts.merge! force_ssh_password_opts(password)
           do_connect(opts)
         else
@@ -654,14 +656,14 @@ class Chef
         end
       end
 
-      def handle_ssh_error(e)
-      end
+      def handle_ssh_error(e); end
 
       # url values override CLI flags, if you provide both
       # we'll use the one that you gave in the URL.
       def connection_protocol
         return @connection_protocol if @connection_protocol
-        from_url = host_descriptor =~ /^(.*):\/\// ? $1 : nil
+
+        from_url = host_descriptor =~ %r{^(.*)://} ? $1 : nil
         from_cli = config[:connection_protocol]
         from_knife = Chef::Config[:knife][:connection_protocol]
         @connection_protocol = from_url || from_cli || from_knife || "ssh"
@@ -678,6 +680,7 @@ class Chef
         if @config[:first_boot_attributes] && @config[:first_boot_attributes_from_file]
           raise Chef::Exceptions::BootstrapCommandInputError
         end
+
         true
       end
 
@@ -783,16 +786,14 @@ class Chef
       # Plugins that subclass bootstrap, e.g. knife-ec2, can use this method to create connection objects
       #
       # @return [TrueClass] If instance successfully created, or exits
-      def plugin_setup!
-      end
+      def plugin_setup!; end
 
       # Perform any teardown or cleanup necessary by the plugin
       #
       # Plugins that subclass bootstrap, e.g. knife-ec2, can use this method to display a message or perform any cleanup
       #
       # @return [void]
-      def plugin_finalize
-      end
+      def plugin_finalize; end
 
       # If session_timeout is too short, it is likely
       # a holdover from "--winrm-session-timeout" which used
@@ -842,6 +843,7 @@ class Chef
       # host via train
       def connection_opts(reset: false)
         return @connection_opts unless @connection_opts.nil? || reset == true
+
         @connection_opts = {}
         @connection_opts.merge! base_opts
         @connection_opts.merge! host_verify_opts
@@ -864,9 +866,9 @@ class Chef
       # Common configuration for all protocols
       def base_opts
         port = config_value(:connection_port,
-                            knife_key_for_protocol(connection_protocol, :port))
+          knife_key_for_protocol(connection_protocol, :port))
         user = config_value(:connection_user,
-                            knife_key_for_protocol(connection_protocol, :user))
+          knife_key_for_protocol(connection_protocol, :user))
         {}.tap do |opts|
           opts[:logger] = Chef::Log
           # We do not store password in Chef::Config, so only use CLI `config` here
@@ -892,6 +894,7 @@ class Chef
       def ssh_opts
         opts = {}
         return opts if winrm?
+
         opts[:pty] = true # ensure we can talk to systems with requiretty set true in sshd config
         opts[:non_interactive] = true # Prevent password prompts from underlying net/ssh
         opts[:forward_agent] = (config_value(:ssh_forward_agent) === true)
@@ -902,6 +905,7 @@ class Chef
       def ssh_identity_opts
         opts = {}
         return opts if winrm?
+
         identity_file = config_value(:ssh_identity_file)
         if identity_file
           opts[:key_files] = [identity_file]
@@ -962,6 +966,7 @@ class Chef
       #              should we change that for consistency?
       def sudo_opts
         return {} if winrm?
+
         opts = { sudo: false }
         if config[:use_sudo]
           opts[:sudo] = true
@@ -977,6 +982,7 @@ class Chef
 
       def winrm_opts
         return {} unless winrm?
+
         auth_method = config_value(:winrm_auth_method, :winrm_auth_method, "negotiate")
         opts = {
           winrm_transport: auth_method, # winrm gem and train calls auth method 'transport'
@@ -1006,7 +1012,7 @@ class Chef
           non_interactive: false,
           keys_only: false,
           key_files: [],
-          auth_methods: [:password, :keyboard_interactive],
+          auth_methods: %i{password keyboard_interactive},
         }
       end
 
@@ -1085,6 +1091,7 @@ class Chef
       def session_timeout
         timeout = config_value(:session_timeout)
         return options[:session_timeout][:default] if timeout.nil?
+
         timeout.to_i
       end
     end

data/lib/chef/knife/bootstrap/chef_vault_handler.rb

@@ -145,6 +145,7 @@ class Chef
               if Gem::Version.new(ChefVault::VERSION) < Gem::Version.new("2.6.0")
                 raise error_message
               end
+
               true
             rescue LoadError
               raise error_message

data/lib/chef/knife/bootstrap/client_builder.rb

@@ -188,6 +188,7 @@ class Chef
           true
         rescue Net::HTTPClientException => e
           raise unless e.response.code == "404"
+
           false
         end
 

data/lib/chef/knife/bootstrap/train_connector.rb

@@ -18,12 +18,13 @@
 require "train"
 require "tempfile" unless defined?(Tempfile)
 require "uri" unless defined?(URI)
+require "securerandom" unless defined?(SecureRandom)
 
 class Chef
   class Knife
     class Bootstrap < Knife
       class TrainConnector
-        SSH_CONFIG_OVERRIDE_KEYS ||= [:user, :port, :proxy].freeze
+        SSH_CONFIG_OVERRIDE_KEYS ||= %i{user port proxy}.freeze
 
         MKTEMP_WIN_COMMAND ||= <<~EOM.freeze
           $parent = [System.IO.Path]::GetTempPath();
@@ -32,7 +33,7 @@ class Chef
           $tmp.FullName
         EOM
 
-        MKTEMP_NIX_COMMAND ||= "bash -c 'd=$(mktemp -d ${TMPDIR:-/tmp}/chef_XXXXXX); echo $d'".freeze
+        DEFAULT_REMOTE_TEMP ||= "/tmp".freeze
 
         def initialize(host_url, default_protocol, opts)
           @host_url = host_url
@@ -114,22 +115,24 @@ class Chef
         #
         # @return [String] the temporary path created on the remote host.
         def temp_dir
-          cmd = windows? ? MKTEMP_WIN_COMMAND : MKTEMP_NIX_COMMAND
           @tmpdir ||= begin
-                        res = run_command!(cmd)
-                        # Since pty is enabled in the connection, stderr to be merged into stdout.
-                        # So, there are cases where unnecessary multi-line output
-                        # is included before the result of mktemp.
-                        dir = res.stdout.split.last
-                        unless windows?
-                          # Ensure that dir has the correct owner.  We are possibly
-                          # running with sudo right now - so this directory would be owned by root.
-                          # File upload is performed over SCP as the current logged-in user,
-                          # so we'll set ownership to ensure that works.
-                          run_command!("chown #{config[:user]} '#{dir}'")
-                        end
-                        dir
-                      end
+            if windows?
+              run_command!(MKTEMP_WIN_COMMAND).stdout.split.last
+            else
+              # Get a 6 chars string using secure random
+              # eg. /tmp/chef_XXXXXX.
+              # Use mkdir to create TEMP dir to get rid of mktemp
+              dir = "#{DEFAULT_REMOTE_TEMP}/chef_#{SecureRandom.alphanumeric(6)}"
+              cmd = "mkdir -p %s" % dir
+              # Ensure that dir has the correct owner.  We are possibly
+              # running with sudo right now - so this directory would be owned by root.
+              # File upload is performed over SCP as the current logged-in user,
+              # so we'll set ownership to ensure that works.
+              cmd += " && sudo chown #{config[:user]} '#{dir}'"
+              run_command!(cmd)
+              dir
+            end
+          end
         end
 
         #
@@ -213,6 +216,7 @@ class Chef
           if result.exit_status != 0
             raise RemoteExecutionFailed.new(hostname, command, result)
           end
+
           result
         end
 
@@ -247,6 +251,7 @@ class Chef
         # Return a hash of winrm options based on configuration already built.
         def opts_inferred_from_winrm(config, opts_in)
           return {} unless config[:backend] == "winrm"
+
           opts_out = {}
 
           if opts_in[:ssl]
@@ -296,6 +301,7 @@ class Chef
         # itself - causing SSH config data to be ignored
         def missing_opts_from_ssh_config(config, opts_in)
           return {} unless config[:backend] == "ssh"
+
           host_cfg = ssh_config_for_host(config[:host])
           opts_out = {}
           opts_in.each do |key, _value|

data/lib/chef/knife/client_bulk_delete.rb

@@ -27,9 +27,9 @@ class Chef
       end
 
       option :delete_validators,
-       short: "-D",
-       long: "--delete-validators",
-       description: "Force deletion of clients if they're validators."
+        short: "-D",
+        long: "--delete-validators",
+        description: "Force deletion of clients if they're validators."
 
       banner "knife client bulk delete REGEX (options)"
 
@@ -45,6 +45,7 @@ class Chef
         validators_to_delete = {}
         all_clients.each do |name, client|
           next unless name =~ matcher
+
           if client.validator
             validators_to_delete[client.name] = client
           else

data/lib/chef/knife/client_create.rb

@@ -28,25 +28,25 @@ class Chef
       end
 
       option :file,
-             short: "-f FILE",
-             long: "--file FILE",
-             description: "Write the private key to a file if the #{Chef::Dist::SERVER_PRODUCT} generated one."
+        short: "-f FILE",
+        long: "--file FILE",
+        description: "Write the private key to a file if the #{Chef::Dist::SERVER_PRODUCT} generated one."
 
       option :validator,
-             long: "--validator",
-             description: "Create the client as a validator.",
-             boolean: true
+        long: "--validator",
+        description: "Create the client as a validator.",
+        boolean: true
 
       option :public_key,
-             short: "-p FILE",
-             long: "--public-key",
-             description: "Set the initial default key for the client from a file on disk (cannot pass with --prevent-keygen)."
+        short: "-p FILE",
+        long: "--public-key",
+        description: "Set the initial default key for the client from a file on disk (cannot pass with --prevent-keygen)."
 
       option :prevent_keygen,
-             short: "-k",
-             long: "--prevent-keygen",
-             description: "Prevent #{Chef::Dist::SERVER_PRODUCT} from generating a default key pair for you. Cannot be passed with --public-key.",
-             boolean: true
+        short: "-k",
+        long: "--prevent-keygen",
+        description: "Prevent #{Chef::Dist::SERVER_PRODUCT} from generating a default key pair for you. Cannot be passed with --public-key.",
+        boolean: true
 
       banner "knife client create CLIENTNAME (options)"
 

data/lib/chef/knife/client_delete.rb

@@ -27,9 +27,9 @@ class Chef
       end
 
       option :delete_validators,
-       short: "-D",
-       long: "--delete-validators",
-       description: "Force deletion of client if it's a validator."
+        short: "-D",
+        long: "--delete-validators",
+        description: "Force deletion of client if it's a validator."
 
       banner "knife client delete [CLIENT [CLIENT]] (options)"
 

data/lib/chef/knife/config_get.rb

@@ -25,16 +25,16 @@ class Chef
       banner "knife config get [OPTION...] (options)\nDisplays the value of Chef::Config[OPTION] (or all config values)"
 
       option :all,
-             short: "-a",
-             long: "--all",
-             description: "Include options that are not set in the configuration.",
-             default: false
+        short: "-a",
+        long: "--all",
+        description: "Include options that are not set in the configuration.",
+        default: false
 
       option :raw,
-              short: "-r",
-              long: "--raw",
-              description: "Display a each value with no formatting.",
-              default: false
+        short: "-r",
+        long: "--raw",
+        description: "Display a each value with no formatting.",
+        default: false
 
       def run
         if config[:format] == "summary" && !config[:raw]

data/lib/chef/knife/config_list_profiles.rb

@@ -24,10 +24,10 @@ class Chef
       banner "knife config list-profiles (options)"
 
       option :ignore_knife_rb,
-             short: "-i",
-             long: "--ignore-knife-rb",
-             description: "Ignore the current config.rb/knife.rb configuration.",
-             default: false
+        short: "-i",
+        long: "--ignore-knife-rb",
+        description: "Ignore the current config.rb/knife.rb configuration.",
+        default: false
 
       def run
         credentials_data = self.class.config_loader.parse_credentials_file