puppet 4.3.1-x64-mingw32 → 4.3.2-x64-mingw32

data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/data/common.yaml

@@ -0,0 +1,4 @@
+---
+lookup_options:
+  roles::devco::packages:
+    merge: unique

data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/hiera.yaml

@@ -0,0 +1,5 @@
+---
+:version: 4
+:hierarchy:
+  - :name: "common"
+    :backend: yaml

data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/manifests/init.pp

@@ -0,0 +1,3 @@
+class two($arg=[]) {
+  include one
+}

data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/metadata.json

@@ -0,0 +1,9 @@
+{
+    "name": "example/two",
+    "version": "0.0.2",
+    "source": "git@github.com/example/example-two.git",
+    "dependencies": [],
+    "author": "Bob the Builder",
+    "license": "Apache-2.0",
+    "data_provider": "hiera"
+}

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/functions/usee_puppet.pp

@@ -0,0 +1,3 @@
+function usee::usee_puppet() {
+   "I'm the function usee::usee_puppet()"
+}

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/functions/usee/usee_ruby.rb

@@ -0,0 +1,6 @@
+Puppet::Functions.create_function(:'usee::usee_ruby') do
+  def usee_ruby()
+    "I'm the function usee::usee_ruby()"
+  end
+end
+

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/manifests/init.pp

@@ -0,0 +1,6 @@
+function usee_puppet_init() {
+  "I'm the function usee::usee_puppet_init()"
+}
+
+class usee {
+}

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee2/lib/puppet/functions/usee2/callee.rb

@@ -0,0 +1,5 @@
+Puppet::Functions.create_function(:'usee2::callee') do
+  def callee(value)
+    "usee2::callee() was told '#{value}'"
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet.pp

@@ -0,0 +1,5 @@
+function user::puppet_calling_puppet () {
+   usee::usee_puppet()
+}
+
+

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet_init.pp

@@ -0,0 +1,5 @@
+function user::puppet_calling_puppet_init () {
+   usee_puppet_init()
+}
+
+

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_ruby.pp

@@ -0,0 +1,5 @@
+function user::puppet_calling_ruby() {
+    usee::usee_ruby()
+}
+
+

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/caller2.rb

@@ -0,0 +1,5 @@
+Puppet::Functions.create_function(:'user::caller2') do
+  def caller2()
+    call_function('usee2::callee', 'passed value') + " + I am user::caller2()"
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet.rb

@@ -0,0 +1,5 @@
+Puppet::Functions.create_function(:'user::ruby_calling_puppet') do
+  def ruby_calling_puppet()
+     call_function('usee::usee_puppet')
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet_init.rb

@@ -0,0 +1,5 @@
+Puppet::Functions.create_function(:'user::ruby_calling_puppet_init') do
+  def ruby_calling_puppet_init()
+     call_function('usee_puppet_init')
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_ruby.rb

@@ -0,0 +1,5 @@
+Puppet::Functions.create_function(:'user::ruby_calling_ruby') do
+  def ruby_calling_ruby()
+    call_function('usee::usee_ruby')
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/manifests/init.pp

@@ -0,0 +1,81 @@
+function puppet_init_calling_puppet() {
+  usee::usee_puppet()
+}
+
+function puppet_init_calling_puppet_init() {
+  usee_puppet_init()
+}
+
+function puppet_init_calling_ruby() {
+  usee::usee_ruby()
+}
+
+class user {
+  case $::case_number {
+    1: {
+      # Call a puppet function that resides in usee/functions directly from init.pp
+      #
+      notify { 'case_1': message => usee::usee_puppet() }
+    }
+    2: {
+      # Call a puppet function that resides in usee/manifests/init.pp directly from init.pp
+      #
+      include usee
+      notify { 'case_2': message => usee_puppet_init() }
+    }
+    3: {
+      # Call a ruby function that resides in usee directly from init.pp
+      #
+      notify { 'case_3': message => usee::usee_ruby() }
+    }
+    4: {
+      # Call a puppet function that resides in usee/functions from a puppet function under functions
+      #
+      notify { 'case_4': message => user::puppet_calling_puppet() }
+    }
+    5: {
+      # Call a puppet function that resides in usee/manifests/init.pp from a puppet function under functions
+      #
+      include usee
+      notify { 'case_5': message => user::puppet_calling_puppet_init() }
+    }
+    6: {
+      # Call a ruby function that resides in usee from a puppet function under functions
+      #
+      notify { 'case_6': message => user::puppet_calling_ruby() }
+    }
+    7: {
+      # Call a puppet function that resides in usee/functions from a puppet function in init.pp
+      #
+      notify { 'case_7': message => puppet_init_calling_puppet() }
+    }
+    8: {
+      # Call a puppet function that resides in usee/manifests/init.pp from a puppet function in init.pp
+      #
+      include usee
+      notify { 'case_8': message => puppet_init_calling_puppet_init() }
+    }
+    9: {
+      # Call a ruby function that resides in usee from a puppet function in init.pp
+      #
+      notify { 'case_9': message => puppet_init_calling_ruby() }
+    }
+    10: {
+      # Call a puppet function that resides in usee/functions from a ruby function in this module
+      #
+      notify { 'case_10': message => user::ruby_calling_puppet() }
+    }
+    11: {
+      # Call a puppet function that resides in usee/manifests/init.pp from a ruby function in this module
+      #
+      include usee
+      notify { 'case_11': message => user::ruby_calling_puppet_init() }
+    }
+    12: {
+      # Call a ruby function that resides in usee from a ruby function in this module
+      #
+      notify { 'case_12': message => user::ruby_calling_ruby() }
+    }
+  }
+}
+

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/{user → modules/user}/metadata.json

