chef 12.19.36 → 14.14.25

data/lib/chef/provider/ifconfig.rb

@@ -17,32 +17,24 @@
 #
 
 require "chef/log"
-require "chef/mixin/command"
 require "chef/mixin/shell_out"
 require "chef/provider"
 require "chef/resource/file"
 require "chef/exceptions"
 require "erb"
 
-#  Recipe example:
-#
-#    int = {Hash with your network settings...}
-#
-#    ifconfig  int['ip'] do
-#      ignore_failure  true
-#      device  int['dev']
-#      mask    int['mask']
-#      gateway int['gateway']
-#      mtu     int['mtu']
-#    end
-
 class Chef
   class Provider
+    # use the ifconfig resource to manage interfaces on *nix systems
+    #
+    # @example set a static ip on eth1
+    #   ifconfig '33.33.33.80' do
+    #     device 'eth1'
+    #   end
     class Ifconfig < Chef::Provider
       provides :ifconfig
 
       include Chef::Mixin::ShellOut
-      include Chef::Mixin::Command
 
       attr_accessor :config_template
       attr_accessor :config_path
@@ -53,40 +45,106 @@ class Chef
         @config_path = nil
       end
 
-      def whyrun_supported?
-        true
-      end
-
       def load_current_resource
         @current_resource = Chef::Resource::Ifconfig.new(new_resource.name)
 
         @ifconfig_success = true
         @interfaces = {}
 
