3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-20 06:47:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Add source ip to the audit-log.

Browse source
This commit is contained in:
Andrey Antukh 2021-06-09 16:59:04 +02:00 • committed by Alonso Torres
parent ff3caec36c
commit f95705d2d6
4 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
backend/src/app/loggers/audit.clj
View file

@ -101,12 +101,13 @@
(:name event)
(:type event)
(:profile-id event)
(some-> (:ip-addr event) db/inet)
(db/tjson (:props event))])]
(aa/with-thread executor
(db/with-atomic [conn pool]
(db/insert-multi! conn :audit-log
[:id :name :type :profile-id :props]
[:id :name :type :profile-id :ip-addr :props]
(sequence (map event->row) events))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -147,17 +148,22 @@
(defn archive-events
[{:keys [pool uri tokens] :as cfg}]
(letfn [(decode-row [{:keys [props] :as row}]
(letfn [(decode-row [{:keys [props ip-addr] :as row}]
(cond-> row
(db/pgobject? props)
(assoc :props (db/decode-transit-pgobject props))))
(assoc :props (db/decode-transit-pgobject props))
(row->event [{:keys [name type created-at profile-id props]}]
{:type type
:name name
:timestamp created-at
:profile-id profile-id
:props props})
(db/pgobject? ip-addr "inet")
(assoc :ip-addr (db/decode-inet ip-addr))))
(row->event [{:keys [name type created-at profile-id props ip-addr]}]
(cond-> {:type type
:name name
:timestamp created-at
:profile-id profile-id
:props props}
(some? ip-addr)
(update :context assoc :source-ip ip-addr)))
(send [events]
(let [token (tokens :generate {:iss "authentication"
@ -168,7 +174,7 @@
"origin" (cf/get :public-uri)
"cookie" (u/map->query-string {:auth-token token})}
params {:uri uri
:timeout 5000
:timeout 6000
:method :post
:headers headers
:body body}
@ -187,7 +193,6 @@
(db/with-atomic [conn pool]
(let [rows (db/exec! conn [sql:retrieve-batch-of-audit-log])
xform (comp (map decode-row)
(map row->event))
events (into [] xform rows)]