puppet 4.4.1-universal-darwin → 4.4.2-universal-darwin

data/lib/puppet/provider/user/user_role_add.rb

@@ -167,10 +167,12 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def password
-    shadow_entry[1] if shadow_entry
+    return :absent unless shadow_entry
+    shadow_entry[1]
   end
 
   def password_min_age
+    return :absent unless shadow_entry
     shadow_entry[3].empty? ? -1 : shadow_entry[3]
   end
 

data/lib/puppet/settings.rb

@@ -1189,7 +1189,7 @@ Generated on #{Time.now}.
   # Read the file in.
   # @api private
   def read_file(file)
-    return Puppet::FileSystem.read(file)
+    return Puppet::FileSystem.read(file, :encoding => 'utf-8')
   end
 
   # Private method for internal test use only; allows to do a comprehensive clear of all settings between tests.

data/lib/puppet/ssl/oids.rb

@@ -69,7 +69,7 @@ module Puppet::SSL::Oids
     end
   end
 
-  # Parse and load custom OID mapping file that enables custom OIDs to be resolved
+  # Parse custom OID mapping file that enables custom OIDs to be resolved
   # into user-friendly names.
   #
   # @param custom_oid_file [String] File to obtain custom OIDs mapping from
@@ -84,7 +84,7 @@ module Puppet::SSL::Oids
   #  '1.3.6.1.4.1.34380.1.2.1.2':
   #    shortname: 'myothershortname'
   #    longname: 'Other Long name'
-  def self.load_custom_oid_file(custom_oid_file, map_key='oid_mapping')
+  def self.parse_custom_oid_file(custom_oid_file, map_key='oid_mapping')
     if File.exists?(custom_oid_file) && File.readable?(custom_oid_file)
       mapping = nil
       begin
@@ -110,6 +110,28 @@ module Puppet::SSL::Oids
         oid_defns << [oid, shortname, longname]
       end
 
+      oid_defns
+    end
+  end
+
+  # Load custom OID mapping file that enables custom OIDs to be resolved
+  # into user-friendly names.
+  #
+  # @param custom_oid_file [String] File to obtain custom OIDs mapping from
+  # @param map_key [String] Hash key in which custom OIDs mapping is stored
+  #
+  # @example Custom OID mapping file
+  # ---
+  # oid_mapping:
+  #  '1.3.6.1.4.1.34380.1.2.1.1':
+  #    shortname : 'myshortname'
+  #    longname  : 'Long name'
+  #  '1.3.6.1.4.1.34380.1.2.1.2':
+  #    shortname: 'myothershortname'
+  #    longname: 'Other Long name'
+  def self.load_custom_oid_file(custom_oid_file, map_key='oid_mapping')
+    oid_defns = parse_custom_oid_file(custom_oid_file, map_key)
+    unless oid_defns.nil?
       begin
         oid_defns.each do |oid_defn|
           OpenSSL::ASN1::ObjectId.register(*oid_defn)

data/lib/puppet/util/monkey_patches.rb

@@ -114,15 +114,20 @@ if Puppet::Util::Platform.windows?
   require 'openssl'
 
   class OpenSSL::X509::Store
+    @puppet_certs_loaded = false
     alias __original_set_default_paths set_default_paths
     def set_default_paths
       # This can be removed once openssl integrates with windows
       # cert store, see https://rt.openssl.org/Ticket/Display.html?id=2158
-      Puppet::Util::Windows::RootCerts.instance.to_a.uniq.each do |x509|
-        begin
-          add_cert(x509)
-        rescue OpenSSL::X509::StoreError => e
-          warn "Failed to add #{x509.subject.to_s}"
+      unless @puppet_certs_loaded
+        @puppet_certs_loaded = true
+
+        Puppet::Util::Windows::RootCerts.instance.to_a.uniq { |cert| cert.to_der }.each do |x509|
+          begin
+            add_cert(x509)
+          rescue OpenSSL::X509::StoreError => e
+            warn "Failed to add #{x509.subject.to_s}"
+          end
         end
       end
 

data/lib/puppet/util/windows/file.rb

@@ -89,12 +89,45 @@ module Puppet::Util::Windows::File
   end
   module_function :symlink
 
