feat(core): support md5 hash

apps/client-standalone/package.json

@@ -46,6 +46,7 @@
     "i18next-http-backend": "3.0.2",
     "jquery": "4.0.0",
     "jquery.fancytree": "2.38.5",
+    "js-md5": "0.8.3",
     "js-sha1": "0.7.0",
     "js-sha256": "0.11.1",
     "js-sha512": "0.9.0",

apps/client-standalone/src/lightweight/crypto_provider.ts

@@ -2,6 +2,7 @@ import type { CryptoProvider } from "@triliumnext/core";
 import { sha1 } from "js-sha1";
 import { sha256 } from "js-sha256";
 import { sha512 } from "js-sha512";
+import { md5 } from "js-md5";
 
 interface Cipher {
     update(data: Uint8Array): Uint8Array;
@@ -15,11 +16,18 @@ const CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
  */
 export default class BrowserCryptoProvider implements CryptoProvider {
 
-    createHash(algorithm: "sha1" | "sha512", content: string | Uint8Array): Uint8Array {
+    createHash(algorithm: "md5" | "sha1" | "sha512", content: string | Uint8Array): Uint8Array {
         const data = typeof content === "string" ? content :
                 new TextDecoder().decode(content);
 
-        const hexHash = algorithm === "sha1" ? sha1(data) : sha512(data);
+        let hexHash: string;
+        if (algorithm === "md5") {
+            hexHash = md5(data);
+        } else if (algorithm === "sha1") {
+            hexHash = sha1(data);
+        } else {
+            hexHash = sha512(data);
+        }
 
         // Convert hex string to Uint8Array
         const bytes = new Uint8Array(hexHash.length / 2);

apps/server/src/crypto_provider.ts

@@ -6,7 +6,7 @@ const randtoken = generator({ source: "crypto" });
 
 export default class NodejsCryptoProvider implements CryptoProvider {
 
-    createHash(algorithm: "sha1", content: string | Uint8Array): Uint8Array {
+    createHash(algorithm: "md5" | "sha1" | "sha512", content: string | Uint8Array): Uint8Array {
         return crypto.createHash(algorithm).update(content).digest();
     }
 

apps/server/src/services/utils.ts

@@ -25,10 +25,6 @@ export function randomString(length: number): string {
     return coreUtils.randomString(length);
 }
 
-export function md5(content: crypto.BinaryLike) {
-    return crypto.createHash("md5").update(content).digest("hex");
-}
-
 /** @deprecated */
 export function hashedBlobId(content: string | Buffer) {
     return coreUtils.hashedBlobId(content);
@@ -177,7 +173,6 @@ export default {
     isMac,
     isStringNote,
     isWindows,
-    md5,
     newEntityId,
     normalize,
     quoteRegex,

packages/trilium-core/src/services/encryption/crypto.ts

@@ -5,7 +5,7 @@ interface Cipher {
 
 export interface CryptoProvider {
 
-    createHash(algorithm: "sha1" | "sha512", content: string | Uint8Array): Uint8Array;
+    createHash(algorithm: "md5" | "sha1" | "sha512", content: string | Uint8Array): Uint8Array;
     randomBytes(size: number): Uint8Array;
     randomString(length: number): string;
     createCipheriv(algorithm: "aes-128-cbc", key: Uint8Array, iv: Uint8Array): Cipher;

packages/trilium-core/src/services/utils/index.ts

@@ -20,6 +20,11 @@ export function hash(text: string) {
     return encodeBase64(getCrypto().createHash("sha1", text.normalize()));
 }
 
+export function md5(content: string | Uint8Array) {
+    const bytes = getCrypto().createHash("md5", content);
+    return Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("");
+}
+
 export function isStringNote(type: string | undefined, mime: string) {
     return (type && STRING_NOTE_TYPES.has(type)) || mime.startsWith("text/") || STRING_MIME_TYPES.has(mime);
 }

pnpm-lock.yaml

@@ -507,6 +507,9 @@ importers:
       jquery.fancytree:
         specifier: 2.38.5
         version: 2.38.5(jquery@4.0.0)
+      js-md5:
+        specifier: 0.8.3
+        version: 0.8.3
       js-sha1:
         specifier: 0.7.0
         version: 0.7.0
@@ -11173,6 +11176,9 @@ packages:
     resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
     engines: {node: '>=0.10.0'}
 
+  js-md5@0.8.3:
+    resolution: {integrity: sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ==}
+
   js-sha1@0.7.0:
     resolution: {integrity: sha512-oQZ1Mo7440BfLSv9TX87VNEyU52pXPVG19F9PL3gTgNt0tVxlZ8F4O6yze3CLuLx28TxotxvlyepCNaaV0ZjMw==}
 
@@ -17650,6 +17656,8 @@ snapshots:
       '@ckeditor/ckeditor5-ui': 47.6.1
       '@ckeditor/ckeditor5-utils': 47.6.1
       ckeditor5: 47.6.1
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-inspector@5.0.0': {}
 
@@ -17660,6 +17668,8 @@ snapshots:
       '@ckeditor/ckeditor5-ui': 47.6.1
       '@ckeditor/ckeditor5-utils': 47.6.1
       ckeditor5: 47.6.1
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-line-height@47.6.1':
     dependencies:
@@ -29147,6 +29157,8 @@ snapshots:
 
   js-levenshtein@1.1.6: {}
 
+  js-md5@0.8.3: {}
+
   js-sha1@0.7.0: {}
 
   js-sha256@0.11.1: {}