chef-powershell 1.0.13 → 3.0.15

data/lib/chef-powershell/powershell.rb

@@ -42,6 +42,8 @@ class ChefPowerShell
       # There is no mechanism to build a Windows gem file. It has to be done manually running manual_gem_release.ps1
       # Bundle install ensures that the correct architecture binaries are installed into the path.
       @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
+      timeout = -1 if timeout.nil? || timeout == 0
+
       exec(script, timeout: timeout)
     end
 
@@ -51,9 +53,7 @@ class ChefPowerShell
     # @return [Boolean]
     #
     def error?
-      return true if errors.count > 0
-
-      false
+      errors.count > 0
     end
 
     #
@@ -65,42 +65,32 @@ class ChefPowerShell
 
     module PowerMod
       extend FFI::Library
-      @@powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
-      @@ps_command = ""
-      @@ps_timeout = -1
-
-      def self.set_ps_dll(value)
-        @@powershell_dll = value
-      end
 
-      def self.set_ps_command(value)
-        @@ps_command = value
+      def self.powershell_dll=(powershell_dll)
+        @powershell_dll = powershell_dll
       end
 
-      def self.set_ps_timeout(value)
-        @@ps_timeout = value
+      def self.powershell_dll
+        @powershell_dll
       end
 
-      def self.do_work
-        ffi_lib @@powershell_dll
+      def self.do_work(ps_command, timeout = -1)
+        ffi_lib PowerMod.powershell_dll
         attach_function :execute_powershell, :ExecuteScript, %i{string int}, :pointer
-        execute_powershell(@@ps_command, @@ps_timeout)
+        execute_powershell(ps_command, timeout)
       end
     end
 
     private
 
     def exec(script, timeout: -1)
-      timeout = -1 if timeout == 0 || timeout.nil?
-      PowerMod.set_ps_dll(@powershell_dll)
-      PowerMod.set_ps_timeout(timeout)
-      PowerMod.set_ps_command(script)
-      execution = PowerMod.do_work
-      output = execution.read_utf16string
-      hashed_outcome = FFI_Yajl::Parser.parse(output)
-      @result = FFI_Yajl::Parser.parse(hashed_outcome["result"])
-      @errors = hashed_outcome["errors"]
-      @verbose = hashed_outcome["verbose"]
+      PowerMod.powershell_dll = @powershell_dll
+      @execution = PowerMod.do_work(script, timeout)
+      @output = @execution.read_utf16string
+      @hashed_outcome = FFI_Yajl::Parser.parse(@output)
+      @result = FFI_Yajl::Parser.parse(@hashed_outcome["result"])
+      @errors = @hashed_outcome["errors"]
+      @verbose = @hashed_outcome["verbose"]
     end
   end
 end

data/lib/chef-powershell/version.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: true
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "1.0.13"
+  VERSION = "3.0.15"
 end

data/spec/unit/powershell_exec_spec.rb

@@ -90,5 +90,34 @@ describe ChefPowerShell::ChefPowerShellModule::PowerShellExec, :windows_only do
     it "raises an error if the interpreter is invalid" do
       expect { object.powershell_exec!("this-should-error", :power_mistake) }.to raise_error(ArgumentError)
     end
+
+    let(:cert_script) do
+      %q~
+        $serverauth = New-SelfSignedCertificate -Subject "chef-Server2019DC" -CertStoreLocation Cert:\CurrentUser\My -KeyExportPolicy 'Exportable' #-Type SSLServerAuthentication
+        $rootStore = [System.Security.Cryptography.X509Certificates.X509Store]::new("Root","LocalMachine")
+        ## Open the root certificate store for reading and writing.
+        $rootStore.Open("ReadWrite")
+        ## Add the certificate stored in the $authenticode variable.
+        $rootStore.Add($serverauth)
+        ## Close the root certificate store.
+        $rootStore.Close()
+
+        $publisherStore = [System.Security.Cryptography.X509Certificates.X509Store]::new("TrustedPublisher","LocalMachine")
+        # Open the TrustedPublisher certificate store for reading and writing.
+        $publisherStore.Open("ReadWrite")
+        ## Add the certificate stored in the $authenticode variable.
+        $publisherStore.Add($serverauth)
+        ## Close the TrustedPublisher certificate store.
+        $publisherStore.Close()
+
+        # Get the code-signing certificate from the local computer's certificate store with the name *ATA Authenticode* and store it to the $codeCertificate variable.
+        $codeCertificate = Get-ChildItem Cert:\CurrentUser\My | Where-Object {$_.Subject -eq "CN=chef-Server2019DC"}
+        return [convert]::tobase64string($codeCertificate[0].rawdata)
+      ~
+    end
+    it "runs a command to create and retrieve a certificate" do
+      expect { object.powershell_exec!(cert_script) }.not_to raise_error
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-powershell
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 3.0.15
 platform: ruby
 authors:
 - Chef Software, Inc
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-description:
+description: 
 email:
 - oss@chef.io
 executables: []
@@ -329,7 +329,7 @@ files:
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mi.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/miutils.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore.dll
-- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore_amd64_amd64_5.0.521.16609.dll
+- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore_amd64_amd64_5.0.1522.11506.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordbi.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscorlib.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscorrc.dll
@@ -674,7 +674,7 @@ metadata:
   documentation_uri: https://github.com/chef/chef-powershell-shim/chef-powershell/README.md
   homepage_uri: https://github.com/chef/chef/tree/main/chef-powershell
   source_code_uri: https://github.com/chef/chef-powershell-shim/chef-powershell
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -690,9 +690,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.3
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: External Chef module for accessing and utilizing PowerShell
 test_files: []