Add default search for .secrets.edn file in the home directory

README.md

@@ -10,9 +10,11 @@ Any one secrets file contains an encrypted version of a single
 [EDN](https://github.com/edn-format/edn) map, with arbitrary levels of
 labeled nesting.
 
-By default, the secrets file lives at .secrets.edn in the working directory,
-but this path can be changed explicitly via `with-path` (or via the `:path`
-flag at the command line).
+The path used for the secrets file, in priority order, is one of:
+
+- the one explicitly specified via `with-path` (or `:path` at the command line),
+- the `.secrets.edn` file in the working directory, or
+- the `.secrets.edn` file in the home directory.
 
 
 ## Contents 

src/io/sixtant/secrets.clj

@@ -9,9 +9,12 @@
   [EDN](https://github.com/edn-format/edn) map, with arbitrary levels of
   labeled nesting.
 
-  By default, the secrets file lives at .secrets.edn in the working directory,
-  but this path can be changed explicitly via `with-path` (or via the `:path`
-  flag at the command line)."
+  The path used for the secrets file, in priority order, is one of:
+
+  - the one explicitly specified via `with-path` (or `:path` at the command
+    line),
+  - the `.secrets.edn` file in the working directory, or
+  - the `.secrets.edn` file in the home directory."
   (:require [buddy.core.codecs :as codecs]
             [buddy.core.nonce :as nonce]
             [buddy.core.crypto :as crypto]
@@ -27,18 +30,27 @@
 (set! *warn-on-reflection* true)
 
 
-(def ^:dynamic *path*
-  "Location of saved secrets on disk."
-  ".secrets.edn")
+(defn default-secrets-path []
+  (if (.exists (io/file ".secrets.edn"))
+    ".secrets.edn"
+    (let [home (System/getProperty "user.home")]
+      (.getCanonicalPath (io/file home ".secrets.edn")))))
 
 
+(def ^:dynamic *path* "Explicitly bound path." nil)
 (defmacro with-path
   "Set the file path used for saved secrets."
   [path & body]
   `(binding [*path* ~path]
      ~@body))
 
 
+(defn secrets-path
+  "Location of saved secrets on disk."
+  []
+  (or *path* (default-secrets-path)))
+
+
 ;;; Primitives for key stretching & encryption
 
 
@@ -185,22 +197,24 @@
 (defn read-secrets
   "Prefer `with-secrets`."
   []
-  (if (.isFile (io/file *path*))
-    (let [p (or *password* (read-password "Password: "))]
-      {:data (decrypt-from-disk {:password p :path *path*})
-       :password p})
-    {:data {}
-     :password nil}))
+  (let [path (secrets-path)]
+    (if (.isFile (io/file path))
+      (let [p (or *password* (read-password (str "Password for " path ": ")))]
+        {:data (decrypt-from-disk {:password p :path path})
+         :password p})
+      {:data {}
+       :password nil})))
 
 
 (defn write-secrets
   "Prefer `swap-secrets!`."
   [{:keys [data password]}]
   (print "Encrypting data for writing...")
   (flush)
-  (let [enc (encrypt-to-disk data {:password password :path *path*})]
+  (let [path (secrets-path)
+        enc (encrypt-to-disk data {:password password :path path})]
     (println " Done.")
-    (println "Wrote" (count (.getBytes (prn-str enc))) "bytes.")
+    (println "Wrote" (count (.getBytes (prn-str enc))) "bytes to" (str path "."))
     enc))
 
 
@@ -259,7 +273,7 @@
   (defn rand-n [coll n] (repeatedly n #(nth coll (rng-int (count coll)))))
   (def passphrase
     (let [words (string/split-lines (slurp "/usr/share/dict/words"))]
-      (string/join " " (rand-n words 6))))
+      (string/join " " (rand-n words 5))))
 
   ;; Encrypt some data with the passphrase to send to somebody else
   (encrypt (prn-str {:foo :bar}) passphrase)

src/io/sixtant/secrets/main.clj

@@ -32,7 +32,7 @@
   "Given all of the leftover `args`, parse out a :path parameter if any,
   otherwise use the default path for secrets."
   [args]
-  (or (get (apply hash-map args) ":path") s/*path*))
+  (or (get (apply hash-map args) ":path") (s/secrets-path)))
 
 
 (defcommand inspect
@@ -111,7 +111,7 @@
   (let [args (rest args)
         [path args] (if (= (first args) :path)
                       [(second args) (rest (rest args))]
-                      [s/*path* args])
+                      [(s/secrets-path) args])
         [vname->path & args] args]
     (assert (string? vname->path) "first parameter is an EDN string")
     (let [vname->path (read-string vname->path)]
@@ -138,7 +138,7 @@
                       (flush)
                       (= (string/lower-case (read-line)) "y")))]
     (if change?
-      (let [p (s/read-password "Set password: ")
+      (let [p (s/read-password (str "Set password for " (s/secrets-path) ": "))
             p' (s/read-password "Confirm password: ")]
         (if (= p p')
           (assoc x :password p)

test/io/sixtant/secrets_test.clj

@@ -57,7 +57,7 @@
     (let [temp (temp "encrypted" ".edn")
           data {:bitso {:prod {:key "foo" :secret "bar"}}}]
 
-      ; Write data to a temporary secrets fil
+      ; Write data to a temporary secrets file
       (with-path temp
         (write-secrets {:data data :password "pass"}))