diff --git a/CHANGELOG.md b/CHANGELOG.md index c9bafe4..346048b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,4 +4,7 @@ ## Fixed +- Read the cookie session key from config (`:http/session-cookie-key`) instead of source. The old key is in git history, so set a new one on the server. +- Start the JVM with `-XX:-UseBASE64Intrinsics` as an interim mitigation for CVE-2026-114938 (Java4Shell), until the JDK is upgraded. + ## Changed diff --git a/ops/cloud_init.sh b/ops/cloud_init.sh index e10fc48..bc43adb 100644 --- a/ops/cloud_init.sh +++ b/ops/cloud_init.sh @@ -219,7 +219,9 @@ After=txor.service Restart=always RestartSec=1 WorkingDirectory=/home/compass/app/current -ExecStart=/usr/local/bin/clojure -J-Dclojure.main.report=stderr -J-Dclojure.server.repl='{:port 5555 :accept clojure.core.server/repl}' -A:prod -M -m co.gaiwan.compass run --env prod --config /home/compass/config.edn +# -XX:-UseBASE64Intrinsics: interim mitigation for CVE-2026-114938 (Java4Shell). +# Remove once the JDK is 17.0.21.1 or later. +ExecStart=/usr/local/bin/clojure -J-XX:-UseBASE64Intrinsics -J-Dclojure.main.report=stderr -J-Dclojure.server.repl='{:port 5555 :accept clojure.core.server/repl}' -A:prod -M -m co.gaiwan.compass run --env prod --config /home/compass/config.edn User=compass [Install] diff --git a/resources/compass/prod.edn b/resources/compass/prod.edn index 3cda810..14ed275 100644 --- a/resources/compass/prod.edn +++ b/resources/compass/prod.edn @@ -11,6 +11,7 @@ "regular-ticket" "1267502146643820564" "streaming" "1276449596171747339"} ;; confgure locally + ;; :http/session-cookie-key "<16 bytes>" ;; cookie session store key ;; :discord/client-secret "" ;; :discord/bot-token "" :uploads/dir "/home/compass/uploads" diff --git a/src/lambdaisland/compass/http.clj b/src/lambdaisland/compass/http.clj index 9c0e13c..80e6d40 100644 --- a/src/lambdaisland/compass/http.clj +++ b/src/lambdaisland/compass/http.clj @@ -25,7 +25,17 @@ [ring.middleware.session.cookie :as session-cookie]) (:import org.eclipse.jetty.server.Server)) -(def ring-default-config +(defn session-store-opts + "Options for Ring's cookie session store. The 16-byte key comes from config + (:http/session-cookie-key, set in the server's config.edn), never from source. + Without one, Ring picks a random key, so sessions do not survive a restart." + [] + (if-let [k (config/value :http/session-cookie-key)] + {:key (.getBytes ^String k "UTF-8")} + (do (log/warn :message "No :http/session-cookie-key configured; using a random session key") + {}))) + +(defn ring-default-config [] {:params {:urlencoded true :multipart true :nested true @@ -35,7 +45,7 @@ :cookie-attrs {:http-only true ;; 5 days :max-age (* 60 60 24 5)} - :store (session-cookie/cookie-store {:key "zsrpNuvjTqFcz6fg"})} + :store (session-cookie/cookie-store (session-store-opts))} :security {:anti-forgery true :frame-options :sameorigin :content-type-options :nosniff} @@ -109,7 +119,7 @@ (fn [r] (assoc-in (h r) [:headers "Max-Age"] "0"))) [middleware/wrap-log-request {}] - [ring-defaults/wrap-defaults ring-default-config] + [ring-defaults/wrap-defaults (ring-default-config)] middleware/wrap-identity middleware/wrap-welcome-page middleware/wrap-render