🐛 Fix many on handle some audit events.

backend/src/app/loggers/audit.clj

@@ -24,19 +24,33 @@
    [lambdaisland.uri :as u]))
 
 (defn clean-props
-  "Cleans the params from complex data, only accept strings, numbers and
+  [{:keys [profile-id] :as event}]
-  uuids and removing sensitive data such as :password and related
+  (letfn [(clean-common [props]
-  props."
+            (-> props
-  [params]
+                (dissoc :session-id)
-  (let [params (dissoc params :session-id :password :old-password :token)]
+                (dissoc :password)
-    (reduce-kv (fn [params k v]
+                (dissoc :old-password)
-                 (cond-> params
+                (dissoc :token)))
+
+          (clean-profile-id [props]
+            (cond-> props
+              (= profile-id (:profile-id props))
+              (dissoc :profile-id)))
+
+          (clean-complex-data [props]
+            (reduce-kv (fn [props k v]
+                         (cond-> props
                            (or (string? v)
                                (uuid? v)
+                               (boolean? v)
                                (number? v))
-                   (assoc k v)))
+                           (assoc k v)
+
+                           (keyword? v)
+                           (assoc k (name v))))
                        {}
-               params)))
+                       props))]
+    (update event :props #(-> % clean-common clean-profile-id clean-complex-data))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Collector
@@ -52,11 +66,16 @@
 (defmethod ig/pre-init-spec ::collector [_]
   (s/keys :req-un [::db/pool ::wrk/executor ::enabled]))
 
+(def event-xform
+  (comp
+   (filter :profile-id)
+   (map clean-props)))
+
 (defmethod ig/init-key ::collector
   [_ {:keys [enabled] :as cfg}]
   (when enabled
     (l/info :msg "intializing audit collector")
-    (let [input  (a/chan)
+    (let [input  (a/chan 1 event-xform)
           buffer (aa/batch input {:max-batch-size 100
                                   :max-batch-age (* 5 1000)
                                   :init []})]
@@ -65,7 +84,10 @@
           (l/debug :action "persist-events (batch)"
                    :reason (name type)
                    :count (count events))
-          (a/<! (persist-events cfg events))
+          (let [res (a/<! (persist-events cfg events))]
+            (when (ex/exception? res)
+              (l/error :hint "error on persiting events"
+                       :cause res)))
           (recur)))
 
       (fn [& [cmd & params]]
@@ -113,7 +135,6 @@
       (ex/raise :type :internal
                 :code :task-not-configured
                 :hint "archive task not configured, missing uri"))
-    (l/debug :msg "start archiver" :uri uri)
     (loop []
       (let [res (archive-events cfg)]
         (when (= res :continue)
@@ -204,7 +225,6 @@
 
 (defn- clean-archived
   [{:keys [pool max-age]}]
-  (prn "clean-archived" max-age)
   (let [interval (db/interval max-age)
         result   (db/exec-one! pool [sql:clean-archived interval])
         result   (:next.jdbc/update-count result)]

backend/src/app/rpc.clj

@@ -99,7 +99,6 @@
         (ex/raise :type :authentication
                   :code :authentication-required
                   :hint "authentication required for this endpoint"))
-
       (let [params  (us/conform spec params)
             result  (f cfg params)
             resultm (meta result)]
@@ -111,7 +110,7 @@
             (audit :submit {:type (::type cfg)
                             :name (::sv/name mdata)
                             :profile-id profile-id
-                            :props (audit/clean-props props)})))
+                            :props props})))
         result))))
 
 (defn- process-method

backend/src/app/rpc/mutations/demo.clj

@@ -11,6 +11,7 @@
    [app.common.uuid :as uuid]
    [app.config :as cfg]
    [app.db :as db]
+   [app.loggers.audit :as audit]
    [app.rpc.mutations.profile :as profile]
    [app.setup.initial-data :as sid]
    [app.util.services :as sv]
@@ -53,5 +54,6 @@
                     ::wrk/conn conn
                     :profile-id id})
 
-      {:email email
+      (with-meta {:email email
-       :password password})))
+                  :password password}
+        {::audit/profile-id id}))))

