chef 14.5.27-universal-mingw32 → 14.5.33-universal-mingw32

data/lib/chef/file_content_management/deploy.rb

@@ -1,37 +1,37 @@
-#
-# 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");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/file_content_management/deploy/cp"
-require "chef/file_content_management/deploy/mv_unix"
-if Chef::Platform.windows?
-  require "chef/file_content_management/deploy/mv_windows"
-end
-
-class Chef
-  class FileContentManagement
-    class Deploy
-      def self.strategy(atomic_update)
-        if atomic_update
-          Chef::Platform.windows? ? MvWindows.new() : MvUnix.new()
-        else
-          Cp.new()
-        end
-      end
-    end
-  end
-end
+#
+# 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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/file_content_management/deploy/cp"
+require "chef/file_content_management/deploy/mv_unix"
+if Chef::Platform.windows?
+  require "chef/file_content_management/deploy/mv_windows"
+end
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      def self.strategy(atomic_update)
+        if atomic_update
+          Chef::Platform.windows? ? MvWindows.new() : MvUnix.new()
+        else
+          Cp.new()
+        end
+      end
+    end
+  end
+end

data/lib/chef/file_content_management/deploy/cp.rb

@@ -1,48 +1,48 @@
-#
-# 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");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# PURPOSE: This strategy preserves the inode, and will preserve modes + ownership
-#          even if the user running chef cannot create that ownership (but has
-#          rights to the file).  It is vulnerable to crashes in the middle of
-#          writing the file which could result in corruption or zero-length files.
-#
-
-class Chef
-  class FileContentManagement
-    class Deploy
-      #
-      # PURPOSE: This strategy preserves the inode, and will preserve modes + ownership
-      #          even if the user running chef cannot create that ownership (but has
-      #          rights to the file).  It is vulnerable to crashes in the middle of
-      #          writing the file which could result in corruption or zero-length files.
-      #
-      class Cp
-        def create(file)
-          Chef::Log.trace("Touching #{file} to create it")
-          FileUtils.touch(file)
-        end
-
-        def deploy(src, dst)
-          Chef::Log.trace("Copying temporary file #{src} into place at #{dst}")
-          FileUtils.cp(src, dst)
-        end
-      end
-    end
-  end
-end
+#
+# 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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# PURPOSE: This strategy preserves the inode, and will preserve modes + ownership
+#          even if the user running chef cannot create that ownership (but has
+#          rights to the file).  It is vulnerable to crashes in the middle of
+#          writing the file which could result in corruption or zero-length files.
+#
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      #
+      # PURPOSE: This strategy preserves the inode, and will preserve modes + ownership
+      #          even if the user running chef cannot create that ownership (but has
+      #          rights to the file).  It is vulnerable to crashes in the middle of
+      #          writing the file which could result in corruption or zero-length files.
+      #
+      class Cp
+        def create(file)
+          Chef::Log.trace("Touching #{file} to create it")
+          FileUtils.touch(file)
+        end
+
+        def deploy(src, dst)
+          Chef::Log.trace("Copying temporary file #{src} into place at #{dst}")
+          FileUtils.cp(src, dst)
+        end
+      end
+    end
+  end
+end

data/lib/chef/file_content_management/deploy/mv_unix.rb

