EWC-352 self signed cert fixes: (#369)

* correct cert reading from file in routes * correct options for connector's calls with selfi signed cert
eclipse-iofog · Nov 19, 2018 · 47f427b · 47f427b
1 parent 96b45b0
commit 47f427b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/services/connector-service.js b/src/services/connector-service.js
@@ -125,11 +125,6 @@ async function _makeRequest(connector, options, data) {
       });
     });
 
-    if (connector.cert && connector.isSelfSignedCert === true) {
-      const ca = fs.readFileSync(connector.cert);
-      options.ca = new Buffer(ca);
-    }
-
     httpreq.on('error', function (err) {
       console.log(err);
       if (err instanceof Error)
@@ -165,6 +160,10 @@ async function openPortsOnConnector(connector, isPublicAccess, transaction) {
       'Content-Length': Buffer.byteLength(data)
     }
   };
+  if (connector.cert && connector.isSelfSignedCert === true) {
+    const ca = fs.readFileSync(connector.cert);
+    options.ca = new Buffer(ca);
+  }
 
   const ports = await _makeRequest(connector, options, data);
   return ports

diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js
@@ -398,7 +398,7 @@ async function _createRouteOverConnector(sourceMicroservice, destMicroservice, u
   const sourceNetwMsConfig = {
     'mode': 'private',
     'host': connector.domain,
-    'cert': connector.cert,
+    'cert': AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")),
     'port': ports.port1,
     'passcode': ports.passcode1,
     'connectioncount': 1,
@@ -420,7 +420,7 @@ async function _createRouteOverConnector(sourceMicroservice, destMicroservice, u
   const destNetwMsConfig = {
     'mode': 'private',
     'host': connector.domain,
-    'cert': connector.cert,
+    'cert': AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")),
     'port': ports.port2,
     'passcode': ports.passcode2,
     'connectioncount': 1,