win32-certstore 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64767d805d6d3804ebb5cf74f3b8e0e58fb30d011dc25f1837ce28788268ca70
-  data.tar.gz: 909aae7b8937fb0b2b58c3a8b52bd073bfc38fd87e0c5f85a81e383e6530ac6b
+  metadata.gz: c17507a4ecec6470d09f2ce920862647dd3cffa5f9081565a9f2881e1a9d3c32
+  data.tar.gz: 62a74c513b42c2ec4d9431fe5a7a911c9d08b2b31d1a802728eccdb9b55b428e
 SHA512:
-  metadata.gz: 468fce72a67383b7f637c28e13121ee2dbdeca97f098172a5105187e90cee799e7b161f12c3bfda750414a45a3021b56885302acb57d3bb1e96739b58e691f79
-  data.tar.gz: f74cb671edfb4a0b4c5743e04e0a8b572c5179724f26295cb24a63a7350833da88600fdd787b1f27f23851a0355a1a53caa45869d43f851aafb486b9739a9a0c
+  metadata.gz: 6a83b025818c0e1e0708821f64cb0da5d96d612d04437168394caafc88615b389b81a27b1e24ed06d0d65f668090a803fc05cf239fccad86f229d4c8614090f1
+  data.tar.gz: 575e50b799a8b7af0bbdc048d1abbecc8fa51e0f3bdbad744bd29aea8f9ca4d6400f98a58bd0b00c7e4f119421b16a800c1a864d4eb9d4a333173861df3c7f07

data/README.md

@@ -203,9 +203,10 @@ store.close
 
 Ruby 1.9.3+ is required.
 
-## CONTRIBUTING:
+## Contributing
+
+For information on contributing to this project see https://github.com/chef/chef/blob/master/CONTRIBUTING.md
 
