From 6a7e90561aefa983b5ff95b269c07c84afc7a0b3 Mon Sep 17 00:00:00 2001 From: Zdravko Iliev <zdravko.iliev@vereign.com> Date: Fri, 18 Mar 2022 19:00:12 +0200 Subject: [PATCH] comment unused methods --- dist/lib/signatureUtils.d.ts | 1 - dist/lib/signatureUtils.js | 35 +++++++++++++++++++---------------- src/lib/index.ts | 5 ++--- src/lib/signatureUtils.ts | 36 ++++++++++++++++++------------------ 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/dist/lib/signatureUtils.d.ts b/dist/lib/signatureUtils.d.ts index 3f4a099..854b289 100644 --- a/dist/lib/signatureUtils.d.ts +++ b/dist/lib/signatureUtils.d.ts @@ -10,4 +10,3 @@ export declare const extractSignature: (pdf: any) => { }[]; }; export declare const getMessageFromSignature: (signature: any) => any; -export declare const authenticateSignature: (certs: any) => boolean; diff --git a/dist/lib/signatureUtils.js b/dist/lib/signatureUtils.js index c9168d3..6c89c09 100644 --- a/dist/lib/signatureUtils.js +++ b/dist/lib/signatureUtils.js @@ -23,12 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) { return result; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.authenticateSignature = exports.getMessageFromSignature = exports.extractSignature = void 0; +exports.getMessageFromSignature = exports.extractSignature = void 0; const forge = __importStar(require("@vereign/node-forge")); const errors_1 = require("./errors"); const generalUtils_1 = require("./generalUtils"); const timeUtils_1 = require("./timeUtils"); -const rootCAs = require("./rootCAs"); +// const rootCAs = require("./rootCAs"); const getSignatureMeta = (signedData) => { const str = Buffer.isBuffer(signedData) ? signedData.toString() : signedData; const formattedSignDate = (0, timeUtils_1.formatPdfTime)((0, generalUtils_1.getMetaRegexMatch)("M")(str)); @@ -39,18 +39,21 @@ const getSignatureMeta = (signedData) => { signDate: formattedSignDate, }; }; -const verifyCaBundle = (certs) => !!certs.find((cert, i) => certs[i + 1] && certs[i + 1].issued(cert)); -const getRootCAs = () => rootCAs; -const verifyRootCert = (chainRootInForgeFormat) => !!getRootCAs().find((rootCAInPem) => { - try { - const rootCAInForgeCert = forge.pki.certificateFromPem(rootCAInPem); - return (forge.pki.certificateToPem(chainRootInForgeFormat) === rootCAInPem || - rootCAInForgeCert.issued(chainRootInForgeFormat)); - } - catch (e) { - return false; - } -}); +// const verifyCaBundle = (certs) => +// !!certs.find((cert, i) => certs[i + 1] && certs[i + 1].issued(cert)); +// const getRootCAs = () => rootCAs; +// const verifyRootCert = (chainRootInForgeFormat) => +// !!getRootCAs().find((rootCAInPem) => { +// try { +// const rootCAInForgeCert = forge.pki.certificateFromPem(rootCAInPem); +// return ( +// forge.pki.certificateToPem(chainRootInForgeFormat) === rootCAInPem || +// rootCAInForgeCert.issued(chainRootInForgeFormat) +// ); +// } catch (e) { +// return false; +// } +// }); const extractSignature = (pdf) => { const pdfBuffer = (0, generalUtils_1.preparePDF)(pdf); const { byteRanges } = (0, generalUtils_1.getByteRange)(pdfBuffer); @@ -89,5 +92,5 @@ const getMessageFromSignature = (signature) => { } }; exports.getMessageFromSignature = getMessageFromSignature; -const authenticateSignature = (certs) => verifyCaBundle(certs) && verifyRootCert(certs[certs.length - 1]); -exports.authenticateSignature = authenticateSignature; +// export const authenticateSignature = (certs) => +// verifyCaBundle(certs) && verifyRootCert(certs[certs.length - 1]); diff --git a/src/lib/index.ts b/src/lib/index.ts index 031bbbd..3f27563 100644 --- a/src/lib/index.ts +++ b/src/lib/index.ts @@ -6,9 +6,8 @@ export const verifyPDF = (pdf: Buffer) => { const pdfBuffer = preparePDF(pdf); checkForSubFilter(pdfBuffer); try { - const { signatureStr, signedData, signatureMeta } = extractSignature( - pdfBuffer - ); + const { signatureStr, signedData, signatureMeta } = + extractSignature(pdfBuffer); const signatures: any = signedData.map((_signed, index) => { return verify(signatureStr[index], signatureMeta[index]); diff --git a/src/lib/signatureUtils.ts b/src/lib/signatureUtils.ts index 6ac2a15..c2dea55 100644 --- a/src/lib/signatureUtils.ts +++ b/src/lib/signatureUtils.ts @@ -3,7 +3,7 @@ import { AppError } from "./errors"; import { getByteRange, getMetaRegexMatch, preparePDF } from "./generalUtils"; import { formatPdfTime } from "./timeUtils"; -const rootCAs = require("./rootCAs"); +// const rootCAs = require("./rootCAs"); const getSignatureMeta = (signedData) => { const str = Buffer.isBuffer(signedData) ? signedData.toString() : signedData; @@ -18,23 +18,23 @@ const getSignatureMeta = (signedData) => { }; }; -const verifyCaBundle = (certs) => - !!certs.find((cert, i) => certs[i + 1] && certs[i + 1].issued(cert)); +// const verifyCaBundle = (certs) => +// !!certs.find((cert, i) => certs[i + 1] && certs[i + 1].issued(cert)); -const getRootCAs = () => rootCAs; +// const getRootCAs = () => rootCAs; -const verifyRootCert = (chainRootInForgeFormat) => - !!getRootCAs().find((rootCAInPem) => { - try { - const rootCAInForgeCert = forge.pki.certificateFromPem(rootCAInPem); - return ( - forge.pki.certificateToPem(chainRootInForgeFormat) === rootCAInPem || - rootCAInForgeCert.issued(chainRootInForgeFormat) - ); - } catch (e) { - return false; - } - }); +// const verifyRootCert = (chainRootInForgeFormat) => +// !!getRootCAs().find((rootCAInPem) => { +// try { +// const rootCAInForgeCert = forge.pki.certificateFromPem(rootCAInPem); +// return ( +// forge.pki.certificateToPem(chainRootInForgeFormat) === rootCAInPem || +// rootCAInForgeCert.issued(chainRootInForgeFormat) +// ); +// } catch (e) { +// return false; +// } +// }); export const extractSignature = (pdf) => { const pdfBuffer = preparePDF(pdf); @@ -79,5 +79,5 @@ export const getMessageFromSignature = (signature) => { } }; -export const authenticateSignature = (certs) => - verifyCaBundle(certs) && verifyRootCert(certs[certs.length - 1]); +// export const authenticateSignature = (certs) => +// verifyCaBundle(certs) && verifyRootCert(certs[certs.length - 1]); -- GitLab