puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

data/lib/puppet/settings/config_file.rb

@@ -7,6 +7,8 @@ require 'puppet/settings/ini_file'
 #
 class Puppet::Settings::ConfigFile
 
+  ALLOWED_SECTION_NAMES = ['main', 'master', 'agent', 'user'].freeze
+
   ##
   # @param value_converter [Proc] a function that will convert strings into ruby types
   #
@@ -76,6 +78,9 @@ private
       if section.name == "application_defaults" || section.name == "global_defaults"
         raise Puppet::Error, "Illegal section '#{section.name}' in config file #{file} at line #{section.line_number}"
       end
+      if !ALLOWED_SECTION_NAMES.include?(section.name)
+        Puppet.deprecation_warning("Sections other than #{ALLOWED_SECTION_NAMES.join(', ')} are deprecated in puppet.conf. Please use the directory environments feature to specify environments. (See http://docs.puppetlabs.com/puppet/latest/reference/environments.html)")
+      end
       section.name
     end.uniq
   end

data/lib/puppet/settings/environment_conf.rb

@@ -0,0 +1,147 @@
+# Configuration settings for a single directory Environment.
+# @api private
+class Puppet::Settings::EnvironmentConf
+  VALID_SETTINGS = [:modulepath, :manifest, :config_version, :environment_timeout].freeze
+
+  # Given a path to a directory environment, attempts to load and parse an
+  # environment.conf in ini format, and return an EnvironmentConf instance.
+  #
+  # An environment.conf is optional, so if the file itself is missing, or
+  # empty, an EnvironmentConf with default values will be returned.
+  #
+  # @note logs warnings if the environment.conf contains any ini sections,
+  # or has settings other than the three handled for directory environments
+  # (:manifest, :modulepath, :config_version)
+  #
+  # @param path_to_env [String] path to the directory environment
+  # @param global_module_path [Array<String>] the installation's base modulepath
+  #   setting, appended to default environment modulepaths
+  # @return [EnvironmentConf] the parsed EnvironmentConf object
+  def self.load_from(path_to_env, global_module_path)
+    path_to_env = File.expand_path(path_to_env)
+    conf_file = File.join(path_to_env, 'environment.conf')
+    config = nil
+
+    begin
+      config = Puppet.settings.parse_file(conf_file)
+      validate(conf_file, config)
+      section = config.sections[:main]
+    rescue Errno::ENOENT
+      # environment.conf is an optional file
+    end
+
+    new(path_to_env, section, global_module_path)
+  end
+
+  # Provides a configuration object tied directly to the passed environment.
+  # Configuration values are exactly those returned by the environment object,
+  # without interpolation.  This is a special case for the default configured
+  # environment returned by the Puppet::Environments::StaticPrivate loader.
+  def self.static_for(environment)
+    Static.new(environment)
+  end
+
+  attr_reader :section
+
+  # Create through EnvironmentConf.load_from()
+  def initialize(path_to_env, section, global_module_path)
+    @path_to_env = path_to_env
+    @section = section
+    @global_module_path = global_module_path
+  end
+
+  def manifest
+    get_setting(:manifest, File.join(@path_to_env, "manifests")) do |manifest|
+      absolute(manifest)
+    end
+  end
+
+  def environment_timeout
+    # gen env specific config or use the default value
+    get_setting(:environment_timeout, Puppet.settings.value(:environment_timeout)) do |ttl|
+      # munges the string form statically without really needed the settings system, only
+      # its ability to munge "4s, 3m, 5d, and 'unlimited' into seconds - if already munged into
+      # numeric form, the TTLSetting handles that.
+      Puppet::Settings::TTLSetting.munge(ttl, 'environment_timeout')
+    end
+  end
+
+  def modulepath
+    default_modulepath = [File.join(@path_to_env, "modules")] + @global_module_path
+    get_setting(:modulepath, default_modulepath) do |modulepath|
+      path = modulepath.kind_of?(String) ?
+        modulepath.split(File::PATH_SEPARATOR) :
+        modulepath
+      path.map { |p| absolute(p) }.join(File::PATH_SEPARATOR)
+    end
+  end
+
+  def config_version
+    get_setting(:config_version) do |config_version|
+      absolute(config_version)
+    end
+  end
+
+  private
+
+  def self.validate(path_to_conf_file, config)
+    valid = true
+    section_keys = config.sections.keys
+    main = config.sections[:main]
+    if section_keys.size > 1
+      Puppet.warning("Invalid sections in environment.conf at '#{path_to_conf_file}'. Environment conf may not have sections. The following sections are being ignored: '#{(section_keys - [:main]).join(',')}'")
+      valid = false
+    end
+
+    extraneous_settings = main.settings.map(&:name) - VALID_SETTINGS
+    if !extraneous_settings.empty?
+      Puppet.warning("Invalid settings in environment.conf at '#{path_to_conf_file}'. The following unknown setting(s) are being ignored: #{extraneous_settings.join(', ')}")
+      valid = false
+    end
+
+    return valid
+  end
+
+  def get_setting(setting_name, default = nil)
+    setting = section.setting(setting_name) if section
+    value = setting.value if setting
+    value ||= default
+    yield value
+  end
+
+  def absolute(path)
+    return nil if path.nil?
+    if path =~ /^\$/
+      # Path begins with $something interpolatable
+      path
+    else
+      File.expand_path(path, @path_to_env)
+    end
+  end
+
+  # Models configuration for an environment that is not loaded from a directory.
+  #
+  # @api private
+  class Static
+    def initialize(environment)
+      @environment = environment
+    end
+
+    def manifest
+      @environment.manifest
+    end
+
+    def modulepath
+      @environment.modulepath.join(File::PATH_SEPARATOR)
+    end
+
+    def config_version
+      @environment.config_version
+    end
+
+    def environment_timeout
+      0
+    end
+  end
+
+end

