3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-10 23:26:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Add expiration checking on storage functions.

Browse source
This commit is contained in:
Andrey Antukh 2021-01-31 11:50:21 +01:00 • committed by Alonso Torres
parent 5751ac6b4e
commit 233cd8c3d6
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
backend/src/app/storage.clj
View file

@ -66,6 +66,10 @@
(defrecord StorageObject [id size created-at expired-at backend])
(defn storage-object?
[v]
(instance? StorageObject v))
(def ^:private
sql:insert-storage-object
"insert into storage_object (id, size, backend, metadata)
@ -217,18 +221,22 @@
(defn get-object-data
[{:keys [pool conn] :as storage} object]
(us/assert ::storage storage)
(-> (assoc storage :conn (or conn pool))
(resolve-backend (:backend object))
(impl/get-object-data object)))
(when (or (nil? (:expired-at object))
(dt/is-after? (:expired-at object) (dt/now)))
(-> (assoc storage :conn (or conn pool))
(resolve-backend (:backend object))
(impl/get-object-data object))))
(defn get-object-url
([storage object]
(get-object-url storage object nil))
([{:keys [conn pool] :as storage} object options]
(us/assert ::storage storage)
(-> (assoc storage :conn (or conn pool))
(resolve-backend (:backend object))
(impl/get-object-url object options))))
(when (or (nil? (:expired-at object))
(dt/is-after? (:expired-at object) (dt/now)))
(-> (assoc storage :conn (or conn pool))
(resolve-backend (:backend object))
(impl/get-object-url object options)))))
(defn get-object-path
"Get the Path to the object. Only works with `:fs` type of
@ -239,8 +247,10 @@
(ex/raise :type :internal
:code :operation-not-allowed
:hint "get-object-path only works with fs type backends"))
(-> (impl/get-object-url backend object nil)
(file-url->path))))
(when (or (nil? (:expired-at object))
(dt/is-after? (:expired-at object) (dt/now)))
(-> (impl/get-object-url backend object nil)
(file-url->path)))))
(defn del-object
[{:keys [conn pool] :as storage} id-or-obj]