puppet 2.7.13 → 2.7.14

data/lib/puppet/provider/augeas/augeas.rb

@@ -297,8 +297,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do
           saved_files = @aug.match("/augeas/events/saved")
           if saved_files.size > 0
             root = resource[:root].sub(/^\/$/, "")
-            saved_files.each do |key|
-              saved_file = @aug.get(key).sub(/^\/files/, root)
+            saved_files.map! {|key| @aug.get(key).sub(/^\/files/, root) }
+            saved_files.uniq.each do |saved_file|
               if Puppet[:show_diff]
                 notice "\n" + diff(saved_file, saved_file + ".augnew")
               end

data/lib/puppet/provider/exec.rb

@@ -1,3 +1,6 @@
+require 'puppet/provider'
+require 'puppet/util/execution'
+
 class Puppet::Provider::Exec < Puppet::Provider
   include Puppet::Util::Execution
 
@@ -63,9 +66,11 @@ class Puppet::Provider::Exec < Puppet::Provider
   end
 
   def extractexe(command)
-    # easy case: command was quoted
-    if command =~ /^"([^"]+)"/
-      $1
+    if command.is_a? Array
+      command.first
+    elsif match = /^"([^"]+)"|^'([^']+)'/.match(command)
+      # extract whichever of the two sides matched the content.
+      match[1] or match[2]
     else
       command.split(/ /)[0]
     end

data/lib/puppet/provider/exec/shell.rb

@@ -16,8 +16,7 @@ Puppet::Type.type(:exec).provide :shell, :parent => :posix do
   EOT
 
   def run(command, check = false)
-    command = %Q{/bin/sh -c "#{command.gsub(/"/,'\"')}"}
-    super(command, check)
+    super(['/bin/sh', '-c', command], check)
   end
 
   def validatecmd(command)

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -323,9 +323,15 @@ class DirectoryService < Puppet::Provider::NameService
 
         # users_plist['ShadowHashData'][0].string is actually a binary plist
         # that's nested INSIDE the user's plist (which itself is a binary
-        # plist).
-        password_hash_plist = users_plist['ShadowHashData'][0].string
-        converted_hash_plist = convert_binary_to_xml(password_hash_plist)
+        # plist). If we encounter a user plist that DOESN'T have a
+        # ShadowHashData field, create one.
+        if users_plist['ShadowHashData']
+          password_hash_plist = users_plist['ShadowHashData'][0].string
+          converted_hash_plist = convert_binary_to_xml(password_hash_plist)
+        else
+          users_plist['ShadowHashData'] = [StringIO.new]
+          converted_hash_plist = {'SALTED-SHA512' => StringIO.new}
+        end
 
         # converted_hash_plist['SALTED-SHA512'].string expects a Base64 encoded
         # string. The password_hash provided as a resource attribute is a
@@ -348,7 +354,7 @@ class DirectoryService < Puppet::Provider::NameService
   def self.get_password(guid, username)
     # Use Puppet::Util::Package.versioncmp() to catch the scenario where a
     # version '10.10' would be < '10.7' with simple string comparison. This
-    # if-statement only executes if the current version is less-than 10.7 
+    # if-statement only executes if the current version is less-than 10.7
     if (Puppet::Util::Package.versioncmp(get_macosx_version_major, '10.7') == -1)
       password_hash = nil
       password_hash_file = "#{@@password_hash_dir}/#{guid}"

data/lib/puppet/provider/package/gem.rb

@@ -104,7 +104,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     # This always gets the latest version available.
     hash = self.class.gemlist(:justme => resource[:name])
 
-    hash[:ensure]
+    hash[:ensure][0]
   end
 
   def query

data/lib/puppet/provider/package/pkg.rb

@@ -12,22 +12,17 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   def self.instances
     packages = []
 
-    cmd = "#{command(:pkg)} list -H"
-    execpipe(cmd) do |process|
-      hash = {}
-
+    pkg(:list, '-H').each_line do |line|
       # now turn each returned line into a package object
-      process.each_line { |line|
-        if hash = parse_line(line)
-          packages << new(hash)
-        end
-      }
+      if hash = parse_line(line.chomp)
+        packages << new(hash)
+      end
     end
 
     packages
   end
 
-  self::REGEX = %r{^(\S+)\s+(\S+)\s+(\S+)\s+}
+  self::REGEX = /^(\S+)(?:\s+\(.*?\))?\s+(\S+)\s+(\S+)\s+\S+$/
   self::FIELDS = [:name, :version, :status]
 
   def self.parse_line(line)
