clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-24 14:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: graph aes key cache

Browse Source
This commit is contained in:
Tienson Qin
2026-01-30 20:15:06 +08:00
parent e7bb0963d4
commit 7f72a6d02c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/frontend/worker/db_worker.cljs
View File

@@ -626,7 +626,7 @@
(def-thread-api :thread-api/db-sync-import-kvs-rows
[repo rows reset? graph-id remote-tx]
(p/let [_ (when reset? (close-db! repo))
aes-key (sync-crypt/<fetch-graph-aes-key-for-download repo graph-id)
aes-key (sync-crypt/<fetch-graph-aes-key-for-download graph-id)
_ (when (nil? aes-key)
(db-sync/fail-fast :db-sync/missing-field {:repo repo :field :aes-key}))
db (ensure-db-sync-import-db! repo reset?)

10
src/main/frontend/worker/sync/crypt.cljs
View File

@@ -13,7 +13,7 @@
[logseq.db-sync.malli-schema :as db-sync-schema]
[promesa.core :as p]))
(defonce ^:private *repo->aes-key (atom {}))
(defonce ^:private *graph->aes-key (atom {}))
(defonce ^:private e2ee-store (delay (idb-keyval/newStore "localforage" "keyvaluepairs" 2)))
(defonce ^:private e2ee-password-file "e2ee-password")
(defonce ^:private native-env?
@@ -250,7 +250,7 @@
[repo graph-id]
(if-not (graph-e2ee? repo)
(p/resolved nil)
(if-let [cached (get @*repo->aes-key repo)]
(if-let [cached (get @*graph->aes-key graph-id)]
(p/resolved cached)
(let [base (e2ee-base)
user-id (get-user-uuid)]
@@ -276,11 +276,11 @@
aes-key))
_ (when (and graph-id encrypted-aes-key (nil? local-encrypted))
(<set-item! (graph-encrypted-aes-key-idb-key graph-id) encrypted-aes-key))]
(swap! *repo->aes-key assoc repo aes-key)
(swap! *graph->aes-key assoc graph-id aes-key)
aes-key)))))
(defn <fetch-graph-aes-key-for-download
[repo graph-id]
[graph-id]
(let [base (e2ee-base)
aes-key-k (graph-encrypted-aes-key-idb-key graph-id)]
(when-not (and (string? base) (string? graph-id))
@@ -297,7 +297,7 @@
(fail-fast :db-sync/missing-field {:graph-id graph-id :field :encrypted-aes-key})
(<set-item! aes-key-k encrypted-aes-key))
(p/let [aes-key (crypt/<decrypt-aes-key private-key encrypted-aes-key)]
(swap! *repo->aes-key assoc repo aes-key)
(swap! *graph->aes-key assoc graph-id aes-key)
aes-key)))))
(defn <grant-graph-access!