From 81457035c7e905e846c44a2ae0a351027c4b0610 Mon Sep 17 00:00:00 2001 From: Emel ALKIM Date: Mon, 3 Jun 2024 12:40:32 -0700 Subject: [PATCH] replace md5 with object-hash --- package-lock.json | 36 +++++++++--------------------------- package.json | 2 +- plugins/CouchDB.js | 4 ++-- 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 69b629b..856df32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,8 +23,8 @@ "fs-extra": "^8.1.0", "http": "0.0.0", "keycloak-backend": "^3.0.0", - "md5": "^2.2.1", "nano": "^8.1.0", + "object-hash": "^3.0.0", "p-queue": "^6.2.1", "split2": "^3.1.1", "to-array-buffer": "^3.2.0", @@ -549,14 +549,6 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - "node_modules/charenc": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", - "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", - "engines": { - "node": "*" - } - }, "node_modules/check-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", @@ -784,14 +776,6 @@ "node": ">=4.8" } }, - "node_modules/crypt": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", - "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=", - "engines": { - "node": "*" - } - }, "node_modules/dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -2641,16 +2625,6 @@ "node": ">=10" } }, - "node_modules/md5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", - "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", - "dependencies": { - "charenc": "~0.0.1", - "crypt": "~0.0.1", - "is-buffer": "~1.1.1" - } - }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -3088,6 +3062,14 @@ "node": "*" } }, + "node_modules/object-hash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "engines": { + "node": ">= 6" + } + }, "node_modules/object-inspect": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", diff --git a/package.json b/package.json index 9b5bdb0..b6b0be3 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "fs-extra": "^8.1.0", "http": "0.0.0", "keycloak-backend": "^3.0.0", - "md5": "^2.2.1", "nano": "^8.1.0", + "object-hash": "^3.0.0", "p-queue": "^6.2.1", "split2": "^3.1.1", "to-array-buffer": "^3.2.0", diff --git a/plugins/CouchDB.js b/plugins/CouchDB.js index 62392d2..af8f347 100644 --- a/plugins/CouchDB.js +++ b/plugins/CouchDB.js @@ -8,7 +8,7 @@ const dcmjs = require('dcmjs'); const Axios = require('axios'); const http = require('http'); const fs = require('fs'); -const md5 = require('md5'); +const hash = require('object-hash'); const config = require('../config/index'); const viewsjs = require('../config/views'); @@ -812,7 +812,7 @@ async function couchdb(fastify, options) { if (dicomDB === undefined) dicomDB = fastify.couch.db.use(config.db); // TODO: Check if this needs to be Buffer or not. const body = Buffer.from(arrayBuffer); - const incomingMd5 = md5(body); + const incomingMd5 = hash(body); const dicomData = dcmjs.data.DicomMessage.readFile(arrayBuffer, {}); const couchDoc = { _id: dicomData.dict['00080018'].Value[0],