-        @status = shell_out("ifconfig")
-        @status.stdout.each_line do |line|
-          if !line[0..9].strip.empty?
-            @int_name = line[0..9].strip
-            @interfaces[@int_name] = { "hwaddr" => (line =~ /(HWaddr)/ ? ($') : "nil").strip.chomp }
-          else
-            @interfaces[@int_name]["inet_addr"] = (line =~ /inet addr:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /inet addr:/
-            @interfaces[@int_name]["bcast"] = (line =~ /Bcast:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Bcast:/
-            @interfaces[@int_name]["mask"] = (line =~ /Mask:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Mask:/
-            @interfaces[@int_name]["mtu"] = (line =~ /MTU:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /MTU:/
-            @interfaces[@int_name]["metric"] = (line =~ /Metric:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Metric:/
+        @ifconfig_version = nil
+
+        @net_tools_version = shell_out("ifconfig", "--version")
+        @net_tools_version.stderr.each_line do |line|
+          if line =~ /^net-tools (\d+.\d+)/
+            @ifconfig_version = line.match(/^net-tools (\d+.\d+)/)[1]
           end
+        end
 
-          next unless @interfaces.key?(new_resource.device)
-          @interface = @interfaces.fetch(new_resource.device)
-
-          current_resource.target(new_resource.target)
-          current_resource.device(new_resource.device)
-          current_resource.inet_addr(@interface["inet_addr"])
-          current_resource.hwaddr(@interface["hwaddr"])
-          current_resource.bcast(@interface["bcast"])
-          current_resource.mask(@interface["mask"])
-          current_resource.mtu(@interface["mtu"])
-          current_resource.metric(@interface["metric"])
+        if @ifconfig_version.nil?
+          raise "net-tools not found - this is required for ifconfig"
+        elsif @ifconfig_version.to_f < 2.0
+          # Example output for 1.60 is as follows: (sanitized but format intact)
+          # eth0      Link encap:Ethernet  HWaddr 00:00:00:00:00:00
+          #           inet addr:192.168.1.1  Bcast:192.168.0.1  Mask:255.255.248.0
+          #           inet6 addr: 0000::00:0000:0000:0000/64 Scope:Link
+          #           UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          #           RX packets:65158911 errors:0 dropped:0 overruns:0 frame:0
+          #           TX packets:41723949 errors:0 dropped:0 overruns:0 carrier:0
+          #           collisions:0 txqueuelen:1000
+          #           RX bytes:42664658792 (39.7 GiB)  TX bytes:52722603938 (49.1 GiB)
+          #           Interrupt:30
+          @status = shell_out("ifconfig")
+          @status.stdout.each_line do |line|
+            if !line[0..9].strip.empty?
+              @int_name = line[0..9].strip
+              @interfaces[@int_name] = { "hwaddr" => (line =~ /(HWaddr)/ ? ($') : "nil").strip.chomp }
+            else
+              @interfaces[@int_name]["inet_addr"] = (line =~ /inet addr:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /inet addr:/
+              @interfaces[@int_name]["bcast"] = (line =~ /Bcast:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Bcast:/
+              @interfaces[@int_name]["mask"] = (line =~ /Mask:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Mask:/
+              @interfaces[@int_name]["mtu"] = (line =~ /MTU:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /MTU:/
+              @interfaces[@int_name]["metric"] = (line =~ /Metric:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Metric:/
+            end
+
+            next unless @interfaces.key?(new_resource.device)
+            @interface = @interfaces.fetch(new_resource.device)
+
+            current_resource.target(new_resource.target)
+            current_resource.device(new_resource.device)
+            current_resource.inet_addr(@interface["inet_addr"])
+            current_resource.hwaddr(@interface["hwaddr"])
+            current_resource.bcast(@interface["bcast"])
+            current_resource.mask(@interface["mask"])
+            current_resource.mtu(@interface["mtu"])
+            current_resource.metric(@interface["metric"])
+          end
+        elsif @ifconfig_version.to_f >= 2.0
+          # Example output for 2.10-alpha is as follows: (sanitized but format intact)
+          # eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+          #       inet 192.168.1.1  netmask 255.255.240.0  broadcast 192.168.0.1
+          #       inet6 0000::0000:000:0000:0000  prefixlen 64  scopeid 0x20<link>
+          #       ether 00:00:00:00:00:00  txqueuelen 1000  (Ethernet)
+          #       RX packets 2383836  bytes 1642630840 (1.5 GiB)
+          #       RX errors 0  dropped 0  overruns 0  frame 0
+          #       TX packets 1244218  bytes 977339327 (932.0 MiB)
+          #       TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+          #
+          # Permalink for addr_regex : https://rubular.com/r/JrykUpfjRnYeQD
+          @status = shell_out("ifconfig")
+          @status.stdout.each_line do |line|
+            addr_regex = /^(\w+)(-?):?(\d*):?\ .+$/
+            if line =~ addr_regex
+              if line.match(addr_regex).nil?
+                @int_name = "nil"
+              elsif line.match(addr_regex)[3] == ""
+                @int_name = line.match(addr_regex)[1]
+                @interfaces[@int_name] = Hash.new
+                @interfaces[@int_name]["mtu"] = (line =~ /mtu (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /mtu/ && @interfaces[@int_name]["mtu"].nil?
+              else
+                @int_name = "#{line.match(addr_regex)[1]}:#{line.match(addr_regex)[3]}"
+                @interfaces[@int_name] = {}
+                @interfaces[@int_name]["mtu"] = (line =~ /mtu (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /mtu/ && @interfaces[@int_name]["mtu"].nil?
+              end
+            else
+              @interfaces[@int_name]["inet_addr"] = (line =~ /inet (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /inet/ && @interfaces[@int_name]["inet_addr"].nil?
+              @interfaces[@int_name]["bcast"] = (line =~ /broadcast (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /broadcast/ && @interfaces[@int_name]["bcast"].nil?
+              @interfaces[@int_name]["mask"] = (line =~ /netmask (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /netmask/ && @interfaces[@int_name]["mask"].nil?
+              @interfaces[@int_name]["hwaddr"] = (line =~ /ether (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /ether/ && @interfaces[@int_name]["hwaddr"].nil?
+              @interfaces[@int_name]["metric"] = (line =~ /Metric:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Metric:/ && @interfaces[@int_name]["metric"].nil?
+            end
+
+            next unless @interfaces.key?(new_resource.device)
+            @interface = @interfaces.fetch(new_resource.device)
+
+            current_resource.target(new_resource.target)
+            current_resource.device(new_resource.device)
+            current_resource.inet_addr(@interface["inet_addr"])
+            current_resource.hwaddr(@interface["hwaddr"])
+            current_resource.bcast(@interface["bcast"])
+            current_resource.mask(@interface["mask"])
+            current_resource.mtu(@interface["mtu"])
+            current_resource.metric(@interface["metric"])
+          end
         end
         current_resource
       end
@@ -107,8 +165,8 @@ class Chef
           unless new_resource.device == loopback_device
             command = add_command
             converge_by("run #{command.join(' ')} to add #{new_resource}") do
-              shell_out_compact!(command)
-              Chef::Log.info("#{new_resource} added")
+              shell_out!(command)
+              logger.info("#{new_resource} added")
             end
           end
         end
@@ -123,8 +181,8 @@ class Chef
         return if new_resource.device == loopback_device
         command = enable_command
         converge_by("run #{command.join(' ')} to enable #{new_resource}") do
-          shell_out_compact!(command)
-          Chef::Log.info("#{new_resource} enabled")
+          shell_out!(command)
+          logger.info("#{new_resource} enabled")
         end
       end
 
@@ -133,11 +191,11 @@ class Chef
         if current_resource.device
           command = delete_command
           converge_by("run #{command.join(' ')} to delete #{new_resource}") do
-            shell_out_compact!(command)
-            Chef::Log.info("#{new_resource} deleted")
+            shell_out!(command)
+            logger.info("#{new_resource} deleted")
           end
         else
-          Chef::Log.debug("#{new_resource} does not exist - nothing to do")
+          logger.trace("#{new_resource} does not exist - nothing to do")
         end
         delete_config
       end
@@ -148,11 +206,11 @@ class Chef
         if current_resource.device
           command = disable_command
           converge_by("run #{command.join(' ')} to disable #{new_resource}") do
-            shell_out_compact!(command)
-            Chef::Log.info("#{new_resource} disabled")
+            shell_out!(command)
+            logger.info("#{new_resource} disabled")
           end
         else
-          Chef::Log.debug("#{new_resource} does not exist - nothing to do")
+          logger.trace("#{new_resource} does not exist - nothing to do")
         end
       end
 

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

@@ -22,7 +22,7 @@ class Chef
   class Provider
     class Ifconfig
       class Aix < Chef::Provider::Ifconfig
-        provides :ifconfig, platform: %w{aix}
+        provides :ifconfig, platform: "aix"
 
         def load_current_resource
           @current_resource = Chef::Resource::Ifconfig.new(new_resource.name)
@@ -31,7 +31,7 @@ class Chef
           found_interface = false
           interface = {}
 
-          @status = shell_out_compact("ifconfig", "-a")
+          @status = shell_out("ifconfig", "-a")
           @status.stdout.each_line do |line|
             if !found_interface
               if line =~ /^(\S+):\sflags=(\S+)/
@@ -65,7 +65,7 @@ class Chef
 
         def add_command
           # ifconfig changes are temporary, chdev persist across reboots.
-          raise Chef::Exceptions::Ifconfig, "interface metric attribute cannot be set for :add action" if new_resource.metric
+          raise Chef::Exceptions::Ifconfig, "interface metric property cannot be set for :add action" if new_resource.metric
           command = [ "chdev", "-l", new_resource.device, "-a", "netaddr=#{new_resource.name}" ]
           command += [ "-a", "netmask=#{new_resource.mask}" ] if new_resource.mask
           command += [ "-a", "mtu=#{new_resource.mtu}" ] if new_resource.mtu

data/lib/chef/provider/ifconfig/debian.rb

@@ -36,11 +36,11 @@ class Chef
 <% if new_resource.onboot == "yes" %>auto <%= new_resource.device %><% end %>
 <% case new_resource.bootproto
    when "dhcp" %>
-iface <%= new_resource.device %> inet dhcp
+iface <%= new_resource.device %> <%= new_resource.family %> dhcp
 <% when "bootp" %>
-iface <%= new_resource.device %> inet bootp
+iface <%= new_resource.device %> <%= new_resource.family %> bootp
 <% else %>
-iface <%= new_resource.device %> inet static
+iface <%= new_resource.device %> <%= new_resource.family %> static
     <% if new_resource.target %>address <%= new_resource.target %><% end %>
     <% if new_resource.mask %>netmask <%= new_resource.mask %><% end %>
     <% if new_resource.network %>network <%= new_resource.network %><% end %>
@@ -48,6 +48,7 @@ iface <%= new_resource.device %> inet static
     <% if new_resource.metric %>metric <%= new_resource.metric %><% end %>
     <% if new_resource.hwaddr %>hwaddress <%= new_resource.hwaddr %><% end %>
     <% if new_resource.mtu %>mtu <%= new_resource.mtu %><% end %>
+    <% if new_resource.gateway %>gateway <%= new_resource.gateway %><% end %>
 <% end %>
 <% end %>
           }
@@ -62,6 +63,8 @@ iface <%= new_resource.device %> inet static
         protected
 
         def enforce_interfaces_dot_d_sanity
+          # on ubuntu 18.04 there's no interfaces file and it uses interfaces.d by default
+          return if ::File.directory?(INTERFACES_DOT_D_DIR) && !::File.exist?(INTERFACES_FILE)
           # create /etc/network/interfaces.d via dir resource (to get reporting, etc)
           dir = Chef::Resource::Directory.new(INTERFACES_DOT_D_DIR, run_context)
           dir.run_action(:create)

data/lib/chef/provider/ifconfig/redhat.rb

@@ -22,7 +22,7 @@ class Chef
   class Provider
     class Ifconfig
       class Redhat < Chef::Provider::Ifconfig
-        provides :ifconfig, platform_family: %w{fedora rhel}
+        provides :ifconfig, platform_family: %w{fedora rhel amazon}
 
         def initialize(new_resource, run_context)
           super(new_resource, run_context)
@@ -38,6 +38,12 @@ class Chef
 <% if new_resource.hwaddr %>HWADDR=<%= new_resource.hwaddr %><% end %>
 <% if new_resource.metric %>METRIC=<%= new_resource.metric %><% end %>
 <% if new_resource.mtu %>MTU=<%= new_resource.mtu %><% end %>
+<% if new_resource.ethtool_opts %>ETHTOOL_OPTS="<%= new_resource.ethtool_opts %>"<% end %>
+<% if new_resource.bonding_opts %>BONDING_OPTS="<%= new_resource.bonding_opts %>"<% end %>
+<% if new_resource.master %>MASTER=<%= new_resource.master %><% end %>
+<% if new_resource.slave %>SLAVE=<%= new_resource.slave %><% end %>
+<% if new_resource.vlan %>VLAN=<%= new_resource.vlan %><% end %>
+<% if new_resource.gateway %>GATEWAY=<%= new_resource.gateway %><% end %>
           }
           @config_path = "/etc/sysconfig/network-scripts/ifcfg-#{new_resource.device}"
         end

data/lib/chef/provider/launchd.rb

@@ -17,7 +17,6 @@
 #
 
 require "chef/provider"
-require "chef/resource/launchd"
 require "chef/resource/file"
 require "chef/resource/cookbook_file"
 require "chef/resource/macosx_service"
@@ -85,7 +84,12 @@ class Chef
         manage_service(:disable)
       end
 
+      def action_restart
+        manage_service(:restart)
+      end
+
       def manage_plist(action)
+        return unless manage_agent?(action)
         if source
           res = cookbook_file_resource
         else
@@ -97,11 +101,30 @@ class Chef
       end
 
       def manage_service(action)
+        return unless manage_agent?(action)
         res = service_resource
         res.run_action(action)
         new_resource.updated_by_last_action(true) if res.updated?
       end
 
+      def manage_agent?(action)
+        # Gets UID of console_user and converts to string.
+        console_user = Etc.getpwuid(::File.stat("/dev/console").uid).name
+        root = console_user == "root"
+        agent = type == "agent"
+        invalid_action = [:delete, :disable, :enable, :restart].include?(action)
+        lltstype = ""
+        if new_resource.limit_load_to_session_type
+          lltstype = new_resource.limit_load_to_session_type
+        end
+        invalid_type = lltstype != "LoginWindow"
+        if root && agent && invalid_action && invalid_type
+          logger.trace("#{label}: Aqua LaunchAgents shouldn't be loaded as root")
+          return false
+        end
+        true
+      end
+
       def service_resource
         res = Chef::Resource::MacosxService.new(label, run_context)
         res.name(label) if label

data/lib/chef/provider/link.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,10 +42,6 @@ class Chef
 
       private :negative_complement
 
-      def whyrun_supported?
-        true
-      end
-
       def load_current_resource
         @current_resource = Chef::Resource::Link.new(new_resource.name)
         current_resource.target_file(new_resource.target_file)
@@ -119,8 +115,8 @@ class Chef
           if new_resource.link_type == :symbolic
             converge_by("create symlink at #{new_resource.target_file} to #{new_resource.to}") do
               file_class.symlink(canonicalize(new_resource.to), new_resource.target_file)
-              Chef::Log.debug("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
-              Chef::Log.info("#{new_resource} created")
+              logger.trace("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
+              logger.info("#{new_resource} created")
               # file_class.symlink will create the link with default access controls.
               # This means that the access controls of the file could be different
               # than those captured during the initial evaluation of current_resource.
@@ -131,8 +127,8 @@ class Chef
           elsif new_resource.link_type == :hard
             converge_by("create hard link at #{new_resource.target_file} to #{new_resource.to}") do
               file_class.link(new_resource.to, new_resource.target_file)
-              Chef::Log.debug("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
-              Chef::Log.info("#{new_resource} created")
+              logger.trace("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
+              logger.info("#{new_resource} created")
             end
           end
         end
@@ -150,12 +146,12 @@ class Chef
           if Chef::Platform.windows? && ::File.directory?(current_resource.target_file)
             converge_by("delete link to dir at #{new_resource.target_file}") do
               ::Dir.delete(new_resource.target_file)
-              Chef::Log.info("#{new_resource} deleted")
+              logger.info("#{new_resource} deleted")
             end
           else
             converge_by("delete link to file at #{new_resource.target_file}") do
               ::File.delete(new_resource.target_file)
-              Chef::Log.info("#{new_resource} deleted")
+              logger.info("#{new_resource} deleted")
             end
           end
         end

data/lib/chef/provider/log.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Cary Penniman (<cary@rightscale.com>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,41 +17,27 @@
 #
 
 class Chef
-
   class Provider
-
     class Log
-
-      # Chef log provider, allows logging to chef's logs from recipes
+      # Chef log provider, allows logging to chef's logs
       class ChefLog < Chef::Provider
-
         provides :log
 
-        def whyrun_supported?
-          true
-        end
-
         # No concept of a 'current' resource for logs, this is a no-op
         #
-        # === Return
-        # true:: Always return true
+        # @return [true] Always returns true
         def load_current_resource
           true
         end
 
         # Write the log to Chef's log
         #
-        # === Return
-        # true:: Always return true
+        # @return [true] Always returns true
         def action_write
-          Chef::Log.send(new_resource.level, new_resource.message)
+          logger.send(new_resource.level, new_resource.message)
           new_resource.updated_by_last_action(true) if Chef::Config[:count_log_resource_updates]
         end
-
       end
-
     end
-
   end
-
 end