Read boot-env using io/resource and io/reader

Previously used io/file with io/resource, which is not safe when the resource is not a file
weavejester · Apr 17, 2018 · 60c58c5 · 60c58c5
1 parent a20fac7
commit 60c58c5
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/environ/src/environ/core.clj b/environ/src/environ/core.clj
@@ -30,12 +30,21 @@
        (map (fn [[k v]] [(keywordize k) v]))
        (into {})))
 
+(defn- read-env-reader [r]
+  (when-let [reader (io/reader r)]      
+    (into {} 
+          (for [[k v] (edn/read-string (slurp r))
+                [(santitize-key k) (sanitize-val k v)]))))
+
 (defn- read-env-file [f]
   (if-let [env-file (io/file f)]
     (if (.exists env-file)
-      (into {} (for [[k v] (edn/read-string (slurp env-file))]
-                 [(sanitize-key k) (sanitize-val k v)])))))
+      (read-env-reader env-file))))
 
+(defn- read-env-resource [r]
+   (if-let [resource (io/resource r)]
+     (read-env-reader resource)))
+
 (defn- warn-on-overwrite [ms]
   (doseq [[k kvs] (group-by key (apply concat ms))
           :let  [vs (map val kvs)]
@@ -51,6 +60,6 @@
   env
   (merge-env
    (read-env-file ".lein-env")
-   (read-env-file (io/resource ".boot-env"))
+   (read-env-resource ".boot-env")
    (read-system-env)
    (read-system-props)))