backend/src/app/rpc/mutations/profile.clj

@@ -277,10 +277,12 @@
                               :member-email (:email profile))
                 token  (tokens :generate claims)]
             (with-meta {:invitation-token token}
-              {:transform-response ((:create session) (:id profile))}))
+              {:transform-response ((:create session) (:id profile))
+               ::audit/profile-id (:id profile)}))
 
           (with-meta profile
-            {:transform-response ((:create session) (:id profile))}))))))
+            {:transform-response ((:create session) (:id profile))
+             ::audit/profile-id (:id profile)}))))))
 
 ;; --- Mutation: Logout
 
@@ -307,7 +309,9 @@
     (let [profile (-> (assoc cfg :conn conn)
                       (login-or-register params))]
       (with-meta profile
-        {:before-complete (annotate-profile-register metrics profile)}))))
+        {:before-complete (annotate-profile-register metrics profile)
+         ::audit/props (:props profile)
+         ::audit/profile-id (:id profile)}))))
 
 (defn login-or-register
   [{:keys [conn] :as cfg} {:keys [email backend] :as params}]
@@ -614,7 +618,7 @@
 
     ;; Schedule a complete deletion of profile
     (wrk/submit! {::wrk/task :delete-profile
-                  ::wrk/dalay cfg/deletion-delay
+                  ::wrk/delay cfg/deletion-delay
                   ::wrk/conn conn
                   :profile-id profile-id})
 

frontend/src/app/main/data/users.cljs

@@ -379,9 +379,11 @@
                   on-success identity}} (meta params)]
         (->> (rp/mutation :delete-profile {})
              (rx/tap on-success)
+             (rx/delay-at-least 300)
+             (rx/catch (constantly (rx/of 1)))
+             (rx/map logged-out)
              (rx/catch on-error))))))
 
-
 ;; --- EVENT: request-profile-recovery
 
 (s/def ::request-profile-recovery

frontend/src/app/main/ui/settings/delete_account.cljs

@@ -12,7 +12,7 @@
    [app.main.store :as st]
    [app.main.ui.icons :as i]
    [app.main.ui.messages :as msgs]
-   [app.util.i18n :as i18n :refer [tr t]]
+   [app.util.i18n :as i18n :refer [tr]]
    [app.util.router :as rt]
    [beicon.core :as rx]
    [cljs.spec.alpha :as s]
@@ -25,42 +25,36 @@
       (rx/of (dm/error msg)))
     (rx/throw error)))
 
-(defn on-success
-  [x]
-  (st/emit! (rt/nav :auth-login)))
-
 (mf/defc delete-account-modal
   {::mf/register modal/components
    ::mf/register-as :delete-account}
   [props]
-  (let [locale (mf/deref i18n/locale)
+  (let [on-close
-        on-close
         (mf/use-callback (st/emitf (modal/hide)))
 
         on-accept
         (mf/use-callback
          (st/emitf (modal/hide)
                    (du/request-account-deletion
-                    (with-meta {} {:on-error on-error
+                    (with-meta {} {:on-error on-error}))))]
-                                   :on-success on-success}))))]
 
     [:div.modal-overlay
      [:div.modal-container.change-email-modal
       [:div.modal-header
        [:div.modal-header-title
-        [:h2 (t locale "modals.delete-account.title")]]
+        [:h2 (tr "modals.delete-account.title")]]
        [:div.modal-close-button
         {:on-click on-close} i/close]]
 
       [:div.modal-content
        [:& msgs/inline-banner
         {:type :warning
-         :content (t locale "modals.delete-account.info")}]]
+         :content (tr "modals.delete-account.info")}]]
 
       [:div.modal-footer
        [:div.action-buttons
         [:button.btn-warning.btn-large {:on-click on-accept}
-         (t locale "modals.delete-account.confirm")]
+         (tr "modals.delete-account.confirm")]
         [:button.btn-secondary.btn-large {:on-click on-close}
-         (t locale "modals.delete-account.cancel")]]]]]))
+         (tr "modals.delete-account.cancel")]]]]]))