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

🐛 Fix unexpected exception on uploading invalid svg file.

Browse source
This commit is contained in:
Andrey Antukh 2021-02-09 18:41:14 +01:00 • committed by Andrés Moya
parent 946d40e6cd
commit 2b33300d79
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backend/src/app/svgparse.clj
View file

@ -121,11 +121,16 @@
(defn parse (defn parse
[data] [data]
(try
(with-open [istream (IOUtils/toInputStream data "UTF-8")] (with-open [istream (IOUtils/toInputStream data "UTF-8")]
(xml/parse istream))) (xml/parse istream))
(catch org.xml.sax.SAXParseException _e
(ex/raise :type :validation
:code :invalid-svg-file))))
(defn process-request (defn process-request
[{:keys [svgc] :as cfg} body] [{:keys [svgc] :as cfg} body]
(let [data (slurp body) (let [data (slurp body)
data (svgc data)] data (svgc data)]
(parse data))) (parse data)))

3
frontend/src/app/main/data/workspace/persistence.cljs
View file

@ -421,6 +421,9 @@
(if (ex/ex-info? error) (if (ex/ex-info? error)
(on-error* (ex-data error)) (on-error* (ex-data error))
(cond (cond
(= (:code error) :invalid-svg-file)
(rx/of (dm/error (tr "errors.media-type-not-allowed")))
(= (:code error) :media-type-not-allowed) (= (:code error) :media-type-not-allowed)
(rx/of (dm/error (tr "errors.media-type-not-allowed"))) (rx/of (dm/error (tr "errors.media-type-not-allowed")))