certstore_c 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32b40c0e8ae962aa68d6c2fd6cb86df0ec314e21d40bdee26de0a3f06c46a42b
-  data.tar.gz: 1c03f74ab3269365b93b144065e08cb50fbf48ca23d07996a818583da550e100
+  metadata.gz: '0910066063e5a1d4bbfeb144a111b6c14f663959aa52eef2e3eed7fa0b024d41'
+  data.tar.gz: b964fbfaa33f0a75cbc3df611fa7ea141870f8a2cf5791d4ffa2264067df0567
 SHA512:
-  metadata.gz: e958c5a56fa98ccf15d27ea2f3b07c853351d0e2639eb0bd19ce0e7746c1bb22041279f2e49f562c6471f4f7c5603c0a6ab39b348250394221e5f8164077868c
-  data.tar.gz: e11e7dca9a24157ef53a28d3b49ded628e3514ac58f166737731fc7ef3a80dbb9d0117ba1b9e7352b7ff118a2a9110cb606de32f26564babc45c5de629d6175a
+  metadata.gz: 5403938369f1e51832e2b299bbb08df72efb5fc7f676b17a92bb7c63836a402480503311b26ed409a07cf4ba2ca5400492c2333b79662cdb47389b4d3971d85d
+  data.tar.gz: c04387a545822a2af1c9a6fb1ff2d49dbc92a0eb09cd71e335a320754e7f4418fdc8c715475a951f27eab65d18248e0417b6367e8341a758487896e028fe3b5e

data/example/manage_certstore.rb

@@ -0,0 +1,13 @@
+require 'socket'
+require 'openssl'
+require 'certstore'
+
+cert_store = OpenSSL::X509::Store.new
+loader = Certstore::OpenSSL::Loader.new(cert_store, "Trust", enterprise: true)
+
+File.open(File.join(__dir__, "..", "./test/data/ca_cert.pem")) do |file|
+  x509_obj = OpenSSL::X509::Certificate.new(file.read)
+  thumbprint = OpenSSL::Digest::SHA1.new(x509_obj.to_der).to_s
+  loader.add_certificate(file)
+  loader.delete_certificate(thumbprint)
+end

data/ext/certstore/certstore.h

@@ -40,6 +40,7 @@ struct CertstoreLoader {
   HCERTSTORE hStore;
 };
 
+TCHAR* handle_error_code(VALUE self, DWORD errCode);
 char* wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen);
 void Init_certstore_loader(VALUE rb_mCertstore);
 

data/ext/certstore/certstore_util.c

@@ -21,3 +21,25 @@ wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen)
 
     return ptr;
 }
+
+TCHAR*
+handle_error_code(VALUE self, DWORD errCode)
+{
+  DWORD ret;
+  static TCHAR buffer[1024];
+
+  ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+                      NULL,
+                      errCode,
+                      MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                      buffer,
+                      sizeof(buffer)/sizeof(buffer[0]),
+                      NULL);
+
+  if (ret) {
+    rb_ivar_set(self, rb_intern("@error_code"), INT2NUM(errCode));
+    rb_ivar_set(self, rb_intern("@error_message"), rb_utf8_str_new_cstr(buffer));
+  }
+
+  return buffer;
+}

data/ext/certstore/loader.c

@@ -10,6 +10,7 @@
 /* limitations under the License. */
 
 #include <certstore.h>
+#include <tchar.h>
 
 static void certstore_loader_free(void *certstore);
 
@@ -48,6 +49,10 @@ rb_win_certstore_loader_initialize(VALUE self, VALUE store_name, VALUE use_enter
   VALUE vStoreName;
   struct CertstoreLoader *loader;
   DWORD len;
+  DWORD errCode;
+  TCHAR buffer[1024];
+  TCHAR errBuffer[1132];
+  DWORD ret;
 
   Check_Type(store_name, T_STRING);
 
@@ -63,6 +68,32 @@ rb_win_certstore_loader_initialize(VALUE self, VALUE store_name, VALUE use_enter
     loader->hStore = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, winStoreName);
   } else {
     loader->hStore = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, winStoreName);
+  }
+  errCode = GetLastError();
+  switch (errCode) {
+  case ERROR_SUCCESS:
+    break;
+  case ERROR_ACCESS_DENIED: {
+    ALLOCV_END(vStoreName);
+    ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+                        NULL,
+                        errCode,
+                        MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                        buffer,
+                        sizeof(buffer)/sizeof(buffer[0]),
+                        NULL);
+    if (ret) {
+      _snprintf_s(errBuffer, 1024, _TRUNCATE,
+                  "cannot access specified logical store. Perhaps you should do as an administrator. ErrorCode: %d, Message: %s",
+                  errCode,
+                  buffer);
+      rb_raise(rb_eCertLoaderError, errBuffer);
+    }
+  }
+  default: {
+    handle_error_code(self, errCode);
+  }
+
   }
   ALLOCV_END(vStoreName);
 
