nfets 0.0.134 → 0.0.136

package/addons/find-certificate-in-store.h

@@ -0,0 +1,81 @@
+#pragma once
+
+#include <node_api.h>
+
+#include <windows.h>
+#include <wincrypt.h>
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+inline std::vector<BYTE> ReadCertificateDer(napi_env env, napi_value value)
+{
+  if (value == nullptr)
+    return {};
+
+  napi_valuetype type;
+  if (napi_typeof(env, value, &type) != napi_ok)
+    return {};
+
+  if (type == napi_undefined || type == napi_null)
+    return {};
+
+  bool is_buffer = false;
+  if (napi_is_buffer(env, value, &is_buffer) != napi_ok || !is_buffer)
+    throw std::runtime_error("Certificate DER must be a Buffer");
+
+  void *data = nullptr;
+  size_t length = 0;
+  if (napi_get_buffer_info(env, value, &data, &length) != napi_ok ||
+      data == nullptr || length == 0)
+    return {};
+
+  const auto *bytes = static_cast<const BYTE *>(data);
+  return std::vector<BYTE>(bytes, bytes + length);
+}
+
+inline PCCERT_CONTEXT FindCertificateInStore(
+    HCERTSTORE store,
+    const std::wstring &subject,
+    const std::vector<BYTE> &der)
+{
+  if (!der.empty())
+  {
+    PCCERT_CONTEXT needle = CertCreateCertificateContext(
+        X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+        der.data(),
+        static_cast<DWORD>(der.size()));
+
+    if (!needle)
+      throw std::runtime_error("Failed to parse certificate DER");
+
+    PCCERT_CONTEXT found = CertFindCertificateInStore(
+        store,
+        X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+        0,
+        CERT_FIND_EXISTING,
+        needle,
+        NULL);
+
+    CertFreeCertificateContext(needle);
+
+    if (!found)
+      throw std::runtime_error("Certificate not found in store");
+
+    return found;
+  }
+
+  PCCERT_CONTEXT found = CertFindCertificateInStore(
+      store,
+      X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+      0,
+      CERT_FIND_SUBJECT_STR_W,
+      (LPVOID)subject.c_str(),
+      NULL);
+
+  if (!found)
+    throw std::runtime_error("Certificate not found in store");
+
+  return found;
+}

package/addons/wincrypt_certificate_store.cpp

@@ -1,5 +1,7 @@
 #include <node_api.h>
 
+#include "find-certificate-in-store.h"
+
 #include <windows.h>
 #include <wincrypt.h>
 #include <ncrypt.h>
@@ -24,14 +26,14 @@ std::wstring utf8_to_wstring(const std::string &str)
 
 napi_value SignDataWithCertificate(napi_env env, napi_callback_info info)
 {
-  size_t argc = 3;
-  napi_value args[3];
+  size_t argc = 4;
+  napi_value args[4] = {};
   napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
 
   if (argc < 3)
   {
     napi_value error_msg;
-    napi_create_string_utf8(env, "Expected: subject (string), data (Buffer), algorithm (string)", NAPI_AUTO_LENGTH, &error_msg);
+    napi_create_string_utf8(env, "Expected: subject (string), data (Buffer), algorithm (string), certificateDer (Buffer, optional)", NAPI_AUTO_LENGTH, &error_msg);
     napi_value error;
     napi_create_type_error(env, nullptr, error_msg, &error);
     napi_throw(env, error);
@@ -46,7 +48,7 @@ napi_value SignDataWithCertificate(napi_env env, napi_callback_info info)
   if (arg0_type != napi_string || arg1_type != napi_object || arg2_type != napi_string)
   {
     napi_value error_msg;
-    napi_create_string_utf8(env, "Expected: subject (string), data (Buffer), algorithm (string)", NAPI_AUTO_LENGTH, &error_msg);
+    napi_create_string_utf8(env, "Expected: subject (string), data (Buffer), algorithm (string), certificateDer (Buffer, optional)", NAPI_AUTO_LENGTH, &error_msg);
     napi_value error;
     napi_create_type_error(env, nullptr, error_msg, &error);
     napi_throw(env, error);
@@ -102,18 +104,10 @@ napi_value SignDataWithCertificate(napi_env env, napi_callback_info info)
       throw std::runtime_error("Failed to open certificate store");
     }
 
-    pCertContext = CertFindCertificateInStore(
-        hStore,
-        X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-        0,
-        CERT_FIND_SUBJECT_STR_W,
-        (LPVOID)subject.c_str(),
-        NULL);
+    const std::vector<BYTE> certificateDer =
+        argc >= 4 ? ReadCertificateDer(env, args[3]) : std::vector<BYTE>();
 
-    if (!pCertContext)
-    {
-      throw std::runtime_error("Certificate not found in store");
-    }
+    pCertContext = FindCertificateInStore(hStore, subject, certificateDer);
 
     ALG_ID hashAlg = 0;
     if (algorithm_str == "sha1")

package/addons/winhttp_ssl_client.cpp

@@ -1,5 +1,7 @@
 #include <node_api.h>
 
+#include "find-certificate-in-store.h"
+
 #include <windows.h>
 #include <winhttp.h>
 #include <wincrypt.h>
@@ -85,6 +87,7 @@ napi_value MakeRequest(napi_env env, napi_callback_info info)
   std::wstring headers;
   std::string body;
   int timeout = 30000;
+  napi_value certificate_der_val = nullptr;
 
   napi_value headers_key;
   napi_create_string_utf8(env, "headers", NAPI_AUTO_LENGTH, &headers_key);
@@ -137,6 +140,10 @@ napi_value MakeRequest(napi_env env, napi_callback_info info)
     }
   }
 
+  napi_value certificate_der_key;
+  napi_create_string_utf8(env, "certificateDer", NAPI_AUTO_LENGTH, &certificate_der_key);
+  napi_get_property(env, optionsObj, certificate_der_key, &certificate_der_val);
+
   HCERTSTORE hStore = NULL;
   PCCERT_CONTEXT pCertContext = NULL;
   HINTERNET hSession = NULL;
@@ -152,18 +159,10 @@ napi_value MakeRequest(napi_env env, napi_callback_info info)
       throw std::runtime_error("Failed to open certificate store");
     }
 
-    pCertContext = CertFindCertificateInStore(
-        hStore,
-        X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-        0,
-        CERT_FIND_SUBJECT_STR_W,
-        (LPVOID)subject.c_str(),
-        NULL);
+    const std::vector<BYTE> certificateDer =
+        ReadCertificateDer(env, certificate_der_val);
 
-    if (!pCertContext)
-    {
-      throw std::runtime_error("Certificate not found in store");
-    }
+    pCertContext = FindCertificateInStore(hStore, subject, certificateDer);
 
     URL_COMPONENTS urlComp;
     ZeroMemory(&urlComp, sizeof(urlComp));