Browse Source

enhance(rtc,e2ee): catch decrypt error

rcmerci 3 days ago
parent
commit
c9f116109b
2 changed files with 10 additions and 5 deletions
  1. 6 4
      src/main/frontend/common/crypt.cljs
  2. 4 1
      src/main/frontend/handler/db_based/rtc.cljs

+ 6 - 4
src/main/frontend/common/crypt.cljs

@@ -261,10 +261,12 @@
      (p/let [m map-p]
        (if-let [v (get m encrypt-attr)]
          (if (string? v)
-           (p/let [v' (<decrypt-text-if-encrypted aes-key (ldb/read-transit-str v))]
-             (if v'
-               (assoc m encrypt-attr v')
-               m))
+           (->
+            (p/let [v' (<decrypt-text-if-encrypted aes-key (ldb/read-transit-str v))]
+              (if v'
+                (assoc m encrypt-attr v')
+                m))
+            (p/catch (fn [e] (ex-info "decrypt map" {:m m :decrypt-attr encrypt-attr} e))))
            m)
          m)))
    (p/promise m) encrypt-attr-set))

+ 4 - 1
src/main/frontend/handler/db_based/rtc.cljs

@@ -49,7 +49,10 @@
     (->
      (when (not= result :timeout)
        (assert (some? download-info-s3-url) result)
-       (state/<invoke-db-worker :thread-api/rtc-download-graph-from-s3 graph-uuid graph-name download-info-s3-url))
+       (p/let [r (state/<invoke-db-worker :thread-api/rtc-download-graph-from-s3
+                                          graph-uuid graph-name download-info-s3-url)]
+         (when (instance? ExceptionInfo r)
+           (log/error :rtc-download-graph-from-s3 r))))
      (p/finally
        #(state/set-state! :rtc/downloading-graph-uuid nil)))))