@vrtmrz/livesync-commonlib 0.1.30 → 0.1.31

package/dist/services/base/SettingService.d.ts

@@ -110,6 +110,8 @@ export declare abstract class SettingService<T extends ServiceContext = ServiceC
     clearUsedPassphrase(): void;
     decryptConfigurationItem(encrypted: string, passphrase: string): Promise<string | false>;
     encryptConfigurationItem(src: string, settings: ObsidianLiveSyncSettings): Promise<string>;
+    private encryptPlainConfigurationItem;
+    private encryptConfigurationItemWith;
     /**
      * Decrypt the given settings.
      * @param settings The settings to decrypt.

package/dist/services/base/SettingService.js

@@ -13,6 +13,7 @@ import { ServiceBase } from "./ServiceBase.js";
 import { createInstanceLogFunction } from "../lib/logUtils.js";
 import { isCloudantURI } from "../../pouchdb/utils_couchdb.js";
 import { decryptString, encryptString } from "../../encryption/stringEncryption.js";
+import { encryptWithEphemeralSalt } from "octagonal-wheels/encryption/hkdf";
 import {
   activateP2PRemoteConfiguration,
   activateRemoteConfiguration,
@@ -207,7 +208,7 @@ class SettingService extends ServiceBase {
         settings.endpoint = "";
       }
       if (settings.encrypt && settings.passphrase != "") {
-        settings.encryptedPassphrase = await this.encryptConfigurationItem(settings.passphrase, settings);
+        settings.encryptedPassphrase = await this.encryptPlainConfigurationItem(settings.passphrase, settings);
         settings.passphrase = "";
       }
       await this.encryptRemoteConfigurationUris(settings);
@@ -405,8 +406,14 @@ class SettingService extends ServiceBase {
     return false;
   }
   async encryptConfigurationItem(src, settings) {
+    return this.encryptConfigurationItemWith(src, settings, encryptString);
+  }
+  async encryptPlainConfigurationItem(src, settings) {
+    return this.encryptConfigurationItemWith(src, settings, encryptWithEphemeralSalt);
+  }
+  async encryptConfigurationItemWith(src, settings, encrypt) {
     if (this.usedPassphrase != "") {
-      return await encryptString(src, this.usedPassphrase + SALT_OF_PASSPHRASE);
+      return await encrypt(src, this.usedPassphrase + SALT_OF_PASSPHRASE);
     }
     const passphrase = await this.getPassphrase(settings);
     if (passphrase === false) {
@@ -416,7 +423,7 @@ class SettingService extends ServiceBase {
       );
       return "";
     }
-    const dec = await encryptString(src, passphrase + SALT_OF_PASSPHRASE);
+    const dec = await encrypt(src, passphrase + SALT_OF_PASSPHRASE);
     if (dec) {
       this.usedPassphrase = passphrase;
       return dec;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vrtmrz/livesync-commonlib",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "Shared data, storage, and replication primitives for Self-hosted LiveSync clients.",
   "type": "module",
   "types": "./dist/index.d.ts",