chef 12.6.0 → 12.7.2

data/lib/chef/provider/subversion.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +18,10 @@
 
 #TODO subversion and git should both extend from a base SCM provider.
 
-require 'chef/log'
-require 'chef/provider'
-require 'chef/mixin/command'
-require 'fileutils'
+require "chef/log"
+require "chef/provider"
+require "chef/mixin/command"
+require "fileutils"
 
 class Chef
   class Provider
@@ -48,7 +48,7 @@ class Chef
       end
 
       def define_resource_requirements
-        requirements.assert(:all_actions)  do |a|
+        requirements.assert(:all_actions) do |a|
           # Make sure the parent dir exists, or else fail.
           # for why run, print a message explaining the potential error.
           parent_directory = ::File.dirname(@new_resource.destination)
@@ -115,7 +115,7 @@ class Chef
       def export_command
         args = ["--force"]
         args << @new_resource.svn_arguments << verbose << authentication <<
-            "-r#{revision_int}" << @new_resource.repository << @new_resource.destination
+          "-r#{revision_int}" << @new_resource.repository << @new_resource.destination
         c = scm :export, *args
         Chef::Log.info "#{@new_resource} exported #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
         c
@@ -130,7 +130,7 @@ class Chef
             @new_resource.revision
           else
             command = scm(:info, @new_resource.repository, @new_resource.svn_info_args, authentication, "-r#{@new_resource.revision}")
-            svn_info = shell_out!(command, run_options(:cwd => cwd, :returns => [0,1])).stdout
+            svn_info = shell_out!(command, run_options(:cwd => cwd, :returns => [0, 1])).stdout
 
             extract_revision_info(svn_info)
           end
@@ -142,7 +142,7 @@ class Chef
       def find_current_revision
         return nil unless ::File.exist?(::File.join(@new_resource.destination, ".svn"))
         command = scm(:info)
-        svn_info = shell_out!(command, run_options(:cwd => cwd, :returns => [0,1])).stdout
+        svn_info = shell_out!(command, run_options(:cwd => cwd, :returns => [0, 1])).stdout
 
         extract_revision_info(svn_info)
       end
@@ -151,7 +151,7 @@ class Chef
         (!@current_resource.revision.nil?) && (revision_int.strip.to_i == @current_resource.revision.strip.to_i)
       end
 
-      def run_options(run_opts={})
+      def run_options(run_opts = {})
         run_opts[:user] = @new_resource.user if @new_resource.user
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:timeout] = @new_resource.timeout if @new_resource.timeout
@@ -176,7 +176,7 @@ class Chef
           end
           attrs
         end
-        rev = (repo_attrs['Last Changed Rev'] || repo_attrs['Revision'])
+        rev = (repo_attrs["Last Changed Rev"] || repo_attrs["Revision"])
         rev.strip! if rev
         raise "Could not parse `svn info` data: #{svn_info}" if repo_attrs.empty?
         Chef::Log.debug "#{@new_resource} resolved revision #{@new_resource.revision} to #{rev}"
@@ -201,12 +201,12 @@ class Chef
       end
 
       def target_dir_non_existent_or_empty?
-        !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination).sort == ['.','..']
+        !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination).sort == [".", ".."]
       end
 
       def svn_binary
         @new_resource.svn_binary ||
-          (Chef::Platform.windows? ? 'svn.exe' : 'svn')
+          (Chef::Platform.windows? ? "svn.exe" : "svn")
       end
 
       def assert_target_directory_valid!

data/lib/chef/provider/template.rb

@@ -1,7 +1,7 @@
 #--
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2010 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +17,10 @@
 # limitations under the License.
 #
 
-require 'chef/provider/template_finder'
-require 'chef/provider/file'
-require 'chef/deprecation/provider/template'
-require 'chef/deprecation/warnings'
+require "chef/provider/template_finder"
+require "chef/provider/file"
+require "chef/deprecation/provider/template"
+require "chef/deprecation/warnings"
 
 class Chef
   class Provider

data/lib/chef/provider/template/content.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/template'
-require 'chef/file_content_management/content_base'
+require "chef/mixin/template"
+require "chef/file_content_management/content_base"
 
 class Chef
   class Provider

data/lib/chef/provider/template_finder.rb

@@ -1,6 +1,6 @@
 #--
 # Author:: Andrea Campi (<andrea.campi@zephirworks.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,6 +41,7 @@ class Chef
       end
 
     protected
+
       def template_source_name(name, options)
         if options[:source]
           options[:source]