-Please file bugs against the WIN32-CERTSTORE project at https://github.com/chef/win32-certstore/issues.
 
 More information on the contribution process for Chef projects can be found in the [Chef Contributions document](http://docs.chef.io/community_contributions.html).
 

data/lib/win32-certstore.rb

@@ -1,18 +1,18 @@
-#
-# Author:: Nimisha Sharad (<nimisha.sharad@msystechnologies.com>)
-# Copyright:: Copyright (c) 2017 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require_relative "win32/certstore"
+#
+# Author:: Nimisha Sharad (<nimisha.sharad@msystechnologies.com>)
+# Copyright:: Copyright (c) 2017 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "win32/certstore"

data/lib/win32/certstore.rb

@@ -1,129 +1,129 @@
-#
-# Author:: Nimisha Sharad (<nimisha.sharad@msystechnologies.com>)
-# Copyright:: Copyright (c) 2017 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require_relative "certstore/mixin/crypto"
-require_relative "certstore/mixin/assertions"
-require_relative "certstore/mixin/helper"
-require_relative "certstore/mixin/string"
-require_relative "certstore/store_base"
-require_relative "certstore/version"
-
-module Win32
-  class Certstore
-    include Win32::Certstore::Mixin::Crypto
-    extend Win32::Certstore::Mixin::Assertions
-    include Win32::Certstore::Mixin::String
-    include Win32::Certstore::StoreBase
-
-    attr_reader :store_name
-
-    def initialize(store_name)
-      @certstore_handler = open(store_name)
-    end
-
-    # To open given certificate store
-    def self.open(store_name)
-      validate_store(store_name)
-      if block_given?
-        yield new(store_name)
-      else
-        new(store_name)
-      end
-    end
-
-    # Adds a new certificate to an open certificate store
-    # @param request [Object] of certificate in OpenSSL::X509::Certificate.new format
-    # @return [true, false] only true or false
-    def add(certificate_obj)
-      cert_add(certstore_handler, certificate_obj)
-    end
-
-    # Return `OpenSSL::X509` certificate object
-    # @param request [thumbprint<string>] of certificate
-    # @return [Object] of certificates in OpenSSL::X509 format
-    def get(certificate_thumbprint)
-      cert_get(certificate_thumbprint)
-    end
-
-    # Returns all the certificates in a store
-    # @param [nil]
-    # @return [Array] array of certificates list
-    def list
-      cert_list(certstore_handler)
-    end
-
-    # Delete existing certificate from open certificate store
-    # @param request [thumbprint<string>] of certificate
-    # @return [true, false] only true or false
-    def delete(certificate_thumbprint)
-      cert_delete(certstore_handler, certificate_thumbprint)
-    end
-
-    # Returns all matching certificates in a store
-    # @param request[search_token<string>] attributes of certificates as: CN, RDN, Friendly Name and other attributes
-    # @return [Array] array of certificates list
-    def search(search_token)
-      cert_search(certstore_handler, search_token)
-    end
-
-    # Validates a certificate in a certificate store on the basis of time validity
-    # @param request[thumbprint<string>] of certificate
-    # @return [true, false] only true or false
-    def valid?(certificate_thumbprint)
-      cert_validate(certificate_thumbprint)
-    end
-
-    # To close and destroy pointer of open certificate store handler
-    def close
-      closed = CertCloseStore(@certstore_handler, CERT_CLOSE_STORE_FORCE_FLAG)
-      unless closed
-        last_error = FFI::LastError.error
-        raise SystemCallError.new("Unable to close the Certificate Store.", last_error)
-      end
-      remove_finalizer
-    end
-
-    private
-
-    attr_reader :certstore_handler
-
-    # To open certstore and return open certificate store pointer
-    def open(store_name)
-      certstore_handler = CertOpenSystemStoreW(nil, wstring(store_name))
-      unless certstore_handler
-        last_error = FFI::LastError.error
-        raise SystemCallError.new("Unable to open the Certificate Store `#{store_name}`.", last_error)
-      end
-      add_finalizer(certstore_handler)
-      certstore_handler
-    end
-
-    # Get all open certificate store handler
-    def add_finalizer(certstore_handler)
-      ObjectSpace.define_finalizer(self, self.class.finalize(certstore_handler))
-    end
-
-    def self.finalize(certstore_handler)
-      proc { "#{certstore_handler}" }
-    end
-
-    # To close all open certificate store at the end
-    def remove_finalizer
-      ObjectSpace.undefine_finalizer(self)
-    end
-  end
-end
+#
+# Author:: Nimisha Sharad (<nimisha.sharad@msystechnologies.com>)
+# Copyright:: Copyright (c) 2017 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "certstore/mixin/crypto"
+require_relative "certstore/mixin/assertions"
+require_relative "certstore/mixin/helper"
+require_relative "certstore/mixin/string"
+require_relative "certstore/store_base"
+require_relative "certstore/version"
+
+module Win32
+  class Certstore
+    include Win32::Certstore::Mixin::Crypto
+    extend Win32::Certstore::Mixin::Assertions
+    include Win32::Certstore::Mixin::String
+    include Win32::Certstore::StoreBase
+
+    attr_reader :store_name
+
+    def initialize(store_name)
+      @certstore_handler = open(store_name)
+    end
+
+    # To open given certificate store
+    def self.open(store_name)
+      validate_store(store_name)
+      if block_given?
+        yield new(store_name)
+      else
+        new(store_name)
+      end
+    end
+
+    # Adds a new certificate to an open certificate store
+    # @param request [Object] of certificate in OpenSSL::X509::Certificate.new format
+    # @return [true, false] only true or false
+    def add(certificate_obj)
+      cert_add(certstore_handler, certificate_obj)
+    end
+
+    # Return `OpenSSL::X509` certificate object
+    # @param request [thumbprint<string>] of certificate
+    # @return [Object] of certificates in OpenSSL::X509 format
+    def get(certificate_thumbprint)
+      cert_get(certificate_thumbprint)
+    end
+
+    # Returns all the certificates in a store
+    # @param [nil]
+    # @return [Array] array of certificates list
+    def list
+      cert_list(certstore_handler)
+    end
+
+    # Delete existing certificate from open certificate store
+    # @param request [thumbprint<string>] of certificate
+    # @return [true, false] only true or false
+    def delete(certificate_thumbprint)
+      cert_delete(certstore_handler, certificate_thumbprint)
+    end
+
+    # Returns all matching certificates in a store
+    # @param request[search_token<string>] attributes of certificates as: CN, RDN, Friendly Name and other attributes
+    # @return [Array] array of certificates list
+    def search(search_token)
+      cert_search(certstore_handler, search_token)
+    end
+
+    # Validates a certificate in a certificate store on the basis of time validity
+    # @param request[thumbprint<string>] of certificate
+    # @return [true, false] only true or false
+    def valid?(certificate_thumbprint)
+      cert_validate(certificate_thumbprint)
+    end
+
+    # To close and destroy pointer of open certificate store handler
+    def close
+      closed = CertCloseStore(@certstore_handler, CERT_CLOSE_STORE_FORCE_FLAG)
+      unless closed
+        last_error = FFI::LastError.error
+        raise SystemCallError.new("Unable to close the Certificate Store.", last_error)
+      end
+      remove_finalizer
+    end
+
+    def self.finalize(certstore_handler)
+      proc { certstore_handler.to_s }
+    end
+
+    private
+
+    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))
+      unless certstore_handler
+        last_error = FFI::LastError.error
+        raise SystemCallError.new("Unable to open the Certificate Store `#{store_name}`.", last_error)
+      end
+      add_finalizer(certstore_handler)
+      certstore_handler
+    end
+
+    # Get all open certificate store handler
+    def add_finalizer(certstore_handler)
+      ObjectSpace.define_finalizer(self, self.class.finalize(certstore_handler))
+    end
+
+    # To close all open certificate store at the end
+    def remove_finalizer
+      ObjectSpace.undefine_finalizer(self)
+    end
+  end
+end

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

