puppet 3.1.1 → 3.2.0.rc1

data/lib/puppet/external/pson/pure/parser.rb

@@ -66,7 +66,8 @@ module PSON
       # * *object_class*: Defaults to Hash
       # * *array_class*: Defaults to Array
       def initialize(source, opts = {})
-        super
+        source = convert_encoding source
+        super source
         if !opts.key?(:max_nesting) # defaults to 19
           @max_nesting = 19
         elsif opts[:max_nesting]
@@ -111,6 +112,51 @@ module PSON
 
       private
 
+      def convert_encoding(source)
+        if source.respond_to?(:to_str)
+          source = source.to_str
+        else
+          raise TypeError, "#{source.inspect} is not like a string"
+        end
+        if defined?(::Encoding)
+          if source.encoding == ::Encoding::ASCII_8BIT
+            b = source[0, 4].bytes.to_a
+            source =
+              case
+              when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
+                source.dup.force_encoding(::Encoding::UTF_32BE).encode!(::Encoding::UTF_8)
+              when b.size >= 4 && b[0] == 0 && b[2] == 0
+                source.dup.force_encoding(::Encoding::UTF_16BE).encode!(::Encoding::UTF_8)
+              when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
+                source.dup.force_encoding(::Encoding::UTF_32LE).encode!(::Encoding::UTF_8)
+              when b.size >= 4 && b[1] == 0 && b[3] == 0
+                source.dup.force_encoding(::Encoding::UTF_16LE).encode!(::Encoding::UTF_8)
+              else
+                source.dup
+              end
+          else
+            source = source.encode(::Encoding::UTF_8)
+          end
+          source.force_encoding(::Encoding::ASCII_8BIT)
+        else
+          b = source
+          source =
+            case
+            when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
+              PSON.encode('utf-8', 'utf-32be', b)
+            when b.size >= 4 && b[0] == 0 && b[2] == 0
+              PSON.encode('utf-8', 'utf-16be', b)
+            when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
+              PSON.encode('utf-8', 'utf-32le', b)
+            when b.size >= 4 && b[1] == 0 && b[3] == 0
+              PSON.encode('utf-8', 'utf-16le', b)
+            else
+              b
+            end
+        end
+        source
+      end
+
       # Unescape characters in strings.
       UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
 

data/lib/puppet/face/certificate.rb

@@ -60,15 +60,15 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
 
     when_invoked do |name, options|
       host = Puppet::SSL::Host.new(name)
-      
+
       # We have a weird case where we have --dns_alt_names from Puppet, but
       # this option is --dns-alt-names. Until we can get rid of --dns-alt-names
       # or do a global tr('-', '_'), we have to support both.
-      # In supporting both, we'll use Puppet[:dns_alt_names] if specified on 
+      # In supporting both, we'll use Puppet[:dns_alt_names] if specified on
       # command line. We'll use options[:dns_alt_names] if specified on
       # command line. If both specified, we'll fail.
       # jeffweiss 17 april 2012
-      
+
       global_setting_from_cli = Puppet.settings.set_by_cli?(:dns_alt_names) == true
       raise ArgumentError, "Can't specify both --dns_alt_names and --dns-alt-names" if options[:dns_alt_names] and global_setting_from_cli
       options[:dns_alt_names] = Puppet[:dns_alt_names] if global_setting_from_cli

data/lib/puppet/face/module.rb

@@ -14,6 +14,6 @@ Puppet::Face.define(:module, '1.0.0') do
     a repository of user-contributed Puppet code. It can also generate empty
     modules, and prepare locally developed modules for release on the Forge.
   EOT
-  
+
   display_global_options "environment", "modulepath"
 end

data/lib/puppet/face/module/changes.rb

@@ -21,7 +21,9 @@ Puppet::Face.define(:module, '1.0.0') do
 
     when_invoked do |path, options|
       Puppet::ModuleTool.set_option_defaults options
-      root_path = Puppet::ModuleTool.find_module_root(path)
+      unless root_path = Puppet::ModuleTool.find_module_root(path)
+        raise ArgumentError, "Could not find a valid module at #{path.inspect}"
+      end
       Puppet::ModuleTool::Applications::Checksummer.run(root_path, options)
     end
 

data/lib/puppet/face/module/uninstall.rb

@@ -50,7 +50,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
     when_invoked do |name, options|
       name = name.gsub('/', '-')