+
+  def exist?(path)
+    path = path.to_str if path.respond_to?(:to_str) # support WatchedFile
+    path = path.to_s # support String and Pathname
+
+    seen_paths = []
+    # follow up to 64 symlinks before giving up
+    0.upto(64) do |depth|
+      # return false if this path has been seen before.  This is protection against circular symlinks
+      return false if seen_paths.include?(path.downcase)
+
+      result = get_attributes(path,false)
+
+      # return false for path not found
+      return false if result == INVALID_FILE_ATTRIBUTES
+
+      # return true if path exists and it's not a symlink
+      # Other file attributes are ignored. https://msdn.microsoft.com/en-us/library/windows/desktop/gg258117(v=vs.85).aspx
+      return true if (result & FILE_ATTRIBUTE_REPARSE_POINT) != FILE_ATTRIBUTE_REPARSE_POINT
+
+      # walk the symlink and try again...
+      seen_paths << path.downcase
+      path = readlink(path)
+    end
+
+    false
+  end
+  module_function :exist?
+
+
   INVALID_FILE_ATTRIBUTES = 0xFFFFFFFF #define INVALID_FILE_ATTRIBUTES (DWORD (-1))
 
-  def get_attributes(file_name)
+  def get_attributes(file_name, raise_on_invalid = true)
     result = GetFileAttributesW(wide_string(file_name.to_s))
-    return result unless result == INVALID_FILE_ATTRIBUTES
-    raise Puppet::Util::Windows::Error.new("GetFileAttributes(#{file_name})")
+    if raise_on_invalid && result == INVALID_FILE_ATTRIBUTES
+      raise Puppet::Util::Windows::Error.new("GetFileAttributes(#{file_name})")
+    end
+
+    result
   end
   module_function :get_attributes
 
@@ -179,13 +212,10 @@ module Puppet::Util::Windows::File
 
   FILE_ATTRIBUTE_REPARSE_POINT = 0x400
   def symlink?(file_name)
