win32-certstore 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a571cfa5aea1f77ed28c7711fe81982338d7af42a73f886cfbdfe6df3123fc91
-  data.tar.gz: cb36e5aba55afe58af9a7770f330f276ad7013fe86f7d51dd1d9d372b7a9a598
+  metadata.gz: b391e4d81e324162538a2a3644aea74f0da1f8679409733a58dcf4c590734a6c
+  data.tar.gz: 5ed7821ec5bffe58cb09608cfc008b287874b5ddafe8556662fa27f42a25c1b1
 SHA512:
-  metadata.gz: 94138aaef753c7b9830e7374fc80d53ae531c85f14677f3fc72eb4234744ee7c21737b0ee8f41d530deeec0e433196ec1acacc1792468ed0849b995ee0fab754
-  data.tar.gz: 5710436ecefe40dc2883375d4317d333189ef0b7896b27dd3c31e0ccf1beab9d321edab6cae714b365492aec5420853a0ec8d53cb18dd006f61ecfa1e85c8a4a
+  metadata.gz: fc5c77cd659695ac3a58480ab875a6c5daa2b93cd83e45f1fcdfcd1bd89e0cf9653d38d63ae9e5260ecff90a7277f6ee600b91137665d53e672fbb77e1543cfb
+  data.tar.gz: 5b6a8025b85ae8ce026a9a7b603a35137000525ba182bbbcc8fc9667fb78dd6cf179ad1cfbb1cbdcdf582dd4749f82795a17df01181720d7f77a36a4477dc639

data/lib/win32/certstore.rb

@@ -31,18 +31,21 @@ module Win32
 
     attr_accessor :store_name
 
-    def initialize(store_name)
+    # Initializes a new instance of a certificate store.
+    # takes 2 parameters - the store name (My, Root, etc) and the location (CurrentUser or LocalMachine), it defaults to LocalMachine for backwards compatibility
+    def initialize(store_name, store_location: CERT_SYSTEM_STORE_LOCAL_MACHINE)
       @store_name = store_name
-      @certstore_handler = open(store_name)
+      @store_location = store_location
+      @certstore_handler = open(store_name, store_location: store_location)
     end
 
     # To open given certificate store
-    def self.open(store_name)
+    def self.open(store_name, store_location: CERT_SYSTEM_STORE_LOCAL_MACHINE)
       validate_store(store_name)
       if block_given?
-        yield new(store_name)
+        yield new(store_name, store_location: store_location)
       else
-        new(store_name)
+        new(store_name, store_location: store_location)
       end
     end
 
@@ -118,8 +121,9 @@ module Win32
     attr_reader :certstore_handler
 
     # To open certstore and return open certificate store pointer
-    def open(store_name)
-      certstore_handler = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, nil, CERT_SYSTEM_STORE_LOCAL_MACHINE, wstring(store_name))
+
+    def open(store_name, store_location: CERT_SYSTEM_STORE_LOCAL_MACHINE)
+      certstore_handler = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, nil, store_location, wstring(store_name))
       unless certstore_handler
         last_error = FFI::LastError.error
         raise SystemCallError.new("Unable to open the Certificate Store `#{store_name}`.", last_error)

data/lib/win32/certstore/mixin/crypto.rb

@@ -88,6 +88,9 @@ module Win32
 
         CERT_STORE_PROV_SYSTEM                              = 10
         CERT_SYSTEM_STORE_LOCAL_MACHINE                     = 0x00020000
+        CERT_SYSTEM_STORE_CURRENT_USER                      = 0x00010000
+        CERT_SYSTEM_STORE_SERVICES                          = 0x00050000
+        CERT_SYSTEM_STORE_USERS                             = 0x00060000
 
         # Define ffi pointer
         HCERTSTORE                                          = FFI::TypeDefs[:pointer]

data/lib/win32/certstore/mixin/helper.rb

@@ -21,12 +21,11 @@ module Win32
   class Certstore
     module Mixin
       module Helper
-
         # PSCommand to search certificate from thumbprint and convert in pem
