ruby-pwsh 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df8360a152766169ee39b1a3e79909f5e75f1645194f22996eb09246c58d8a79
-  data.tar.gz: 9733619df523ed7c6d1af948fe2a75e35d24ac7b723cd610945a3c617c367685
+  metadata.gz: 0fef17470ea141631393a6cac8223b5a8434b2eb635322c800dcb631b4346e23
+  data.tar.gz: '01540184072d233ea41bda8c83ad78206c109deaeabf993e58c0fc186c899148'
 SHA512:
-  metadata.gz: f7e6afecbbe06c0a78509458e7e178295d57de9d5901b6a448c177a5be4f2ec1361015de97daf8db022a20dcddda3f50ea0dc326234fea71e068809c06c50f02
-  data.tar.gz: 964652929914f2aeb579835dec656d56cc8005218b64075daed3bad684a972c45079f00586a0df4f803a9c369431364163c9515542bc0be4ee58cfb07223f269
+  metadata.gz: 7c6560622e733169f212d9d3b00a630f5f874442b9eee08fdd4d67353da19dd7a59b946c2936a771f49bce1e9e245b08a66182e4d437c405de77d1c73ef675bd
+  data.tar.gz: 8c249190c38f398499ed94296e76914cd0a7d0a7a12917c7063284cb0aed8a7251bcadceb753c1d20b213c361985cf78f66cc1d7471eae1e6fbe2f681426b01a

data/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb

@@ -773,7 +773,7 @@ class Puppet::Provider::DscBaseProvider # rubocop:disable Metrics/ClassLength
     <<~MUNGE_PSMODULEPATH.strip
       $UnmungedPSModulePath = [System.Environment]::GetEnvironmentVariable('PSModulePath','machine')
       $MungedPSModulePath = $env:PSModulePath + ';#{vendor_path}'
-      [System.Environment]::SetEnvironmentVariable('PSModulePath', $MungedPSModulePath, [System.EnvironmentVariableTarget]::Machine)
+      Set-ItemProperty -Path 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name 'PSModulePath' -Value $MungedPSModulePath
       $env:PSModulePath = [System.Environment]::GetEnvironmentVariable('PSModulePath','machine')
     MUNGE_PSMODULEPATH
   end
@@ -794,7 +794,7 @@ class Puppet::Provider::DscBaseProvider # rubocop:disable Metrics/ClassLength
       variable_name = random_variable_name
       credential_hash = {
         'user' => property_hash[:value]['user'],
-        'password' => escape_quotes(property_hash[:value]['password'].unwrap)
+        'password' => escape_quotes(unwrap_string(property_hash[:value]['password']))
       }
       credentials_block << format_pscredential(variable_name, credential_hash)
       instantiated_variables.merge!(variable_name => credential_hash)
@@ -899,7 +899,7 @@ class Puppet::Provider::DscBaseProvider # rubocop:disable Metrics/ClassLength
   #
   # @param resource [Hash] a hash with the information needed to run `Invoke-DscResource`
   # @return [String] A string representing the PowerShell definition of the InvokeParams hash