@@ -1,76 +1,76 @@
-#
-# 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");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class Chef
-  class FileContentManagement
-    class Deploy
-      #
-      # PURPOSE: this strategy is atomic, and attempts to preserve file modes
-      #
-      # NOTE: there is no preserve flag to FileUtils.mv, and we want to preserve the dst file
-      #       modes rather than the src file modes (preserve = true is what mv does already, we
-      #       would like preserve = false which is tricky).
-      #
-      class MvUnix
-        def create(file)
-          # this is very simple, but it ensures that ownership and file modes take
-          # good defaults, in particular mode needs to obey umask on create
-          Chef::Log.trace("Touching #{file} to create it")
-          FileUtils.touch(file)
-        end
-
-        def deploy(src, dst)
-          # we are only responsible for content so restore the dst files perms
-          Chef::Log.trace("Reading modes from #{dst} file")
-          stat = ::File.stat(dst)
-          mode = stat.mode & 07777
-          uid  = stat.uid
-          gid  = stat.gid
-
-          Chef::Log.trace("Applying mode = #{mode.to_s(8)}, uid = #{uid}, gid = #{gid} to #{src}")
-
-          # i own the inode, so should be able to at least chmod it
-          ::File.chmod(mode, src)
-
-          # we may be running as non-root in which case because we are doing an mv we cannot preserve
-          # the file modes.  after the mv we have a different inode and if we don't have rights to
-          # chown/chgrp on the inode then we can't fix the ownership.
-          #
-          # in the case where i'm running chef-solo on my homedir as myself and some root-shell
-          # work has caused dotfiles of mine to change to root-owned, i'm fine with this not being
-          # exceptional, and i think most use cases will consider this to not be exceptional, and
-          # the right thing is to fix the ownership of the file to the user running the commmand
-          # (which requires write perms to the directory, or mv will throw an exception)
-          begin
-            ::File.chown(uid, nil, src)
-          rescue Errno::EPERM
-            Chef::Log.warn("Could not set uid = #{uid} on #{src}, file modes not preserved")
-          end
-          begin
-            ::File.chown(nil, gid, src)
-          rescue Errno::EPERM
-            Chef::Log.warn("Could not set gid = #{gid} on #{src}, file modes not preserved")
-          end
-
-          Chef::Log.trace("Moving temporary file #{src} into place at #{dst}")
-          FileUtils.mv(src, dst)
-        end
-      end
-    end
-  end
-end
+#
+# 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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      #
+      # PURPOSE: this strategy is atomic, and attempts to preserve file modes
+      #
+      # NOTE: there is no preserve flag to FileUtils.mv, and we want to preserve the dst file
+      #       modes rather than the src file modes (preserve = true is what mv does already, we
+      #       would like preserve = false which is tricky).
+      #
+      class MvUnix
+        def create(file)
+          # this is very simple, but it ensures that ownership and file modes take
+          # good defaults, in particular mode needs to obey umask on create
+          Chef::Log.trace("Touching #{file} to create it")
+          FileUtils.touch(file)
+        end
+
+        def deploy(src, dst)
+          # we are only responsible for content so restore the dst files perms
+          Chef::Log.trace("Reading modes from #{dst} file")
+          stat = ::File.stat(dst)
+          mode = stat.mode & 07777
+          uid  = stat.uid
+          gid  = stat.gid
+
+          Chef::Log.trace("Applying mode = #{mode.to_s(8)}, uid = #{uid}, gid = #{gid} to #{src}")
+
+          # i own the inode, so should be able to at least chmod it
+          ::File.chmod(mode, src)
+
+          # we may be running as non-root in which case because we are doing an mv we cannot preserve
+          # the file modes.  after the mv we have a different inode and if we don't have rights to
+          # chown/chgrp on the inode then we can't fix the ownership.
+          #
+          # in the case where i'm running chef-solo on my homedir as myself and some root-shell
+          # work has caused dotfiles of mine to change to root-owned, i'm fine with this not being
+          # exceptional, and i think most use cases will consider this to not be exceptional, and
+          # the right thing is to fix the ownership of the file to the user running the commmand
+          # (which requires write perms to the directory, or mv will throw an exception)
+          begin
+            ::File.chown(uid, nil, src)
+          rescue Errno::EPERM
+            Chef::Log.warn("Could not set uid = #{uid} on #{src}, file modes not preserved")
+          end
+          begin
+            ::File.chown(nil, gid, src)
+          rescue Errno::EPERM
+            Chef::Log.warn("Could not set gid = #{gid} on #{src}, file modes not preserved")
+          end
+
+          Chef::Log.trace("Moving temporary file #{src} into place at #{dst}")
+          FileUtils.mv(src, dst)
+        end
+      end
+    end
+  end
+end

data/lib/chef/file_content_management/deploy/mv_windows.rb