-    begin
-      attributes = get_attributes(file_name)
-      (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
-    rescue
-      # raised INVALID_FILE_ATTRIBUTES is equivalent to file not found
-      false
-    end
+    attributes = get_attributes(file_name, false)
+
+    return false if (attributes == INVALID_FILE_ATTRIBUTES)
+    (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
   end
   module_function :symlink?
 

data/lib/puppet/util/windows.rb

@@ -4,6 +4,7 @@ module Puppet::Util::Windows
     class UserProfile; end
     class Group; end
   end
+  module File; end
   module Registry
   end
   module SID

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '4.4.1'
+  PUPPETVERSION = '4.4.2'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/third_utf8.json

@@ -0,0 +1,3 @@
+{
+    "test::param_json_utf8": "env data param_json_utf8 is ᚠᛇᚻ"
+}

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/utf8.yaml

@@ -0,0 +1,3 @@
+---
+test::param_yaml_utf8: env data param_yaml_utf8 is ᛫ᛒᛦ
+

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/hiera.yaml

@@ -6,11 +6,15 @@
   - :name: "one path"
     :backend: yaml
     :path: "single"
-  - :name: "two paths"
+  - :name: "utf8"
+    :backend: yaml
+    :path: "utf8"
+  - :name: "three paths"
     :backend: json
     :paths:
       - "first"
       - "second"
+      - "third_utf8"
   - :name:  'other datadir'
     :backend: yaml
     :datadir: "data2"

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/manifests/site.pp

@@ -1,5 +1,5 @@
-class test($param_a = 1, $param_b = 2, $param_c = 3, $param_d = 4, $param_e = 5) {
-  notify { "$param_a, $param_b, $param_c, $param_d, $param_e": }
+class test($param_a = 1, $param_b = 2, $param_c = 3, $param_d = 4, $param_e = 5, $param_yaml_utf8 = 'hi', $param_json_utf8 = 'hi') {
+  notify { "$param_a, $param_b, $param_c, $param_d, $param_e, $param_yaml_utf8, $param_json_utf8": }
 }
 
 include test

data/spec/integration/parser/parameter_defaults_spec.rb

@@ -42,7 +42,7 @@ require 'puppet_spec/language'
     # @return [Array] array of notice output entries
     #
     def eval_collect_notices(arg_list, body, call_params)
-      call = call_params.is_a?(String) ? call_params : "example(#{call_params.join(',')})"
+      call = call_params.is_a?(String) ? call_params : "example(#{call_params.map {|p| p.nil? ? 'undef' : (p.is_a?(String) ? "'#{p}'" : p )}.join(',')})"
       body = func_bodies[body] if body.is_a?(Integer)
       evaluator = Puppet::Pops::Parser::EvaluatingParser.new()
       collect_notices("function example(#{arg_list}) #{body}") do
@@ -332,5 +332,23 @@ require 'puppet_spec/language'
       $a = 5
       SOURCE
     end
+
+    it 'will permit undef for optional parameters' do
+      expect_log([<<-SOURCE, 1], [nil], ['$a == '])
+      Optional[Integer] $a
+      SOURCE
+    end
+
+    it 'undef will override parameter default', :if => call_type == 'Function' do
+      expect_log([<<-SOURCE, 1], [nil], ['$a == '])
+      Optional[Integer] $a = 4
+      SOURCE
+    end
+
+    it 'undef will not override parameter default', :unless => call_type == 'Function' do
+      expect_log([<<-SOURCE, 1], [nil], ['$a == 4'])
+      Optional[Integer] $a = 4
+      SOURCE
+    end
   end
 end

data/spec/integration/util/settings_spec.rb

@@ -44,6 +44,32 @@ describe Puppet::Settings do
     expect(Puppet::FileSystem.stat(settings[:maindir]).mode & 007777).to eq(0750)
   end
 
+  it "will properly parse a UTF-8 configuration file" do
+    rune_utf8 = "\u16A0\u16C7\u16BB" # ᚠᛇᚻ
+    config = tmpfile("config")
+    define_settings(:main,
+      :config => {
+        :type => :file,
+        :default => config,
+        :desc => "a"
+      },
+      :environment => {
+        :default => 'dingos',
+        :desc => 'test',
+      }
+    )
+
+    File.open(config, 'w') do |file|
+      file.puts <<-EOF
+[main]
+environment=#{rune_utf8}
+      EOF
+    end
+
+    settings.initialize_global_settings
+    expect(settings[:environment]).to eq(rune_utf8)
+  end
+
   it "reparses configuration if configuration file is touched", :if => !Puppet.features.microsoft_windows? do
     config = tmpfile("config")
     define_settings(:main,

data/spec/unit/application/lookup_spec.rb

@@ -30,7 +30,7 @@ describe Puppet::Application::Lookup do
       lookup.options[:merge] = 'hash'
       lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
 
-      expected_error = "The options --knock-out-prefix, --sort-merged-arrays, --unpack-arrays, and --merge-hash-arrays are only available with '--merge deep'\nRun 'puppet lookup --help' for more details"
+      expected_error = "The options --knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays are only available with '--merge deep'\nRun 'puppet lookup --help' for more details"
 
       expect { lookup.run_command }.to raise_error(RuntimeError, expected_error)
     end

data/spec/unit/data_providers/hiera_data_provider_spec.rb

@@ -45,7 +45,7 @@ describe "when using a hiera data provider" do
 
   it 'reads hiera.yaml in environment root and configures multiple json and yaml providers' do
     resources = compile_and_get_notifications('hiera_env_config')
-    expect(resources).to include('env data param_a is 10, env data param_b is 20, env data param_c is 30, env data param_d is 40, env data param_e is 50')
+    expect(resources).to include("env data param_a is 10, env data param_b is 20, env data param_c is 30, env data param_d is 40, env data param_e is 50, env data param_yaml_utf8 is \u16EB\u16D2\u16E6, env data param_json_utf8 is \u16A0\u16C7\u16BB")
   end
 
   it 'reads hiera.yaml in module root and configures multiple json and yaml providers' do

data/spec/unit/data_providers/hiera_interpolation_spec.rb

@@ -118,6 +118,7 @@ describe 'Puppet::DataProviders::HieraInterpolate' do
           }
         },
         'x.1' => '(lookup) x dot 1',
+        'key' => 'subkey'
       }
     }
 
@@ -217,6 +218,11 @@ describe 'Puppet::DataProviders::HieraInterpolate' do
       expect_lookup('a.d')
       expect(interpolator.interpolate("a dot f: %{lookup(\"'a.d'\")}", lookup_invocation, true)).to eq('a dot f: ')
     end
+
+    it 'should not find a subkey that is matched within a string' do
+      expect_lookup('key')
+      expect{ interpolator.interpolate('%{hiera("key.subkey")}', lookup_invocation, true) }.to raise_error(/Got String when a hash-like object was expected to enable lookup using key 'subkey'/)
+    end
   end
 
   context 'when dealing with non alphanumeric characters' do