data/lib/puppet/settings/ttl_setting.rb

@@ -0,0 +1,48 @@
+# A setting that represents a span of time to live, and evaluates to Numeric
+# seconds to live where 0 means shortest possible time to live, a positive numeric value means time
+# to live in seconds, and the symbolic entry 'unlimited' is an infinite amount of time.
+#
+class Puppet::Settings::TTLSetting < Puppet::Settings::BaseSetting
+  INFINITY = 1.0 / 0.0
+
+  # How we convert from various units to seconds.
+  UNITMAP = {
+    # 365 days isn't technically a year, but is sufficient for most purposes
+    "y" => 365 * 24 * 60 * 60,
+    "d" => 24 * 60 * 60,
+    "h" => 60 * 60,
+    "m" => 60,
+    "s" => 1
+  }
+
+  # A regex describing valid formats with groups for capturing the value and units
+  FORMAT = /^(\d+)(y|d|h|m|s)?$/
+
+  def type
+    :ttl
+  end
+
+  # Convert the value to Numeric, parsing numeric string with units if necessary.
+  def munge(value)
+    self.class.munge(value, @name)
+  end
+
+  # Convert the value to Numeric, parsing numeric string with units if necessary.
+  def self.munge(value, param_name)
+    case
+    when value.is_a?(Numeric)
+      if value < 0
+        raise Puppet::Settings::ValidationError, "Invalid negative 'time to live' #{value.inspect} - did you mean 'unlimited'?"
+      end
+      value
+
+    when value == 'unlimited'
+      INFINITY
+
+    when (value.is_a?(String) and value =~ FORMAT)
+      $1.to_i * UNITMAP[$2 || 's']
+    else
+      raise Puppet::Settings::ValidationError, "Invalid 'time to live' format '#{value.inspect}' for parameter: #{param_name}"
+    end
+  end
+end

data/lib/puppet/ssl/certificate_authority.rb

@@ -80,9 +80,9 @@ class Puppet::SSL::CertificateAuthority
     auto = Puppet[:autosign]
 
     decider = case auto
-      when 'false', false, nil
+      when false
         AutosignNever.new
-      when 'true', true
+      when true
         AutosignAlways.new
       else
         file = Puppet::FileSystem.pathname(auto)
@@ -197,7 +197,6 @@ class Puppet::SSL::CertificateAuthority
   # Created to prevent the case of reading all certs from disk, getting
   # just their names and verifying the cert for each name, which then
   # causes the cert to again be read from disk.
-  # @param name [Array<string>] filter to cerificate names
   #
   # @author Jeff Weiss <jeff.weiss@puppetlabs.com>
   # @api Puppet Enterprise Licensing

data/lib/puppet/ssl/certificate_authority/autosign_command.rb

@@ -15,7 +15,7 @@ class Puppet::SSL::CertificateAuthority::AutosignCommand
   # Run the autosign command with the given CSR name as an argument and the
   # CSR body on stdin.
   #