@@ -1,103 +1,103 @@
-#
-# 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");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# We update the contents of the file, using mv for atomicity, while maintaining all the
-# ACL information on the dst file.
-#
-
-require "chef/platform/query_helpers"
-if Chef::Platform.windows?
-  require "chef/win32/security"
-end
-
-class Chef
-  class FileContentManagement
-    class Deploy
-      class MvWindows
-
-        Security = Chef::ReservedNames::Win32::Security
-        ACL = Security::ACL
-
-        def create(file)
-          Chef::Log.trace("Touching #{file} to create it")
-          FileUtils.touch(file)
-        end
-
-        def deploy(src, dst)
-          #
-          # At the time of deploy ACLs are correctly configured on the
-          # dst. This would be a simple atomic move operations in
-          # windows was not converting inherited ACLs of src to
-          # non-inherited ACLs in certain cases.See:
-          # http://blogs.msdn.com/b/oldnewthing/archive/2006/08/24/717181.aspx
-          #
-
-          #
-          # First cache the ACLs of dst file
-          #
-
-          dst_so = Security::SecurableObject.new(dst)
-          begin
-            # get the sd with the SACL
-            dst_sd = dst_so.security_descriptor(true)
-          rescue Chef::Exceptions::Win32APIError
-            # Catch and raise if the user is not elevated enough.
-            # At this point we can't configure the file as expected so
-            # we're failing action on the resource.
-            raise Chef::Exceptions::WindowsNotAdmin, "can not get the security information for '#{dst}' due to missing Administrator privileges."
-          end
-
-          dacl_present = dst_sd.dacl_present?
-          if dacl_present
-            if dst_sd.dacl.nil?
-              apply_dacl = nil
-            else
-              apply_dacl = ACL.create(dst_sd.dacl.select { |ace| !ace.inherited? })
-            end
-          end
-
-          sacl_present = dst_sd.sacl_present?
-          if sacl_present
-            if dst_sd.sacl.nil?
-              apply_sacl = nil
-            else
-              apply_sacl = ACL.create(dst_sd.sacl.select { |ace| !ace.inherited? })
-            end
-          end
-
-          #
-          # Then deploy the file
-          #
-
-          FileUtils.mv(src, dst)
-
-          #
-          # Then apply the cached acls to the new dst file
-          #
-
-          dst_so = Security::SecurableObject.new(dst)
-          dst_so.group = dst_sd.group
-          dst_so.owner = dst_sd.owner
-          dst_so.set_dacl(apply_dacl, dst_sd.dacl_inherits?) if dacl_present
-          dst_so.set_sacl(apply_sacl, dst_sd.sacl_inherits?) if sacl_present
-        end
-      end
-    end
-  end
-end
+#
+# 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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# We update the contents of the file, using mv for atomicity, while maintaining all the
+# ACL information on the dst file.
+#
+
+require "chef/platform/query_helpers"
+if Chef::Platform.windows?
+  require "chef/win32/security"
+end
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      class MvWindows
+
+        Security = Chef::ReservedNames::Win32::Security
+        ACL = Security::ACL
+
+        def create(file)
+          Chef::Log.trace("Touching #{file} to create it")
+          FileUtils.touch(file)
+        end
+
+        def deploy(src, dst)
+          #
+          # At the time of deploy ACLs are correctly configured on the
+          # dst. This would be a simple atomic move operations in
+          # windows was not converting inherited ACLs of src to
+          # non-inherited ACLs in certain cases.See:
+          # http://blogs.msdn.com/b/oldnewthing/archive/2006/08/24/717181.aspx
+          #
+
+          #
+          # First cache the ACLs of dst file
+          #
+
+          dst_so = Security::SecurableObject.new(dst)
+          begin
+            # get the sd with the SACL
+            dst_sd = dst_so.security_descriptor(true)
+          rescue Chef::Exceptions::Win32APIError
+            # Catch and raise if the user is not elevated enough.
+            # At this point we can't configure the file as expected so
+            # we're failing action on the resource.
+            raise Chef::Exceptions::WindowsNotAdmin, "can not get the security information for '#{dst}' due to missing Administrator privileges."
+          end
+
+          dacl_present = dst_sd.dacl_present?
+          if dacl_present
+            if dst_sd.dacl.nil?
+              apply_dacl = nil
+            else
+              apply_dacl = ACL.create(dst_sd.dacl.select { |ace| !ace.inherited? })
+            end
+          end
+
+          sacl_present = dst_sd.sacl_present?
+          if sacl_present
+            if dst_sd.sacl.nil?
+              apply_sacl = nil
+            else
+              apply_sacl = ACL.create(dst_sd.sacl.select { |ace| !ace.inherited? })
+            end
+          end
+
+          #
+          # Then deploy the file
+          #
+
+          FileUtils.mv(src, dst)
+
+          #
+          # Then apply the cached acls to the new dst file
+          #
+
+          dst_so = Security::SecurableObject.new(dst)
+          dst_so.group = dst_sd.group
+          dst_so.owner = dst_sd.owner
+          dst_so.set_dacl(apply_dacl, dst_sd.dacl_inherits?) if dacl_present
+          dst_so.set_sacl(apply_sacl, dst_sd.sacl_inherits?) if sacl_present
+        end
+      end
+    end
+  end
+end