data/lib/chef/provider/user.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'chef/provider'
-require 'chef/mixin/command'
-require 'etc'
+require "chef/provider"
+require "chef/mixin/command"
+require "etc"
 
 class Chef
   class Provider
@@ -71,9 +71,9 @@ class Chef
           end
           @current_resource.comment(user_info.gecos)
 
-          if @new_resource.password && @current_resource.password == 'x'
+          if @new_resource.password && @current_resource.password == "x"
             begin
-              require 'shadow'
+              require "shadow"
             rescue LoadError
               @shadow_lib_ok = false
             else
@@ -98,7 +98,7 @@ class Chef
           a.assertion { @shadow_lib_ok }
           a.failure_message Chef::Exceptions::MissingLibrary, "You must have ruby-shadow installed for password support!"
           a.whyrun "ruby-shadow is not installed. Attempts to set user password will cause failure.  Assuming that this gem will have been previously installed." +
-                   "Note that user update converge may report false-positive on the basis of mismatched password. "
+            "Note that user update converge may report false-positive on the basis of mismatched password. "
         end
         requirements.assert(:modify, :lock, :unlock) do |a|
           a.assertion { @user_exists }
@@ -125,7 +125,6 @@ class Chef
       end
 
       def action_create
-
         if !@user_exists
           converge_by("create user #{@new_resource.username}") do
             create_user
@@ -180,7 +179,7 @@ class Chef
             lock_user
             Chef::Log.info("#{@new_resource} locked")
           end
-         else
+        else
           Chef::Log.debug("#{@new_resource} already locked - nothing to do")
         end
       end

data/lib/chef/provider/user/aix.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@ class Chef
   class Provider
     class User
       class Aix < Chef::Provider::User::Useradd
-        provides :user, platform: %w(aix)
+        provides :user, platform: %w{aix}
 
         UNIVERSAL_OPTIONS = [[:comment, "-c"], [:gid, "-g"], [:shell, "-s"], [:uid, "-u"]]
 
@@ -48,7 +48,7 @@ class Chef
           end
           raise Chef::Exceptions::User, "Cannot determine if #{@new_resource} is locked!" if lock_info.stdout.empty?
 
-          status  = /\S+\s+account_locked=(\S+)/.match(lock_info.stdout)
+          status = /\S+\s+account_locked=(\S+)/.match(lock_info.stdout)
           if status && status[1] == "true"
             @locked = true
           else
@@ -67,6 +67,7 @@ class Chef
         end
 
       private
+
         def add_password
           if @current_resource.password != @new_resource.password && @new_resource.password
             Chef::Log.debug("#{@new_resource.username} setting password to #{@new_resource.password}")

data/lib/chef/provider/user/dscl.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Dreamcat4 (<dreamcat4@gmail.com>)
-# Copyright:: Copyright (c) 2009 OpsCode, Inc.
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'mixlib/shellout'
-require 'chef/provider/user'
-require 'openssl'
-require 'plist'
-require 'chef/util/path_helper'
+require "mixlib/shellout"
+require "chef/provider/user"
+require "openssl"
+require "plist"
+require "chef/util/path_helper"
 
 class Chef
   class Provider
@@ -109,7 +109,6 @@ in 'password', with the associated 'salt' and 'iterations'.")
 Mac OS X version 10.7. Please specify a SALTED-SHA512 shadow hash in 'password' attribute to set the \
 user password using shadow hash.")
           end
-
         end
 
         def load_current_resource
@@ -136,16 +135,16 @@ user password using shadow hash.")
               if shadow_hash["SALTED-SHA512"]
                 # Convert the shadow value from Base64 encoding to hex before consuming them
                 @password_shadow_conversion_algorithm = "SALTED-SHA512"
-                current_resource.password(shadow_hash["SALTED-SHA512"].string.unpack('H*').first)
+                current_resource.password(shadow_hash["SALTED-SHA512"].string.unpack("H*").first)
               elsif shadow_hash["SALTED-SHA512-PBKDF2"]
                 @password_shadow_conversion_algorithm = "SALTED-SHA512-PBKDF2"
                 # Convert the entropy from Base64 encoding to hex before consuming them
-                current_resource.password(shadow_hash["SALTED-SHA512-PBKDF2"]["entropy"].string.unpack('H*').first)
+                current_resource.password(shadow_hash["SALTED-SHA512-PBKDF2"]["entropy"].string.unpack("H*").first)
                 current_resource.iterations(shadow_hash["SALTED-SHA512-PBKDF2"]["iterations"])
                 # Convert the salt from Base64 encoding to hex before consuming them