@@ -22,8 +22,8 @@ module Win32
       module Assertions
         # Validate certificate store name
         def validate_store(store_name)
-          unless valid_store_name.include?(store_name.to_s.upcase)
-            raise ArgumentError, "Invalid Certificate Store."
+          if store_name.to_s.strip.empty?
+            raise ArgumentError, "Empty Certificate Store."
           end
         end
 

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

@@ -76,6 +76,9 @@ module Win32
         CERT_NAME_SEARCH_ALL_NAMES_FLAG                     = 0x2
         CERT_NAME_STR_ENABLE_PUNYCODE_FLAG                  = 0x00200000
 
+        CERT_STORE_PROV_SYSTEM                              = 10
+        CERT_SYSTEM_STORE_LOCAL_MACHINE                     = 0x00020000
+
         # Define ffi pointer
         HCERTSTORE                                          = FFI::TypeDefs[:pointer]
         HCRYPTPROV_LEGACY                                   = FFI::TypeDefs[:pointer]
@@ -172,6 +175,8 @@ module Win32
 
         # To opens the most common system certificate store
         safe_attach_function :CertOpenSystemStoreW, [HCRYPTPROV_LEGACY, LPCTSTR], HCERTSTORE
+        # To open a certificate store for most purposes
+        safe_attach_function :CertOpenStore, [DWORD, DWORD, HCRYPTPROV_LEGACY, DWORD, LPCTSTR], HCERTSTORE
         # To close the already open certificate store
         safe_attach_function :CertCloseStore, [HCERTSTORE, DWORD], BOOL
         # To create encoded certificate context

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

@@ -69,7 +69,6 @@ module Win32
         def run_command_with_os_architecture(script, options)
           options ||= {}
           options = options.dup
-          arch = options.delete(:architecture)
 
           shell_out_command(
             build_powershell_command(script),

data/lib/win32/certstore/store_base.rb

@@ -44,7 +44,7 @@ module Win32
           else
             lookup_error
           end
-        rescue Exception => e
+        rescue
           lookup_error("add")
         end
       end
@@ -74,7 +74,7 @@ module Win32
             end
           end
           CertFreeCertificateContext(pcert_context)
-        rescue Exception => e
+        rescue
           lookup_error("list")
         end
         cert_list.to_json
@@ -85,7 +85,6 @@ module Win32
       # certificate_thumbprint => thumbprint is a hash. which could be sha1 or md5.
       def cert_delete(store_handler, certificate_thumbprint)
         validate_thumbprint(certificate_thumbprint)
-        cert_name = memory_ptr
         thumbprint = update_thumbprint(certificate_thumbprint)
         cert_pem = format_pem(get_cert_pem(thumbprint))
         cert_rdn = get_rdn(build_openssl_obj(cert_pem))
@@ -96,7 +95,7 @@ module Win32
             cert_delete_flag = CertDeleteCertificateFromStore(CertDuplicateCertificateContext(pcert_context)) || lookup_error
           end
           CertFreeCertificateContext(pcert_context)
-        rescue Exception => e
+        rescue
           lookup_error("delete")
         end
         cert_delete_flag
@@ -118,9 +117,7 @@ module Win32
       # search_token => CN, RDN or any certificate attribute
       def cert_search(store_handler, search_token)
         raise ArgumentError, "Invalid search token" if !search_token || search_token.strip.empty?
-        cert_rdn = memory_ptr
         certificate_list = []
-        counter = 0
         begin
           while (pcert_context = CertEnumCertificatesInStore(store_handler, pcert_context)) && !pcert_context.null?
             cert_property = get_cert_property(pcert_context)
@@ -129,7 +126,7 @@ module Win32
             end
           end
           CertFreeCertificateContext(pcert_context)
-        rescue Exception => e
+        rescue
           lookup_error
         end
         certificate_list

data/lib/win32/certstore/version.rb

@@ -1,6 +1,6 @@
 module Win32
   class Certstore
-    VERSION = "0.1.3"
+    VERSION = "0.1.7".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.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - nimisha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler