Fixes issue when determining sender from CA-signed certificate

Signed-off-by: hfuss <[email protected]>

Author: onelapahead

src/lib/cert.ts

@@ -34,22 +34,20 @@ export const init = async () => {
   log.debug("Reading cert file");
   cert = (await fs.readFile(path.join(utils.constants.DATA_DIRECTORY, utils.constants.CERT_FILE))).toString();
 
-  log.debug("Loaded cert");
-  log.debug(cert);
-
-  log.debug("Deriving peer ID from cert");
-  const certData = utils.getCertData(cert);
-  peerID = utils.getPeerID(certData.organization, certData.organizationUnit);
-
   let caCertPath = path.join(utils.constants.DATA_DIRECTORY, utils.constants.CA_FILE);
   if (await utils.fileExists(caCertPath)) {
     log.debug("Reading CA file");
     certBundle = (await fs.readFile(caCertPath)).toString() + cert;
     log.debug("Loaded CA + cert");
-    log.debug(certBundle);
   } else {
     certBundle = cert;
+    log.debug("Loaded cert");
   }
+  log.debug("\n" + certBundle);
+
+  log.debug("Deriving peer ID from cert");
+  const certData = utils.getCertData(cert);
+  peerID = utils.getPeerID(certData.organization, certData.organizationUnit);
 
   await loadPeerCAs();
 };

src/lib/utils.ts

@@ -22,6 +22,7 @@ import { X509 } from 'jsrsasign';
 import { ICertData, IFile } from './interfaces';
 import { Logger } from './logger';
 import RequestError from './request-error';
+import { TLSSocket } from "tls";
 
 export const constants = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
@@ -149,4 +150,9 @@ export const getCertData = (cert: string): ICertData => {
     certData.organizationUnit = ou[1];
   }
   return certData;
-};
+};
+
+export const extractPeerSenderFromRequest = (req: Request): string => {
+  const cert = ((req.socket) as TLSSocket).getPeerCertificate();
+  return getPeerID(cert.subject.O, cert.subject.OU);
+};

src/routers/p2p.ts

@@ -31,8 +31,7 @@ router.head('/ping', (_req, res) => {
 
 router.post('/messages', async (req: Request, res, next) => {
   try {
-    const cert = req.client.getPeerCertificate();
-    const sender = utils.getPeerID(cert.issuer.O, cert.issuer.OU);
+    const sender = utils.extractPeerSenderFromRequest(req);
     const message = await utils.extractMessageFromMultipartForm(req);
     eventEmitter.emit('event', {
       id: uuidV4(),
@@ -48,8 +47,7 @@ router.post('/messages', async (req: Request, res, next) => {
 
 router.put('/blobs/*', async (req: Request, res, next) => {
   try {
-    const cert = req.client.getPeerCertificate();
-    const sender = utils.getPeerID(cert.issuer.O, cert.issuer.OU);
+    const sender = utils.extractPeerSenderFromRequest(req);
     const file = await utils.extractFileFromMultipartForm(req);
     const blobPath = path.join(utils.constants.RECEIVED_BLOBS_SUBDIRECTORY, sender, req.params[0]);
     const metadata = await blobsHandler.storeBlob(file, blobPath);