-                current_resource.salt(shadow_hash["SALTED-SHA512-PBKDF2"]["salt"].string.unpack('H*').first)
+                current_resource.salt(shadow_hash["SALTED-SHA512-PBKDF2"]["salt"].string.unpack("H*").first)
               else
-                raise(Chef::Exceptions::User,"Unknown shadow_hash format: #{shadow_hash.keys.join(' ')}")
+                raise(Chef::Exceptions::User, "Unknown shadow_hash format: #{shadow_hash.keys.join(' ')}")
               end
             end
 
@@ -213,7 +212,7 @@ user password using shadow hash.")
         #
         def dscl_set_uid
           # XXX: mutates the new resource
-          new_resource.uid(get_free_uid) if (new_resource.uid.nil? || new_resource.uid == '')
+          new_resource.uid(get_free_uid) if (new_resource.uid.nil? || new_resource.uid == "")
 
           if uid_used?(new_resource.uid)
             raise(Chef::Exceptions::RequestedUIDUnavailable, "uid #{new_resource.uid} is already in use")
@@ -226,7 +225,7 @@ user password using shadow hash.")
         # Find the next available uid on the system. starting with 200 if `system` is set,
         # 500 otherwise.
         #
-        def get_free_uid(search_limit=1000)
+        def get_free_uid(search_limit = 1000)
           uid = nil
           base_uid = new_resource.system ? 200 : 500
           next_uid_guess = base_uid
@@ -308,7 +307,7 @@ user password using shadow hash.")
 
         def validate_home_dir_specification!
           unless new_resource.home =~ /^\//
-            raise(Chef::Exceptions::InvalidHomeDirectory,"invalid path spec for User: '#{new_resource.username}', home directory: '#{new_resource.home}'")
+            raise(Chef::Exceptions::InvalidHomeDirectory, "invalid path spec for User: '#{new_resource.username}', home directory: '#{new_resource.home}'")
           end
         end
 
@@ -322,9 +321,9 @@ user password using shadow hash.")
 
         def ditto_home
           skel = "/System/Library/User Template/English.lproj"
-          raise(Chef::Exceptions::User,"can't find skel at: #{skel}") unless ::File.exists?(skel)
+          raise(Chef::Exceptions::User, "can't find skel at: #{skel}") unless ::File.exists?(skel)
           shell_out! "ditto '#{skel}' '#{new_resource.home}'"
-          ::FileUtils.chown_R(new_resource.username,new_resource.gid.to_s,new_resource.home)
+          ::FileUtils.chown_R(new_resource.username, new_resource.gid.to_s, new_resource.home)
         end
 
         def move_home
@@ -332,10 +331,10 @@ user password using shadow hash.")
 
           src = current_resource.home
           FileUtils.mkdir_p(new_resource.home)
-          files = ::Dir.glob("#{Chef::Util::PathHelper.escape_glob(src)}/*", ::File::FNM_DOTMATCH) - ["#{src}/.","#{src}/.."]
-          ::FileUtils.mv(files,new_resource.home, :force => true)
+          files = ::Dir.glob("#{Chef::Util::PathHelper.escape_glob(src)}/*", ::File::FNM_DOTMATCH) - ["#{src}/.", "#{src}/.."]
+          ::FileUtils.mv(files, new_resource.home, :force => true)
           ::FileUtils.rmdir(src)
-          ::FileUtils.chown_R(new_resource.username,new_resource.gid.to_s,new_resource.home)
+          ::FileUtils.chown_R(new_resource.username, new_resource.gid.to_s, new_resource.home)
         end
 
         #
@@ -363,7 +362,7 @@ user password using shadow hash.")
           # Shadow info is saved as binary plist. Convert the info to binary plist.
           shadow_info_binary = StringIO.new
           command = Mixlib::ShellOut.new("plutil -convert binary1 -o - -",
-            :input => shadow_info.to_plist, :live_stream => shadow_info_binary)
+                                         :input => shadow_info.to_plist, :live_stream => shadow_info_binary)
           command.run_command
 
           if user_info.nil?
@@ -384,20 +383,20 @@ user password using shadow hash.")
         # Prepares the password shadow info based on the platform version.
         #
         def prepare_password_shadow_info
-          shadow_info = { }
+          shadow_info = {}
           entropy = nil
           salt = nil
           iterations = nil
 
           if mac_osx_version_10_7?
             hash_value = if salted_sha512?(new_resource.password)