-      
+
       Puppet::ModuleTool.set_option_defaults options
       Puppet.notice "Preparing to uninstall '#{name}'" << (options[:version] ? " (#{colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))})" : '') << " ..."
       Puppet::ModuleTool::Applications::Uninstaller.run(name, options)

data/lib/puppet/face/node/clean.rb

@@ -9,17 +9,17 @@ Puppet::Face.define(:node, '0.0.1') do
     description <<-'EOT'
       Clean up everything a puppet master knows about a node, including certificates
       and storeconfigs data.
-      
+
       The full list of info cleaned by this action is:
 
       <Signed certificates> - ($vardir/ssl/ca/signed/node.domain.pem)
-      
+
       <Cached facts> - ($vardir/yaml/facts/node.domain.yaml)
-      
+
       <Cached node objects> - ($vardir/yaml/node/node.domain.yaml)
-      
+
       <Reports> - ($vardir/reports/node.domain)
-      
+
       <Stored configs> - (in database) The clean action can either remove all
       data from a host in your storeconfigs database, or, with the
       <--unexport> option, turn every exported resource supporting ensure to

data/lib/puppet/feature/base.rb

@@ -10,7 +10,7 @@ Puppet.features.add(:syslog, :libs => ["syslog"])
 # We can use POSIX user functions
 Puppet.features.add(:posix) do
   require 'etc'
-  Etc.getpwuid(0) != nil && Puppet.features.syslog?
+  !Etc.getpwuid(0).nil? && Puppet.features.syslog?
 end
 
 # We can use Microsoft Windows functions
@@ -68,3 +68,5 @@ Puppet.features.add(:sqlite, :libs => ["sqlite3"])
 
 # We have Hiera
 Puppet.features.add(:hiera, :libs => ["hiera"])
+
+Puppet.features.add(:minitar, :libs => ["archive/tar/minitar"])

data/lib/puppet/feature/libuser.rb

@@ -0,0 +1,8 @@
+require 'puppet/util/feature'
+require 'puppet/util/libuser'
+
+Puppet.features.add(:libuser) {
+   File.executable?("/usr/sbin/lgroupadd") and
+   File.executable?("/usr/sbin/luseradd")  and
+   File.exists?(Puppet::Util::Libuser.getconf)
+}

data/lib/puppet/file_serving/fileset.rb

@@ -136,7 +136,7 @@ class Puppet::FileServing::Fileset
     result = []
     return result unless recurse?(depth)
 
-    while dir_path = current_dirs.shift or ((depth += 1) and recurse?(depth) and current_dirs = next_dirs and next_dirs = [] and dir_path = current_dirs.shift)
+    while dir_path = current_dirs.shift
       next unless stat = stat(dir_path)
       next unless stat.directory?
 
@@ -153,6 +153,14 @@ class Puppet::FileServing::Fileset
         # And to our list of files/directories to iterate over.
         next_dirs << File.join(dir_path, file_path)
       end
+
+      # Move to the next recusion level
+      if current_dirs.empty?
+        depth += 1
+        break unless recurse?(depth)
+        current_dirs = next_dirs
+        next_dirs = []
+      end
     end
 
     result

data/lib/puppet/forge.rb

@@ -7,6 +7,8 @@ require 'puppet/forge/repository'
 require 'puppet/forge/errors'
 
 class Puppet::Forge
+  include Puppet::Forge::Errors
+
   # +consumer_name+ is a name to be used for identifying the consumer of the
   # forge and +consumer_semver+ is a SemVer object to identify the version of
   # the consumer
@@ -34,6 +36,14 @@ class Puppet::Forge
   #   }
   # ]
   #
+  # @param term [String] search term
+  # @return [Array] modules found
+  # @raise [Puppet::Forge::Errors::CommunicationError] if there is a network
+  #   related error
+  # @raise [Puppet::Forge::Errors::SSLVerifyError] if there is a problem
+  #   verifying the remote SSL certificate
+  # @raise [Puppet::Forge::Errors::ResponseError] if the repository returns a
+  #   bad HTTP response
   def search(term)
     server = Puppet.settings[:module_repository]
     Puppet.notice "Searching #{server} ..."
@@ -43,12 +53,25 @@ class Puppet::Forge
     when "200"
       matches = PSON.parse(response.body)
     else
-      raise RuntimeError, "Could not execute search (HTTP #{response.code})"
+      raise ResponseError.new(:uri => uri.to_s, :input => term, :response => response)
     end
 
     matches
   end
 
