Merge pull request #21 from nicosabena/master

Fix thumbprint calculation

package.json

@@ -2,7 +2,7 @@
   "name": "saml-extension",
   "displayName": "SAML Extension",
   "description": "SAML Extension",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "publisher": "mcastany",
   "engines": {
     "vscode": "^1.70.0"
@@ -138,7 +138,6 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "thumbprint": "0.0.1",
     "xml-crypto": "^1.5.3",
     "xml-encryption": "^0.10.0",
     "xmldom": "^0.6.0",

src/src/elements/BaseElement.ts

@@ -1,3 +1,5 @@
+import { calculateThumbprint } from "../utils";
+
 const vscode        = require('vscode');
 const xmlCrypto     = require('xml-crypto');
 const xpath         = require('xpath');
@@ -192,9 +194,10 @@ export default class BaseElement{
     for(const certificate of certificates) {
       const certificateText = xpath.select("text()", certificate);
       if (certificateText && certificateText.length === 1) {
+        const pem = utils.certToPEM(certificateText[0].toString().trim());
         results.push({
-          label: `${index} - ${BaseElement.getCertificateLabel(certificate)}`,
-          text: utils.certToPEM(certificateText[0].toString().trim())
+          label: `${index} - ${BaseElement.getCertificateLabel(certificate)} - ${calculateThumbprint(pem)}`,
+          text: pem
         });
         index++;
       }

src/src/utils.ts

@@ -1,4 +1,4 @@
-const thumbprint    = require('thumbprint');
+const crypto        = require('crypto');
 const xmldom        = require('xmldom');
 const DOMParser     = xmldom.DOMParser;
 const whitespace    = /^\s+$/;
@@ -22,8 +22,11 @@ export function formatCert(cert) {
 }
 
 export function calculateThumbprint(pem) {
-  var cert = removeHeaders(pem);
-  return thumbprint.calculate(cert).toUpperCase();
+  const cert = removeHeaders(pem);
+  const shasum = crypto.createHash('sha1');
+  const der = Buffer.from(cert, 'base64').toString('binary')
+  shasum.update(der, 'binary');
+  return shasum.digest('hex');
 }
 
 export function removeEmptyNodes(node) {