-              new_resource.password
-            else
-              # Create a random 4 byte salt
-              salt = OpenSSL::Random.random_bytes(4)
-              encoded_password = OpenSSL::Digest::SHA512.hexdigest(salt + new_resource.password)
-              hash_value = salt.unpack('H*').first + encoded_password
-            end
+                           new_resource.password
+                         else
+                           # Create a random 4 byte salt
+                           salt = OpenSSL::Random.random_bytes(4)
+                           encoded_password = OpenSSL::Digest::SHA512.hexdigest(salt + new_resource.password)
+                           hash_value = salt.unpack("H*").first + encoded_password
+                         end
 
             shadow_info["SALTED-SHA512"] = StringIO.new
             shadow_info["SALTED-SHA512"].string = convert_to_binary(hash_value)
@@ -416,11 +415,11 @@ user password using shadow hash.")
                 salt,
                 iterations,
                 128,
-                OpenSSL::Digest::SHA512.new
+                OpenSSL::Digest::SHA512.new,
               )
             end
 
-            pbkdf_info = { }
+            pbkdf_info = {}
             pbkdf_info["entropy"] = StringIO.new
             pbkdf_info["entropy"].string = entropy
             pbkdf_info["salt"] = StringIO.new
@@ -465,7 +464,7 @@ user password using shadow hash.")
         # Unlocks the user
         #
         def unlock_user
-          auth_string = authentication_authority.gsub(/AuthenticationAuthority: /,"").gsub(/;DisabledUser;/,"").strip
+          auth_string = authentication_authority.gsub(/AuthenticationAuthority: /, "").gsub(/;DisabledUser;/, "").strip
           run_dscl("create /Users/#{new_resource.username} AuthenticationAuthority '#{auth_string}'")
         end
 
@@ -570,7 +569,7 @@ user password using shadow hash.")
           :comment => "realname",
           :password => "passwd",
           :auth_authority => "authentication_authority",
-          :shadow_hash => "ShadowHashData"
+          :shadow_hash => "ShadowHashData",
         }.freeze
 
         # Directory where the user plist files are stored for versions 10.7 and above
@@ -655,16 +654,16 @@ user password using shadow hash.")
         def run_dscl(*args)
           result = shell_out("dscl . -#{args.join(' ')}")
           return "" if ( args.first =~ /^delete/ ) && ( result.exitstatus != 0 )
-          raise(Chef::Exceptions::DsclCommandFailed,"dscl error: #{result.inspect}") unless result.exitstatus == 0
-          raise(Chef::Exceptions::DsclCommandFailed,"dscl error: #{result.inspect}") if result.stdout =~ /No such key: /
+          raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") unless result.exitstatus == 0
+          raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") if result.stdout =~ /No such key: /
           result.stdout
         end
 
         def run_plutil(*args)
           result = shell_out("plutil -#{args.join(' ')}")
-          raise(Chef::Exceptions::PlistUtilCommandFailed,"plutil error: #{result.inspect}") unless result.exitstatus == 0
+          raise(Chef::Exceptions::PlistUtilCommandFailed, "plutil error: #{result.inspect}") unless result.exitstatus == 0
           if result.stdout.encoding == Encoding::ASCII_8BIT
-            result.stdout.encode("utf-8", "binary",  :undef => :replace, :invalid => :replace, :replace => '?')
+            result.stdout.encode("utf-8", "binary", :undef => :replace, :invalid => :replace, :replace => "?")
           else
             result.stdout
           end
@@ -675,7 +674,7 @@ user password using shadow hash.")
         end
 
         def convert_to_binary(string)
-          string.unpack('a2'*(string.size/2)).collect { |i| i.hex.chr }.join
+          string.unpack("a2" * (string.size / 2)).collect { |i| i.hex.chr }.join
         end
 
         def salted_sha512?(string)
@@ -684,7 +683,7 @@ user password using shadow hash.")
 
         def salted_sha512_password_match?
           # Salt is included in the first 4 bytes of shadow data
-          salt = current_resource.password.slice(0,8)
+          salt = current_resource.password.slice(0, 8)
           shadow = OpenSSL::Digest::SHA512.hexdigest(convert_to_binary(salt) + new_resource.password)
           current_resource.password == salt + shadow
         end
@@ -701,8 +700,8 @@ user password using shadow hash.")
             salt,
             current_resource.iterations,
             128,
-            OpenSSL::Digest::SHA512.new
-          ).unpack('H*').first == current_resource.password
+            OpenSSL::Digest::SHA512.new,
+          ).unpack("H*").first == current_resource.password
         end
 
       end