-  # @param name [String] The CSR name to check for autosigning
+  # @param csr [String] The CSR name to check for autosigning
   # @return [true, false] If the CSR should be autosigned
   def allowed?(csr)
     name = csr.name

data/lib/puppet/ssl/certificate_request.rb

@@ -61,12 +61,12 @@ DOC
   #
   # @param key [OpenSSL::X509::Key, Puppet::SSL::Key] The key pair associated
   #   with this CSR.
-  # @param opts [Hash]
-  # @options opts [String] :dns_alt_names A comma separated list of
+  # @param options [Hash]
+  # @option options [String] :dns_alt_names A comma separated list of
   #   Subject Alternative Names to include in the CSR extension request.
-  # @options opts [Hash<String, String, Array<String>>] :csr_attributes A hash
+  # @option options [Hash<String, String, Array<String>>] :csr_attributes A hash
   #   of OIDs and values that are either a string or array of strings.
-  # @options opts [Array<String, String>] :extension_requests A hash of
+  # @option options [Array<String, String>] :extension_requests A hash of
   #   certificate extensions to add to the CSR extReq attribute, excluding
   #   the Subject Alternative Names extension.
   #

data/lib/puppet/ssl/validator/default_validator.rb

@@ -12,8 +12,8 @@ class Puppet::SSL::Validator::DefaultValidator #< class Puppet::SSL::Validator
 
   # Creates a new DefaultValidator, optionally with an SSL Configuration and SSL Host.
   #
-  # @param [Puppet::SSL::Configuration] (a default configuration) ssl_configuration the SSL configuration to use
-  # @param [Puppet::SSL::Host] (Puppet::SSL::Host.localhost) the SSL host to use
+  # @param ssl_configuration [Puppet::SSL::Configuration] (a default configuration) ssl_configuration the SSL configuration to use
+  # @param ssl_host [Puppet::SSL::Host] (Puppet::SSL::Host.localhost) the SSL host to use
   #
   # @api private
   #

data/lib/puppet/status.rb

@@ -4,7 +4,7 @@ class Puppet::Status
   extend Puppet::Indirector
   indirects :status, :terminus_class => :local
 
-  attr :status, true
+  attr_accessor :status
 
   def initialize( status = nil )
     @status = status || {"is_alive" => true}

data/lib/puppet/test/test_helper.rb

@@ -203,6 +203,7 @@ module Puppet::Test
       # having to deal with a missing environmentpath we can just set it right
       # here.
       Puppet[:environmentpath] = @environmentpath
+      Puppet[:environment_timeout] = 0
     end
     private_class_method :initialize_settings_before_each
   end

data/lib/puppet/type/augeas.rb

@@ -13,6 +13,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+require 'puppet/parameter/boolean'
+
 Puppet::Type.newtype(:augeas) do
   include Puppet::Util
 
@@ -83,7 +85,7 @@ Puppet::Type.newtype(:augeas) do
       where:
 
       * `AUGEAS_PATH` is a valid path scoped by the context
-      * `MATCH_PATH` is a valid match synatx scoped by the context
+      * `MATCH_PATH` is a valid match syntax scoped by the context
       * `COMPARATOR` is one of `>, >=, !=, ==, <=,` or `<`
       * `STRING` is a string
       * `INT` is a number
@@ -155,6 +157,16 @@ Puppet::Type.newtype(:augeas) do
     self.fail "You must specify both the lens and incl parameters, or neither." if has_lens != has_incl
   end
 
+  newparam(:show_diff, :boolean => true, :parent => Puppet::Parameter::Boolean) do
+    desc "Whether to display differences when the file changes, defaulting to
+        true.  This parameter is useful for files that may contain passwords or
+        other secret data, which might otherwise be included in Puppet reports or
+        other insecure outputs.  If the global `show_diff` setting
+        is false, then no diffs will be shown even if this parameter is true."
+
+    defaultto :true
+  end
+
   # This is the actual meat of the code. It forces
   # augeas to be run and fails or not based on the augeas return
   # code.

data/lib/puppet/type/cron.rb

@@ -4,12 +4,12 @@ require 'puppet/util/filetype'
 
 Puppet::Type.newtype(:cron) do
   @doc = <<-'EOT'