@@ -5,5 +5,6 @@
   "license": "",
   "source": "",
   "version": "1.0.0",
-  "dependencies": [{ "name": "test/usee" }]
+  "dependencies": [
+  ]
 }

data/spec/integration/parser/collection_spec.rb

@@ -95,6 +95,14 @@ describe 'collectors' do
       MANIFEST
     end
 
+    it "matches with resource references" do
+      expect_the_message_to_be(["wanted"], <<-MANIFEST)
+        @notify { "foobar": }
+        @notify { "testing": require => Notify["foobar"], message => "wanted" }
+        Notify <| require == Notify["foobar"] |>
+      MANIFEST
+    end
+
     it "allows criteria to be combined with 'and'" do
       expect_the_message_to_be(["the message"], <<-MANIFEST)
         @notify { "testing": message => "the message" }

data/spec/integration/util/windows/principal_spec.rb

@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/util/windows'
+
+describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft_windows? do
+
+  let (:system_bytes) { [1, 1, 0, 0, 0, 0, 0, 5, 18, 0, 0, 0] }
+  let (:administrator_bytes) { [1, 2, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 32, 2, 0, 0] }
+
+  describe ".lookup_account_name" do
+    it "should create an instance from a well-known account name" do
+      principal = Puppet::Util::Windows::SID::Principal.lookup_account_name('SYSTEM')
+      expect(principal.account).to eq('SYSTEM')
+      expect(principal.sid_bytes).to eq(system_bytes)
+      expect(principal.sid).to eq('S-1-5-18')
+      expect(principal.domain).to eq('NT AUTHORITY')
+      expect(principal.domain_account).to eq('NT AUTHORITY\\SYSTEM')
+      expect(principal.account_type).to eq(:SidTypeWellKnownGroup)
+    end
+
+    it "should create an instance from a well-known account prefixed with NT AUTHORITY" do
+      principal = Puppet::Util::Windows::SID::Principal.lookup_account_name('NT AUTHORITY\\SYSTEM')
+      expect(principal.account).to eq('SYSTEM')
+      expect(principal.sid_bytes).to eq(system_bytes)
+      expect(principal.sid).to eq('S-1-5-18')
+      expect(principal.domain).to eq('NT AUTHORITY')
+      expect(principal.domain_account).to eq('NT AUTHORITY\\SYSTEM')
+      expect(principal.account_type).to eq(:SidTypeWellKnownGroup)
+    end
+
+    it "should create an instance from a local account prefixed with hostname" do
+      current_user_name = Puppet::Util::Windows::ADSI::User.current_user_name
+      running_as_system = (current_user_name == 'SYSTEM')
+      username = running_as_system ? 'Administrator' : current_user_name
+
+      user_exists = Puppet::Util::Windows::ADSI::User.exists?(".\\#{username}")
+
+      # when running as SYSTEM (in Jenkins CI), then Administrator should be used
+      # otherwise running in AppVeyor there is no Administrator and a the current local user can be used
+      skip if (running_as_system && !user_exists)
+
+      hostname = Socket.gethostname
+
+      principal = Puppet::Util::Windows::SID::Principal.lookup_account_name("#{hostname}\\#{username}")
+      expect(principal.account).to match(/^#{Regexp.quote(username)}$/i)
+      # skip SID and bytes in this case since the most interesting thing here is domain_account
+      expect(principal.domain).to match(/^#{Regexp.quote(hostname)}$/i)
+      expect(principal.domain_account).to match(/^#{Regexp.quote(hostname)}\\#{Regexp.quote(username)}$/i)
+      expect(principal.account_type).to eq(:SidTypeUser)
+    end
+
+    it "should create an instance from a well-known group alias" do
+      principal = Puppet::Util::Windows::SID::Principal.lookup_account_name('Administrators')
+      expect(principal.account).to eq('Administrators')
+      expect(principal.sid_bytes).to eq(administrator_bytes)
+      expect(principal.sid).to eq('S-1-5-32-544')
+      expect(principal.domain).to eq('BUILTIN')
+      expect(principal.domain_account).to eq('BUILTIN\\Administrators')
+      expect(principal.account_type).to eq(:SidTypeAlias)
+    end
+
+    it "should raise an error when trying to lookup an account that doesn't exist" do
+      principal = Puppet::Util::Windows::SID::Principal
+      expect {
+        principal.lookup_account_name('ConanTheBarbarian')
+      }.to raise_error(Puppet::Util::Windows::Error, /Failed to call LookupAccountNameW/)
+    end
+  end
+
+  describe ".lookup_account_sid" do
+    it "should create an instance from a well-known account SID" do
+      principal = Puppet::Util::Windows::SID::Principal.lookup_account_sid(system_bytes)
+      expect(principal.account).to eq('SYSTEM')
+      expect(principal.sid_bytes).to eq(system_bytes)
+      expect(principal.sid).to eq('S-1-5-18')
+      expect(principal.domain).to eq('NT AUTHORITY')
+      expect(principal.domain_account).to eq('NT AUTHORITY\\SYSTEM')
+
+      # Windows API LookupAccountSid behaves differently if current user is SYSTEM
+      # even though LookupAccountName does not demonstrate same behavior
+      if Puppet::Util::Windows::ADSI::User.current_user_name != 'SYSTEM'
+        account_type = :SidTypeWellKnownGroup
+      else
+        account_type = :SidTypeUser
+      end
+
+      expect(principal.account_type).to eq(account_type)
+    end
+
+    it "should create an instance from a well-known group SID" do
+      principal = Puppet::Util::Windows::SID::Principal.lookup_account_sid(administrator_bytes)
+      expect(principal.account).to eq('Administrators')
+      expect(principal.sid_bytes).to eq(administrator_bytes)
+      expect(principal.sid).to eq('S-1-5-32-544')
+      expect(principal.domain).to eq('BUILTIN')
+      expect(principal.domain_account).to eq('BUILTIN\\Administrators')
+      expect(principal.account_type).to eq(:SidTypeAlias)
+    end
+
+    it "should raise an error when trying to lookup completely invalid SID bytes" do
+      principal = Puppet::Util::Windows::SID::Principal
+      expect {
+        principal.lookup_account_sid([])
+      }.to raise_error(Puppet::Util::Windows::Error, /Failed to call LookupAccountSidW:  The parameter is incorrect/)
+    end
+
+    it "should raise an error when trying to lookup a valid SID that doesn't have a matching account" do
+      principal = Puppet::Util::Windows::SID::Principal
+      expect {
+        # S-1-1-1 which is not a valid account
+        principal.lookup_account_sid([1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0])
+      }.to raise_error(Puppet::Util::Windows::Error, /Failed to call LookupAccountSidW:  No mapping between account names and security IDs was done/)
+    end
+  end
+end

data/spec/{unit → integration}/util/windows/registry_spec.rb

@@ -2,10 +2,30 @@
 require 'spec_helper'
 require 'puppet/util/windows'
 
-describe Puppet::Util::Windows::Registry, :if => Puppet::Util::Platform.windows? do
+if Puppet::Util::Platform.windows?
+describe Puppet::Util::Windows::Registry do
   subject do
     class TestRegistry
       include Puppet::Util::Windows::Registry
+      extend FFI::Library
+
+      ffi_lib :advapi32
+      attach_function :RegSetValueExW,
+        [:handle, :pointer, :dword, :dword, :pointer, :dword], :win32_long
+
+      def write_corrupt_dword(reg, valuename)
+        # Normally DWORDs contain 4 bytes.  This bad data only has 2
+        bad_data = [0, 0]
+        FFI::Pointer.from_string_to_wide_string(valuename) do |name_ptr|
+          FFI::MemoryPointer.new(:uchar, bad_data.length) do |data_ptr|
+            data_ptr.write_array_of_uchar(bad_data)
+            if RegSetValueExW(reg.hkey, name_ptr, 0,
+              Win32::Registry::REG_DWORD, data_ptr, data_ptr.size) != 0
+                raise Puppet::Util::Windows::Error.new("Failed to write registry value")
+            end
+          end
+        end
+      end
     end
 
     TestRegistry.new
@@ -163,5 +183,75 @@ describe Puppet::Util::Windows::Registry, :if => Puppet::Util::Platform.windows?
         end
       end
     end
+
+    context "when reading values" do
+      let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
+      let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
+      let (:subkey_name) { "PuppetRegistryTest" }
+      let (:value_name) { SecureRandom.uuid }
+
+      after(:each) do
+        hklm.open(puppet_key, Win32::Registry::KEY_ALL_ACCESS) do |reg|
+          subject.delete_key(reg, subkey_name)
+        end
+      end
+
+      [
+        {:name => 'REG_SZ', :type => Win32::Registry::REG_SZ, :value => 'reg sz string'},
+        {:name => 'REG_EXPAND_SZ', :type => Win32::Registry::REG_EXPAND_SZ, :value => 'reg expand string'},
+        {:name => 'REG_MULTI_SZ', :type => Win32::Registry::REG_MULTI_SZ, :value => ['string1', 'string2']},
+        {:name => 'REG_BINARY', :type => Win32::Registry::REG_BINARY, :value => 'abinarystring'},
+        {:name => 'REG_DWORD', :type => Win32::Registry::REG_DWORD, :value => 0xFFFFFFFF},
+        {:name => 'REG_DWORD_BIG_ENDIAN', :type => Win32::Registry::REG_DWORD_BIG_ENDIAN, :value => 0xFFFF},
+        {:name => 'REG_QWORD', :type => Win32::Registry::REG_QWORD, :value => 0xFFFFFFFFFFFFFFFF},
+      ].each do |pair|
+        it "should return #{pair[:name]} values" do
+          hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS) do |reg|
+            reg.write(value_name, pair[:type], pair[:value])
+          end
+
+          hklm.open("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_READ) do |reg|
+            vals = subject.values(reg)
+
+            expect(vals).to have_key(value_name)
+            subject.each_value(reg) do |subkey, type, data|
+              expect(type).to eq(pair[:type])
+            end
+
+            written = vals[value_name]
+            expect(written).to eq(pair[:value])
+          end
+        end
+      end
+    end
+
+    context "when reading corrupt values" do
+      let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
+      let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
+      let (:subkey_name) { "PuppetRegistryTest" }
+      let (:value_name) { SecureRandom.uuid }
+
+      before(:each) do
+        hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS) do |reg_key|
+          subject.write_corrupt_dword(reg_key, value_name)
+        end
+      end
+
+      after(:each) do
+        hklm.open(puppet_key, Win32::Registry::KEY_ALL_ACCESS) do |reg_key|
+          subject.delete_key(reg_key, subkey_name)
+        end
+      end
+
+      it "should return nil for a corrupt DWORD" do
+        hklm.open("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS) do |reg_key|
+          vals = subject.values(reg_key)
+
+          expect(vals).to have_key(value_name)
+          expect(vals[value_name]).to be_nil
+        end
+      end
+    end
   end
 end
+end

data/spec/integration/util/windows/security_spec.rb

@@ -478,7 +478,7 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
             user = Puppet::Util::Windows::ADSI::User.create("puppet#{rand(10000)}")
             user.commit
             begin
-              sid = Puppet::Util::Windows::ADSI::User.new(user.name).sid.to_s
+              sid = Puppet::Util::Windows::ADSI::User.new(user.name).sid.sid
               winsec.set_owner(sid, path)
               winsec.set_mode(WindowsSecurityTester::S_IRWXU, path)
             ensure
@@ -494,7 +494,7 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
             group = Puppet::Util::Windows::ADSI::Group.create("puppet#{rand(10000)}")
             group.commit
             begin
-              sid = Puppet::Util::Windows::ADSI::Group.new(group.name).sid.to_s
+              sid = Puppet::Util::Windows::ADSI::Group.new(group.name).sid.sid
               winsec.set_group(sid, path)
               winsec.set_mode(WindowsSecurityTester::S_IRWXG, path)
             ensure