@@ -39,7 +34,6 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
       }
 
       hash[:provider] = self.name
-      hash[:error] = "ok"
 
       if hash[:status] == "installed"
         hash[:ensure] = :present
@@ -47,7 +41,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
         hash[:ensure] = :absent
       end
     else
-      Puppet.warning "Failed to match 'pkg list' line #{line.inspect}"
+      warning "Failed to match 'pkg list' line #{line.inspect}"
       return nil
     end
 
@@ -58,8 +52,8 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   # TODO deal with multiple publishers
   def latest
     version = nil
-    pkg(:list, "-Ha", @resource[:name]).split("\n").each do |line|
-      v = line.split[2]
+    pkg(:list, "-Ha", @resource[:name]).each_line do |line|
+      v = parse_line(line.chomp)[:status]
       case v
       when "known"
         return v
@@ -93,15 +87,10 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
       output = pkg(:list, "-H", @resource[:name])
     rescue Puppet::ExecutionFailure
       # pkg returns 1 if the package is not found.
-      return {:ensure => :absent, :status => 'missing',
-        :name => @resource[:name], :error => 'ok'}
+      return {:ensure => :absent, :name => @resource[:name]}
     end
 
-    hash = self.class.parse_line(output) ||
-      {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
-
-    raise Puppet::Error.new( "Package #{hash[:name]}, version #{hash[:version]} is in error state: #{hash[:error]}") if hash[:error] != "ok"
-
+    hash = self.class.parse_line(output.chomp) || {:ensure => :absent, :name => @resource[:name]}
     hash
   end
 end

data/lib/puppet/provider/selmodule/semodule.rb

@@ -117,8 +117,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
     lines = ()
     begin
       execpipe("#{command(:semodule)} --list") do |output|
-        lines = output.readlines
-        lines.each_line do |line|
+        output.each_line do |line|
           line.chomp!
           bits = line.split
           if bits[0] == @resource[:name]

data/lib/puppet/provider/service/upstart.rb

@@ -1,4 +1,4 @@
-Puppet::Type.type(:service).provide :upstart, :parent => :init do
+Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   desc "Ubuntu service management with `upstart`.
 
   This provider manages `upstart` jobs, which have replaced `initd` services
@@ -6,6 +6,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :init do
   "
   # confine to :ubuntu for now because I haven't tested on other platforms
   confine :operatingsystem => :ubuntu #[:ubuntu, :fedora, :debian]
+  
+  defaultfor :operatingsystem => :ubuntu
 
   commands :start   => "/sbin/start",
            :stop    => "/sbin/stop",
@@ -39,33 +41,47 @@ Puppet::Type.type(:service).provide :upstart, :parent => :init do
   end
 
   def startcmd
-    [command(:start), @resource[:name]]
+    is_upstart? ? [command(:start), @resource[:name]] : super
   end
 
   def stopcmd
-    [command(:stop), @resource[:name]]
+    is_upstart? ? [command(:stop),  @resource[:name]] : super
   end
 
   def restartcmd
-    (@resource[:hasrestart] == :true) && [command(:restart), @resource[:name]]
+    is_upstart? ? (@resource[:hasrestart] == :true) && [command(:restart), @resource[:name]] : super
   end
 
+  def statuscmd
+    is_upstart? ? nil : super #this is because upstart is broken with its return codes
+  end
+  
   def status
-    # allows user override of status command
     if @resource[:status]
-      ucommand(:status, false)
-      if $?.exitstatus == 0
-        return :running
-      else
-        return :stopped
-      end
+      is_upstart?(@resource[:status]) ? upstart_status(@resource[:status]) : normal_status
+    elsif is_upstart?
+      upstart_status
     else
-      output = status_exec(@resource[:name].split)
-      if (! $?.nil?) && (output =~ /start\//)
-        return :running
-      else
-        return :stopped
-      end
+      super
     end
   end
+  
+  def normal_status
+    ucommand(:status, false)
+    ($?.exitstatus == 0) ? :running : :stopped
+  end
+  
+  def upstart_status(exec = @resource[:name])
+    output = status_exec(@resource[:name].split)
+    if (! $?.nil?) && (output =~ /start\//)
+      return :running
+    else
+      return :stopped
+    end
+  end
+  
+  def is_upstart?(script = initscript)
+    File.symlink?(script) && File.readlink(script) == "/lib/init/upstart-job"
+  end
+
 end

data/lib/puppet/provider/ssh_authorized_key/parsed.rb

@@ -17,7 +17,7 @@ require 'puppet/provider/parsedfile'
     :fields   => %w{options type key name},
     :optional => %w{options},
     :rts => /^\s+/,
-    :match    => /^(?:(.+) )?(ssh-dss|ssh-rsa) ([^ ]+) ?(.*)$/,
+    :match    => /^(?:(.+) )?(ssh-dss|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521) ([^ ]+) ?(.*)$/,
     :post_parse => proc { |h|
       h[:name] = "" if h[:name] == :absent
       h[:options] ||= [:absent]

data/lib/puppet/rails/inventory_node.rb

@@ -3,21 +3,21 @@ require 'puppet/rails/inventory_fact'
 class Puppet::Rails::InventoryNode < ::ActiveRecord::Base
   has_many :facts, :class_name => "Puppet::Rails::InventoryFact", :foreign_key => :node_id, :dependent => :delete_all
 
-  if Puppet::Util.activerecord_version >= 3.0
-    # Prevents "DEPRECATION WARNING: Base.named_scope has been deprecated, please use Base.scope instead"
-    ActiveRecord::NamedScope::ClassMethods.module_eval { alias :named_scope :scope }
+  if Puppet::Util.activerecord_version < 3.0
+    # For backward compatibility, add the newer name to older implementations.
+    ActiveRecord::NamedScope::ClassMethods.module_eval { alias :scope :named_scope }
   end
 
-  named_scope :has_fact_with_value, lambda { |name,value|
+  scope :has_fact_with_value, lambda { |name,value|
     {
-      :conditions => ["inventory_facts.name = ? AND inventory_facts.value = ?", name, value],
+      :conditions => ["inventory_facts.name = ? AND inventory_facts.value = ?", name, value.to_s],
       :joins => :facts
     }
   }
 
-  named_scope :has_fact_without_value, lambda { |name,value|
+  scope :has_fact_without_value, lambda { |name,value|
     {
-      :conditions => ["inventory_facts.name = ? AND inventory_facts.value != ?", name, value],
+      :conditions => ["inventory_facts.name = ? AND inventory_facts.value != ?", name, value.to_s],
       :joins => :facts
     }
   }

data/lib/puppet/reports/http.rb

@@ -16,7 +16,10 @@ Puppet::Reports.register_report(:http) do
     req.body = self.to_yaml
     req.content_type = "application/x-yaml"
     Net::HTTP.new(url.host, url.port).start {|http|
-      http.request(req)
+      response = http.request(req)
+      unless response.kind_of?(Net::HTTPSuccess)
+        Puppet.err "Unable to submit report to #{Puppet[:reporturl].to_s} [#{response.code}] #{response.msg}"
+      end
     }
   end
 end

data/lib/puppet/reports/tagmail.rb

@@ -113,6 +113,13 @@ Puppet::Reports.register_report(:tagmail) do
       return
     end
 
+    metrics = raw_summary['resources'] || {} rescue {}
+
+    if metrics['out_of_sync'] == 0 && metrics['changed'] == 0
+      Puppet.notice "Not sending tagmail report; no changes"
+      return
+    end
+
     taglists = parse(File.read(Puppet[:tagmap]))
 
     # Now find any appropriately tagged messages.
@@ -123,7 +130,7 @@ Puppet::Reports.register_report(:tagmail) do
 
   # Send the email reports.
   def send(reports)
-    pid = fork do
+    pid = Puppet::Util.safe_posix_fork do
       if Puppet[:smtpserver] != "none"
         begin
           Net::SMTP.start(Puppet[:smtpserver]) do |smtp|

data/lib/puppet/resource/type.rb

@@ -66,7 +66,7 @@ class Puppet::Resource::Type
     static_parent = evaluate_parent_type(resource)
     scope = static_parent || resource.scope
 
-    scope = scope.newscope(:namespace => namespace, :source => self, :resource => resource, :dynamic => !static_parent) unless resource.title == :main
+    scope = scope.newscope(:namespace => namespace, :source => self, :resource => resource) unless resource.title == :main
     scope.compiler.add_class(name) unless definition?
 
     set_resource_parameters(resource, scope)

data/lib/puppet/test/test_helper.rb

@@ -0,0 +1,138 @@
+module Puppet::Test
+  # This class is intended to provide an API to be used by external projects
+  #  when they are running tests that depend on puppet core.  This should
+  #  allow us to vary the implementation details of managing puppet's state
+  #  for testing, from one version of puppet to the next--without forcing
+  #  the external projects to do any of that state management or be aware of
+  #  the implementation details.
+  #
+  # For now, this consists of a few very simple signatures.  The plan is
+  #  that it should be the responsibility of the puppetlabs_spec_helper
+  #  to broker between external projects and this API; thus, if any
+  #  hacks are required (e.g. to determine whether or not a particular)
+  #  version of puppet supports this API, those hacks will be consolidated in
+  #  one place and won't need to be duplicated in every external project.
+  #
+  # This should also alleviate the anti-pattern that we've been following,
+  #  wherein each external project starts off with a copy of puppet core's
+  #  test_helper.rb and is exposed to risk of that code getting out of
+  #  sync with core.
+  #
+  # Since this class will be "library code" that ships with puppet, it does
+  #  not use API from any existing test framework such as rspec.  This should
+  #  theoretically allow it to be used with other unit test frameworks in the
+  #  future, if desired.
+  #
+  # Note that in the future this API could potentially be expanded to handle
+  #  other features such as "around_test", but we didn't see a compelling
+  #  reason to deal with that right now.
+  class TestHelper
+    # Call this method once, when beginning a test run--prior to running
+    #  any individual tests.
+    # @return nil
+    def self.before_all_tests()
+
+    end
+
+    # Call this method once, at the end of a test run, when no more tests
+    #  will be run.
+    # @return nil
+    def self.after_all_tests()
+
+    end
+
+    # Call this method once per test, prior to execution of each invididual test.
+    # @return nil
+    def self.before_each_test()
+      # We need to preserve the current state of all our indirection cache and
+      # terminus classes.  This is pretty important, because changes to these
+      # are global and lead to order dependencies in our testing.
+      #
+      # We go direct to the implementation because there is no safe, sane public
+      # API to manage restoration of these to their default values.  This
+      # should, once the value is proved, be moved to a standard API on the
+      # indirector.
+      #
+      # To make things worse, a number of the tests stub parts of the
+      # indirector.  These stubs have very specific expectations that what
+      # little of the public API we could use is, well, likely to explode
+      # randomly in some tests.  So, direct access.  --daniel 2011-08-30
+      $saved_indirection_state = {}
+      indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
+      indirections.each do |indirector|
+        $saved_indirection_state[indirector.name] = {
+            :@terminus_class => indirector.instance_variable_get(:@terminus_class),
+            :@cache_class    => indirector.instance_variable_get(:@cache_class)
+        }
+      end
+
+      initialize_settings_before_each()
+
+      # Longer keys are secure, but they sure make for some slow testing - both
+      # in terms of generating keys, and in terms of anything the next step down
+      # the line doing validation or whatever.  Most tests don't care how long
+      # or secure it is, just that it exists, so these are better and faster
+      # defaults, in testing only.
+      #
+      # I would make these even shorter, but OpenSSL doesn't support anything
+      # below 512 bits.  Sad, really, because a 0 bit key would be just fine.
+      Puppet[:req_bits]  = 512
+      Puppet[:keylength] = 512
+
+    end
+
+    # Call this method once per test, after execution of each individual test.
+    # @return nil
+    def self.after_each_test()
+      clear_settings_after_each()
+
+      Puppet::Node::Environment.clear
+      Puppet::Util::Storage.clear
+      Puppet::Util::ExecutionStub.reset
+
+      # Restore the indirector configuration.  See before hook.
+      indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
+      indirections.each do |indirector|
+        $saved_indirection_state.fetch(indirector.name, {}).each do |variable, value|
+          indirector.instance_variable_set(variable, value)
+        end
+      end
+      $saved_indirection_state = nil
+
+
+      # Some tests can cause us to connect, in which case the lingering
+      # connection is a resource that can cause unexpected failure in later
+      # tests, as well as sharing state accidentally.
+      # We're testing if ActiveRecord::Base is defined because some test cases
+      # may stub Puppet.features.rails? which is how we should normally
+      # introspect for this functionality.
+      ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
+
+    end
+
+
+    #########################################################################################
+    # PRIVATE METHODS (not part of the public TestHelper API--do not call these from outside
+    #  of this class!)
+    #########################################################################################
+
+    def self.initialize_settings_before_each()
+      # these globals are set by Application
+      $puppet_application_mode = nil
+      $puppet_application_name = nil
+      # Set the confdir and vardir to gibberish so that tests
+      # have to be correctly mocked.
+      Puppet[:confdir] = "/dev/null"
+      Puppet[:vardir] = "/dev/null"
+
+      # Avoid opening ports to the outside world
+      Puppet[:bindaddress] = "127.0.0.1"
+    end
+    private_class_method :initialize_settings_before_each
+
+    def self.clear_settings_after_each()
+      Puppet.settings.clear
+    end
+    private_class_method :clear_settings_after_each
+  end
+end