-    Installs and manages cron jobs.  Every cron resource requires a command
-    and user attribute, as well as at least one periodic attribute (hour,
-    minute, month, monthday, weekday, or special).  While the name of the cron
-    job is not part of the actual job, the name is stored in a comment beginning with
-    `# Puppet Name: `. These comments are used to match crontab entries created by
-    Puppet with cron resources.
+    Installs and manages cron jobs.  Every cron resource created by Puppet
+    requires a command and at least one periodic attribute (hour, minute,
+    month, monthday, weekday, or special).  While the name of the cron job is
+    not part of the actual job, the name is stored in a comment beginning with
+    `# Puppet Name: `. These comments are used to match crontab entries created
+    by Puppet with cron resources.
 
     If an existing crontab entry happens to match the scheduling and command of a
     cron resource that has never been synched, Puppet will defer to the existing
@@ -49,6 +49,10 @@ Puppet::Type.newtype(:cron) do
     These changes must be expressed by setting the parameter to
     `minute => absent` because Puppet only manages parameters that are out of
     sync with manifest entries.
+
+    **Autorequires:** If Puppet is managing the user account specified by the
+    `user` property of a cron resource, then the cron resource will autorequire
+    that user.
   EOT
   ensurable
 
@@ -368,15 +372,20 @@ Puppet::Type.newtype(:cron) do
   end
 
   newproperty(:user) do
-    desc "The user to run the command as.  This user must
+    desc "The user who owns the cron job.  This user must
       be allowed to run cron jobs, which is not currently checked by
       Puppet.
 
-      The user defaults to whomever Puppet is running as."
+      This property defaults to the user running Puppet or `root`.
+
+      The default crontab provider executes the system `crontab` using
+      the user account specified by this property."
 
     defaultto {
-      struct = Etc.getpwuid(Process.uid)
-      struct.respond_to?(:name) && struct.name or 'root'
+      if not provider.is_a?(@resource.class.provider(:crontab))
+        struct = Etc.getpwuid(Process.uid)
+        struct.respond_to?(:name) && struct.name or 'root'
+      end
     }
   end
 
@@ -386,17 +395,23 @@ Puppet::Type.newtype(:cron) do
   end
 
   newproperty(:target) do
-    desc "The username that will own the cron entry. Defaults to
-    the value of $USER for the shell that invoked Puppet, or root if $USER
-    is empty."
+    desc "The name of the crontab file in which the cron job should be stored.
+
+      This property defaults to the value of the `user` property if set, the
+      user running Puppet or `root`.
+
+      For the default crontab provider, this property is functionally
+      equivalent to the `user` property and should be avoided. In particular,
+      setting both `user` and `target` to different values will result in
+      undefined behavior."
 
     defaultto {
       if provider.is_a?(@resource.class.provider(:crontab))
         if val = @resource.should(:user)
           val
         else
-          raise ArgumentError,
-            "You must provide a username with crontab entries"
+          struct = Etc.getpwuid(Process.uid)
+          struct.respond_to?(:name) && struct.name or 'root'
         end
       elsif provider.class.ancestors.include?(Puppet::Provider::ParsedFile)
         provider.class.default_target
@@ -438,8 +453,8 @@ Puppet::Type.newtype(:cron) do
   #   property, unpurged file content (such as comments) can end up
   #   being written to the default target (i.e. the current login name).
   def purging
-    self[:target] = provider.property_hash[:target]
-    self[:user] = provider.property_hash[:target]
+    self[:target] = provider.target
+    self[:user] = provider.target
     super
   end
 
@@ -459,7 +474,6 @@ Puppet::Type.newtype(:cron) do
     unless ret
       case name
       when :command
-        devfail "No command, somehow" unless @parameters[:ensure].value == :absent
       when :special
         # nothing
       else

data/lib/puppet/type/file.rb

@@ -250,7 +250,7 @@ Puppet::Type.newtype(:file) do
     desc "Whether to display differences when the file changes, defaulting to
         true.  This parameter is useful for files that may contain passwords or
         other secret data, which might otherwise be included in Puppet reports or
-        other insecure outputs.  If the global ``show_diff` setting
+        other insecure outputs.  If the global `show_diff` setting
         is false, then no diffs will be shown even if this parameter is true."
 
     defaultto :true
@@ -613,7 +613,9 @@ Puppet::Type.newtype(:file) do
       end
       children[meta.relative_path] ||= newchild(meta.relative_path)
       children[meta.relative_path][:source] = meta.source
-      children[meta.relative_path][:checksum] = :md5 if meta.ftype == "file"
+      if meta.ftype == "file"
+        children[meta.relative_path][:checksum] = Puppet[:digest_algorithm].to_sym
+      end
 
       children[meta.relative_path].parameter(:source).metadata = meta
     end