@@ -101,8 +132,9 @@ certificate_context_to_string(PCCERT_CONTEXT pContext)
   certificate = malloc(sizeof(CHAR) * (strlen(utf8str) + strlen(certHeader) + strlen(certFooter)));
   sprintf(certificate, "%s%s%s", certHeader, utf8str, certFooter);
 
-  if (ERROR_SUCCESS != GetLastError() && CRYPT_E_NOT_FOUND != GetLastError()) {
-    sprintf(errBuf, "ErrorCode(%d)", GetLastError());
+  errCode = GetLastError();
+  if (ERROR_SUCCESS != errCode && CRYPT_E_NOT_FOUND != errCode) {
+    _snprintf_s(errBuf, 256, _TRUNCATE, "ErrorCode(%d)", errCode);
 
     goto error;
   }
@@ -216,7 +248,7 @@ error:
 
   CertFreeCertificateContext(pContext);
 
-  sprintf(errBuf, "Cannot find certificates with thumbprint(%S)", winThumbprint);
+  _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot find certificates with thumbprint(%S)", winThumbprint);
   rb_raise(rb_eCertLoaderError, errBuf);
 }
 
@@ -240,9 +272,10 @@ rb_win_certstore_loader_add_certificate(VALUE self, VALUE rb_der_cert_bin_str)
 
     switch (errCode){
     case CRYPT_E_EXISTS:
+      handle_error_code(self, errCode);
       return Qfalse;
     default: {
-      sprintf(errBuf, "Cannot add certificates. ErrorCode: %d", GetLastError());
+      _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot add certificates. ErrorCode: %d", errCode);
       goto error;
 
       }
@@ -306,7 +339,7 @@ error:
 
   CertFreeCertificateContext(pContext);
 
-  sprintf(errBuf, "Cannot find certificates with thumbprint(%S)", winThumbprint);
+  _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot find certificates with thumbprint(%S)", winThumbprint);
   rb_raise(rb_eCertLoaderError, errBuf);
 }
 
@@ -350,7 +383,7 @@ rb_win_certstore_loader_export_pfx(VALUE self, VALUE rb_thumbprint, VALUE rb_pas
               &blob,
               pContext);
   if (!pContext) {
-    sprintf(errBuf, "Cannot find certificates with thumbprint(%S)", winThumbprint);
+    _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot find certificates with thumbprint(%S)", winThumbprint);
 
     goto error;
   }
@@ -360,14 +393,14 @@ rb_win_certstore_loader_export_pfx(VALUE self, VALUE rb_thumbprint, VALUE rb_pas
 
   pfxPacket.pbData = NULL;
   if (!PFXExportCertStoreEx(hMemoryStore, &pfxPacket, winPassword, NULL, EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY | REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY)) {
-    sprintf(errBuf, "Cannot export pfx certificate with thumbprint(%S)", winThumbprint);
+    _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot export pfx certificate with thumbprint(%S)", winThumbprint);
 
     goto error;
   }
 
   pfxPacket.pbData = (LPBYTE)CryptMemAlloc(pfxPacket.cbData);
   if (!PFXExportCertStoreEx(hMemoryStore, &pfxPacket, winPassword, NULL, EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY | REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY)) {
-    sprintf(errBuf, "Cannot export pfx certificate with thumbprint(%S)", winThumbprint);
+    _snprintf_s(errBuf, 256, _TRUNCATE, "Cannot export pfx certificate with thumbprint(%S)", winThumbprint);
 
     CryptMemFree(pfxPacket.pbData);
 
@@ -409,4 +442,7 @@ Init_certstore_loader(VALUE rb_mCertstore)
   rb_define_method(rb_cCertLoader, "delete_cert", rb_win_certstore_loader_delete_certificate, 1);
   rb_define_method(rb_cCertLoader, "add_cert", rb_win_certstore_loader_add_certificate, 1);
   rb_define_method(rb_cCertLoader, "export_pfx", rb_win_certstore_loader_export_pfx, 2);
+
+  rb_ivar_set(rb_cCertLoader, rb_intern("@error_code"), INT2NUM(0));
+  rb_ivar_set(rb_cCertLoader, rb_intern("@error_message"), rb_utf8_str_new_cstr(""));
 }

data/lib/certstore/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Certstore
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certstore_c
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,7 @@ files:
 - bin/console
 - bin/setup
 - certstore_c.gemspec
+- example/manage_certstore.rb
 - example/open_tls_socket.rb
 - ext/certstore/certstore.c
 - ext/certstore/certstore.h