+  # Return a list of module metadata hashes for the module requested and all
+  # of its dependencies.
+  #
+  # @param author [String] module's author name
+  # @param mod_name [String] module name
+  # @param version [String] optional module version number
+  # @return [Array] module and dependency metadata
+  # @raise [Puppet::Forge::Errors::CommunicationError] if there is a network
+  #   related error
+  # @raise [Puppet::Forge::Errors::SSLVerifyError] if there is a problem
+  #   verifying the remote SSL certificate
+  # @raise [Puppet::Forge::Errors::ResponseError] if the repository returns
+  #   an error in its API response or a bad HTTP response
   def remote_dependency_info(author, mod_name, version)
     version_string = version ? "&version=#{version}" : ''
     response = repository.make_http_request("/api/v1/releases.json?module=#{author}/#{mod_name}#{version_string}")
@@ -57,11 +80,11 @@ class Puppet::Forge
     when "200"
       return json
     else
-      error = json['error'] || ''
-      if error =~ /^Module #{author}\/#{mod_name} has no release/
+      error = json['error']
+      if error && error =~ /^Module #{author}\/#{mod_name} has no release/
         return []
       else
-        raise RuntimeError, "Could not find release information for this module (#{author}/#{mod_name}) (HTTP #{response.code})"
+        raise ResponseError.new(:uri => uri.to_s, :input => "#{author}/#{mod_name}", :message => error, :response => response)
       end
     end
   end
@@ -74,7 +97,7 @@ class Puppet::Forge
         begin
           cache_path = repository.retrieve(file)
         rescue OpenURI::HTTPError => e
-          raise RuntimeError, "Could not download module: #{e.message}"
+          raise HttpResponseError.new(:uri => uri.to_s, :input => modname, :message => e.message)
         end
       else
         raise RuntimeError, "Malformed response from module repository."

data/lib/puppet/forge/errors.rb

@@ -66,4 +66,38 @@ Could not connect to #{@uri}
     end
   end
 
+  # This exception is raised when there is a bad HTTP response from the forge
+  # and optionally a message in the response.
+  class ResponseError < ForgeError
+    # @option options [String] :uri The URI that failed
+    # @option options [String] :input The user's input (e.g. module name)
+    # @option options [String] :message Error from the API response (optional)
+    # @option options [Net::HTTPResponse] :response The original HTTP response
+    def initialize(options)
+      @uri     = options[:uri]
+      @input   = options[:input]
+      @message = options[:message]
+      response = options[:response]
+      @response = "#{response.code} #{response.message}"
+
+      message = "Could not execute operation for '#{@input}'. Detail: "
+      message << @message << " / " if @message
+      message << @response << "."
+      super(message, original)
+    end
+
+    # Return a multiline version of the error message
+    #
+    # @return [String] the multiline version of the error message
+    def multiline
+      message = <<-EOS
+Could not execute operation for '#{@input}'
+  The server being queried was #{@uri}
+  The HTTP response we received was '#{@response}'
+      EOS
+      message << "  The message we received said '#{@message}'\n" if @message
+      message << "    Check the author and module names are correct."
+    end
+  end
+
 end

data/lib/puppet/forge/repository.rb

@@ -75,7 +75,7 @@ class Puppet::Forge
 
     # Return a Net::HTTPResponse read for this +request_path+.
     def make_http_request(request_path)
-      request = Net::HTTP::Get.new(request_path, { "User-Agent" => user_agent })
+      request = Net::HTTP::Get.new(URI.escape(request_path), { "User-Agent" => user_agent })
       if ! @uri.user.nil? && ! @uri.password.nil?
         request.basic_auth(@uri.user, @uri.password)
       end

data/lib/puppet/indirector.rb

@@ -40,9 +40,12 @@ module Puppet::Indirector
     include Puppet::Indirector::Envelope
     extend Puppet::Network::FormatHandler
 
+    # record the indirected class name for documentation purposes
+    options[:indirected_class] = name
+
     # instantiate the actual Terminus for that type and this name (:ldap, w/ args :node)
     # & hook the instantiated Terminus into this class (Node: @indirection = terminus)
-    @indirection = Puppet::Indirector::Indirection.new(self, indirection,  options)
+    @indirection = Puppet::Indirector::Indirection.new(self, indirection, options)
   end
 
   module ClassMethods

data/lib/puppet/indirector/catalog/compiler.rb

@@ -1,6 +1,7 @@
 require 'puppet/node'
 require 'puppet/resource/catalog'
 require 'puppet/indirector/code'
+require 'puppet/util/profiler'
 require 'yaml'
 
 class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
@@ -16,20 +17,22 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       raise ArgumentError, "Facts but no fact format provided for #{request.key}"
     end
 
-    # If the facts were encoded as yaml, then the param reconstitution system
-    # in Network::HTTP::Handler will automagically deserialize the value.
-    if text_facts.is_a?(Puppet::Node::Facts)
-      facts = text_facts
-    else
-      facts = Puppet::Node::Facts.convert_from(format, text_facts)
-    end
+    Puppet::Util::Profiler.profile("Found facts") do
+      # If the facts were encoded as yaml, then the param reconstitution system
+      # in Network::HTTP::Handler will automagically deserialize the value.
+      if text_facts.is_a?(Puppet::Node::Facts)
+        facts = text_facts
+      else
+        facts = Puppet::Node::Facts.convert_from(format, text_facts)
+      end
 
-    unless facts.name == request.key
-      raise Puppet::Error, "Catalog for #{request.key.inspect} was requested with fact definition for the wrong node (#{facts.name.inspect})."
-    end
+      unless facts.name == request.key
+        raise Puppet::Error, "Catalog for #{request.key.inspect} was requested with fact definition for the wrong node (#{facts.name.inspect})."
+      end
 
-    facts.add_timestamp
-    Puppet::Node::Facts.indirection.save(facts)
+      facts.add_timestamp
+      Puppet::Node::Facts.indirection.save(facts)
+    end
   end
 
   # Compile a node's catalog.
@@ -54,7 +57,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   end
 
   def initialize
-    set_server_facts
+    Puppet::Util::Profiler.profile("Setup server facts for compiling") do
+      set_server_facts
+    end
   end
 
   # Is our compiler part of a network, or are we just local?
@@ -76,9 +81,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     str += " in environment #{node.environment}" if node.environment
     config = nil
 
-    loglevel = networked? ? :notice : :none
-
-    benchmark(loglevel, str) do
+    Puppet::Util::Profiler.profile(str) do
       begin
         config = Puppet::Parser::Compiler.compile(node)
       rescue Puppet::Error => detail
@@ -91,20 +94,24 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   end
 
   # Turn our host name into a node object.
-  def find_node(name, *args)
-    begin
-      return nil unless node = Puppet::Node.indirection.find(name, *args)
-    rescue => detail
-      message = "Failed when searching for node #{name}: #{detail}"
-      Puppet.log_exception(detail, message)
-      raise Puppet::Error, message
-    end
-
+  def find_node(name, environment)
+    Puppet::Util::Profiler.profile("Found node information") do
+      node = nil
+      begin
+        node = Puppet::Node.indirection.find(name, :environment => environment)
+      rescue => detail
+        message = "Failed when searching for node #{name}: #{detail}"
+        Puppet.log_exception(detail, message)
+        raise Puppet::Error, message
+      end
 
-    # Add any external data to the node.
-    add_node_data(node)
 
-    node
+      # Add any external data to the node.
+      if node
+        add_node_data(node)
+      end
+      node
+    end
   end
 
   # Extract the node from the request, or use the request
@@ -123,10 +130,10 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     # By default the REST authorization system makes sure only the connected node
     # can compile his catalog.
     # This allows for instance monitoring systems or puppet-load to check several
-    # node's catalog with only one certificate and a modification to auth.conf 
+    # node's catalog with only one certificate and a modification to auth.conf
     # If no key is provided we can only compile the currently connected node.
     name = request.key || request.node
-    if node = find_node(name, :environment => request.environment)
+    if node = find_node(name, request.environment)
       return node
     end
 

data/lib/puppet/indirector/facts/inventory_active_record.rb

@@ -11,6 +11,7 @@ class Puppet::Node::Facts::InventoryActiveRecord < Puppet::Indirector::ActiveRec
     and inventory are deprecated. See http://links.puppetlabs.com/activerecord-deprecation"
 
   def initialize
+    raise Puppet::Error, "ActiveRecords-based inventory is unsupported with Ruby 2 and Rails 3.0" if RUBY_VERSION[0] == '2'
     Puppet.deprecation_warning "ActiveRecord-based storeconfigs and inventory are deprecated. See http://links.puppetlabs.com/activerecord-deprecation"
     super
   end