Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-14 19:19:09 -05:00
Code Issues Activity

feat(backend): improve cors middleware and config

Browse source
This commit is contained in:
Andrey Antukh 2019-07-01 19:40:35 +02:00
parent b5acb5db85
commit 2b45690858
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/src/uxbox/config.clj
View file

@ -35,6 +35,7 @@
[] []
{:http-server-port (lookup-env env :uxbox-http-server-port 6060) {:http-server-port (lookup-env env :uxbox-http-server-port 6060)
:http-server-debug (lookup-env env :uxbox-http-server-debug true) :http-server-debug (lookup-env env :uxbox-http-server-debug true)
:http-server-cors (lookup-env env :uxbox-http-server-cors "http://localhost:3449")
:database-username (lookup-env env :uxbox-database-username nil) :database-username (lookup-env env :uxbox-database-username nil)
:database-password (lookup-env env :uxbox-database-password nil) :database-password (lookup-env env :uxbox-database-password nil)
:database-name (lookup-env env :uxbox-database-name "uxbox") :database-name (lookup-env env :uxbox-database-name "uxbox")

10
backend/src/uxbox/http/middleware.clj
View file

@ -16,6 +16,7 @@
[ring.middleware.session :refer [wrap-session]] [ring.middleware.session :refer [wrap-session]]
[ring.middleware.session.cookie :refer [cookie-store]] [ring.middleware.session.cookie :refer [cookie-store]]
[ring.middleware.multipart-params :refer [wrap-multipart-params]] [ring.middleware.multipart-params :refer [wrap-multipart-params]]
[uxbox.config :as cfg]
[uxbox.http.etag :refer [wrap-etag]] [uxbox.http.etag :refer [wrap-etag]]
[uxbox.http.cors :refer [wrap-cors]] [uxbox.http.cors :refer [wrap-cors]]
[uxbox.http.errors :as errors] [uxbox.http.errors :as errors]
@ -112,7 +113,7 @@
:wrap #(wrap-session % options)})) :wrap #(wrap-session % options)}))
(def cors-conf (def cors-conf
{:origin #{"http://127.0.0.1:3449"} {:origin #{"http://localhost:3449"}
:max-age 3600 :max-age 3600
:allow-credentials true :allow-credentials true
:allow-methods #{:post :put :get :delete} :allow-methods #{:post :put :get :delete}
@ -120,7 +121,12 @@
(def ^:private cors-middleware (def ^:private cors-middleware
{:name ::cors-middleware {:name ::cors-middleware
:wrap #(wrap-cors % cors-conf)}) :wrap (fn [handler]
(let [cors (:http-server-cors cfg/config)]
(if (string? cors)
(->> (assoc cors-conf :origin #{cors})
(wrap-cors handler))
handler)))})
(def ^:private etag-middleware (def ^:private etag-middleware
{:name ::etag-middleware {:name ::etag-middleware