-  def invoke_params(resource)
+  def invoke_params(resource) # rubocop:disable Metrics/MethodLength
     params = {
       Name: resource[:dscmeta_resource_friendly_name],
       Method: resource[:dsc_invoke_method],
@@ -917,6 +917,10 @@ class Puppet::Provider::DscBaseProvider # rubocop:disable Metrics/ClassLength
       params[:ModuleName] = resource[:dscmeta_module_name]
     end
     resource[:parameters].each do |property_name, property_hash|
+      # ignore dsc_timeout, since it is only used to specify the powershell command timeout
+      # and timeout itself is not a parameter to the DSC resource
+      next if property_name == :dsc_timeout
+
       # strip dsc_ from the beginning of the property name declaration
       name = property_name.to_s.gsub(/^dsc_/, '').to_sym
       params[:Property][name] = case property_hash[:mof_type]
@@ -925,7 +929,7 @@ class Puppet::Provider::DscBaseProvider # rubocop:disable Metrics/ClassLength
                                   # the Credential hash interpolable as it will be replaced by a variable reference.
                                   {
                                     'user' => property_hash[:value]['user'],
-                                    'password' => escape_quotes(property_hash[:value]['password'].unwrap)
+                                    'password' => escape_quotes(unwrap_string(property_hash[:value]['password']))
                                   }
                                 when 'DateTime'
                                   # These have to be handled specifically because they rely on the *Puppet* DateTime,
@@ -1018,6 +1022,31 @@ class Puppet::Provider::DscBaseProvider # rubocop:disable Metrics/ClassLength
     end
   end
 
+  # Unwrap sensitive strings and handle string
+  #
+  # @param value [Object] The object to unwrap sensitive data inside of
+  # @return [Object] The object with any sensitive strings unwrapped
+  def unwrap_string(value)
+    case value
+    when Puppet::Pops::Types::PSensitiveType::Sensitive
+      value.unwrap
+    when Hash
+      unwrapped = {}
+      value.each do |k, v|
+        unwrapped[k] = unwrap_string(v)
+      end
+      unwrapped
+    when Array
+      unwrapped = []
+      value.each do |v|
+        unwrapped << unwrap_string(v)
+      end
+      unwrapped
+    else
+      value
+    end
+  end
+
   # Escape any nested single quotes in a Sensitive string
   #
   # @param text [String] the text to escape

data/lib/puppet/provider/dsc_base_provider/invoke_dsc_resource_postscript.ps1

@@ -6,7 +6,7 @@ Try {
 } Finally {
   If (![string]::IsNullOrEmpty($UnmungedPSModulePath)) {
     # Reset the PSModulePath
-    [System.Environment]::SetEnvironmentVariable('PSModulePath', $UnmungedPSModulePath, [System.EnvironmentVariableTarget]::Machine)
+    Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -Name 'PSModulePath' -Value $UnmungedPSModulePath
     $env:PSModulePath = [System.Environment]::GetEnvironmentVariable('PSModulePath', 'machine')
   }
 }

data/lib/pwsh/version.rb

@@ -2,5 +2,5 @@
 
 module Pwsh
   # The version of the ruby-pwsh gem
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/lib/templates/init.ps1

@@ -152,7 +152,7 @@ function Invoke-PowerShellUserCode {
     # Set any provided environment variables
     if ($AdditionalEnvironmentVariables -ne $null) {
       $AdditionalEnvironmentVariables.GetEnumerator() |
-        ForEach-Object -Process { Set-Item -Path "Env:\$($_.Name)" -Value $_.Value }
+        ForEach-Object -Process { Set-Item -Path "Env:\$($_.Name)" -Value "$($_.Value)" }
     }
 
     # We clear the commands before each new command to avoid command pollution This does not need

data/spec/unit/puppet/provider/dsc_base_provider/dsc_base_provider_spec.rb

@@ -439,7 +439,7 @@ RSpec.describe Puppet::Provider::DscBaseProvider do
           mof_is_embedded: false
         },
         dsc_psdscrunascredential: {
-          type: 'Optional[Struct[{ user => String[1], password => Sensitive[String[1]] }]]',
+          type: 'Optional[Struct[{ user => String[1], password => Variant[String[1], Sensitive[String[1]]] }]]',
           behaviour: :parameter,
           mandatory_for_get: false,
           mandatory_for_set: false,
@@ -906,7 +906,7 @@ RSpec.describe Puppet::Provider::DscBaseProvider do
             mof_is_embedded: false
           },
           dsc_psdscrunascredential: {
-            type: 'Optional[Struct[{ user => String[1], password => Sensitive[String[1]] }]]',
+            type: 'Optional[Struct[{ user => String[1], password => Variant[String[1], Sensitive[String[1]]] }]]',
             desc: 'The Credential to run DSC under',
             behaviour: :parameter,
             mandatory_for_get: false,
@@ -1529,7 +1529,7 @@ RSpec.describe Puppet::Provider::DscBaseProvider do
       end
 
       it 'updates the system PSModulePath to $MungedPSModulePath' do
-        expect(result).to match(/SetEnvironmentVariable\('PSModulePath', \$MungedPSModulePath/)
+        expect(result).to match(/-Name 'PSModulePath' -Value \$MungedPSModulePath/)
       end
 
       it 'sets the process level PSModulePath to the modified system PSModulePath' do
@@ -1572,6 +1572,8 @@ RSpec.describe Puppet::Provider::DscBaseProvider do
       let(:test_resource) { base_resource.merge(additional_parameters) }
 
       before do
+        allow(Puppet::Pops::Types::PSensitiveType::Sensitive).to receive(:===).with(foo_password).and_return(true)
+        allow(Puppet::Pops::Types::PSensitiveType::Sensitive).to receive(:===).with(bar_password).and_return(true)
         allow(foo_password).to receive(:unwrap).and_return('foo')
         allow(bar_password).to receive(:unwrap).and_return('bar')
       end
@@ -1811,6 +1813,11 @@ RSpec.describe Puppet::Provider::DscBaseProvider do
           "$InvokeParams = @{Name = 'Foo'; Method = 'Get'; Property = @{credential = $SomeCredential}; ModuleName = 'PuppetDsc'}"
         end
 
+        before do
+          allow(Puppet::Pops::Types::PSensitiveType::Sensitive).to receive(:===).with(password).and_return(true)
+          allow(password).to receive(:unwrap).and_return('bar')
+        end
+
         it 'unwraps the credential hash and interpolates the appropriate variable' do
           expect(password).to receive(:unwrap).and_return('FooPassword')
           expect(provider).to receive(:interpolate_variables).with(formatted_param_hash).and_return(variable_interpolated_param_hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pwsh
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Puppet, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies: []
 description: PowerShell code manager for ruby.
 email:
@@ -51,7 +51,7 @@ metadata:
   homepage_uri: https://github.com/puppetlabs/ruby-pwsh
   source_code_uri: https://github.com/puppetlabs/ruby-pwsh
   changelog_uri: https://github.com/puppetlabs/ruby-pwsh
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: PowerShell code manager for ruby.
 test_files: []