-        def cert_ps_cmd(thumbprint, store_name)
+        def cert_ps_cmd(thumbprint, store_name, store_location: CERT_SYSTEM_STORE_LOCAL_MACHINE)
           <<-EOH
             $content = $null
-            $cert = Get-ChildItem Cert:\\LocalMachine\\'#{store_name}' -Recurse | Where { $_.Thumbprint -eq '#{thumbprint}' }
+            $cert = Get-ChildItem Cert:\\'#{store_location}'\\'#{store_name}' -Recurse | Where { $_.Thumbprint -eq '#{thumbprint}' }
             if($cert -ne $null)
             {
             $content = @(
@@ -43,7 +42,6 @@ module Win32
         def valid_duration?(cert_obj)
           cert_obj.not_before < Time.now.utc && cert_obj.not_after > Time.now.utc
         end
-
       end
     end
   end

data/lib/win32/certstore/mixin/{shell_out.rb → shell_exec.rb}

@@ -20,7 +20,7 @@ require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 module Win32
   class Certstore
     module Mixin
-      module ShellOut
+      module ShellExec
         def shell_out_command(*command_args)
           cmd = Mixlib::ShellOut.new(*command_args)
           cmd.live_stream
@@ -39,7 +39,7 @@ module Win32
         # @param script [String] script to run
         # @param options [Hash] options hash
         # @return [Mixlib::Shellout] mixlib-shellout object
-        def powershell_out(*command_args)
+        def powershell_exec(*command_args)
           script = command_args.first
           options = command_args.last.is_a?(Hash) ? command_args.last : nil
 
@@ -52,8 +52,8 @@ module Win32
         # @param script [String] script to run
         # @param options [Hash] options hash
         # @return [Mixlib::Shellout] mixlib-shellout object
-        def powershell_out!(*command_args)
-          cmd = powershell_out(*command_args)
+        def powershell_exec!(*command_args)
+          cmd = powershell_exec(*command_args)
           cmd.error!
           cmd
         end

data/lib/win32/certstore/store_base.rb

@@ -17,7 +17,7 @@
 
 require_relative "mixin/crypto"
 require_relative "mixin/string"
-require_relative "mixin/shell_out"
+require_relative "mixin/shell_exec"
 require_relative "mixin/unicode"
 require "openssl" unless defined?(OpenSSL)
 require "json" unless defined?(JSON)
@@ -28,7 +28,7 @@ module Win32
       include Win32::Certstore::Mixin::Crypto
       include Win32::Certstore::Mixin::Assertions
       include Win32::Certstore::Mixin::String
-      include Win32::Certstore::Mixin::ShellOut
+      include Win32::Certstore::Mixin::ShellExec
       include Win32::Certstore::Mixin::Unicode
       include Win32::Certstore::Mixin::Helper
 
@@ -231,8 +231,14 @@ module Win32
 
       # Get certificate pem
       def get_cert_pem(thumbprint)
-        get_data = powershell_out!(cert_ps_cmd(thumbprint, store_name))
+        converted_store = if @store_location == CERT_SYSTEM_STORE_LOCAL_MACHINE
+                            "LocalMachine"
+                          else
+                            "CurrentUser"
+                          end
+        get_data = powershell_exec!(cert_ps_cmd(thumbprint, store_name, store_location: converted_store))
         get_data.stdout
+        # get_data.result
       end
 
       # Format pem

data/lib/win32/certstore/version.rb

@@ -1,6 +1,6 @@
 module Win32
   class Certstore
-    VERSION = "0.4.1".freeze
+    VERSION = "0.5.3".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32-certstore
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,7 @@ files:
 - lib/win32/certstore/mixin/assertions.rb
 - lib/win32/certstore/mixin/crypto.rb
 - lib/win32/certstore/mixin/helper.rb
-- lib/win32/certstore/mixin/shell_out.rb
+- lib/win32/certstore/mixin/shell_exec.rb
 - lib/win32/certstore/mixin/string.rb
 - lib/win32/certstore/mixin/unicode.rb
 - lib/win32/certstore/store_base.rb
@@ -97,15 +97,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Ruby library for accessing the certificate store on Windows.
+summary: Ruby library for accessing the certificate stores on Windows.
 test_files: []