Adds support for custom error handling.

src/clj_pgp/core.clj

@@ -4,7 +4,8 @@
     [byte-streams :as bytes]
     [clojure.java.io :as io]
     [clojure.string :as str]
-    [clj-pgp.tags :as tags])
+    [clj-pgp.tags :as tags]
+    [clj-pgp.error :as error])
   (:import
     (java.io
       ByteArrayOutputStream
@@ -254,13 +255,25 @@
 
 ;; ## PGP Object Decoding
 
+(defn read-next-object
+  "A thin wrapper on reading the next object from a PGPObjectFactory."
+  [^PGPObjectFactory factory]
+  (.nextObject factory))
+
 (defn ^:no-doc read-objects
   "Lazily decodes a sequence of PGP objects from an input stream."
   [^InputStream input]
   (let [factory (PGPObjectFactory. input (BcKeyFingerprintCalculator.))]
-    (->>
-      (repeatedly #(.nextObject factory))
-      (take-while some?))))
+    (->> (range)
+         (map (fn next-object [n]
+                (try
+                  (read-next-object factory)
+                  (catch Exception e
+                    (error/*handler* ::read-object-error
+                                     (.getMessage e)
+                                     (assoc (ex-data e) ::stream input ::nth n)
+                                     e)))))
+         (take-while some?))))
 
 
 (defn decode

src/clj_pgp/error.clj

@@ -0,0 +1,11 @@
+(ns clj-pgp.error)
+
+(defn default-error-handler
+  [error-type message data cause]
+  (throw (ex-info message (assoc data :pgp/error error-type) cause)))
+
+(def ^:dynamic *handler*
+  "Dynamic error handler"
+  default-error-handler)
+
+(derive :clj-pgp.core/read-object-error ::decrypt-error)

test/clj_pgp/test/encryption.clj

@@ -15,7 +15,8 @@
      [gen-ec-keyspec
       gen-rsa-keyspec
       spec->keypair
-      memospec->keypair]])
+      memospec->keypair]]
+    [clj-pgp.error :as error])
   (:import
     java.io.ByteArrayOutputStream
     java.security.SecureRandom))
@@ -97,7 +98,16 @@
           "Decrypting with a keypair-retrieval function returns the data.")
       (is (thrown? IllegalArgumentException
             (pgp-msg/decrypt ciphertext "passphrase"))
-          "Decrypting without a matching key throws an exception"))))
+          "Decrypting without a matching key throws an exception")
+      (testing "should allow overriding error behavior with custom behavior"
+        (let [error-occured? (atom false)
+              error-handler (fn [type message data cause]
+                              (reset! error-occured? true)
+                              nil)]
+          (with-redefs [pgp/read-next-object (fn [_] (throw (Exception. "Simulating PGP nextObject error")))]
+            (binding [error/*handler* error-handler]
+              (pgp-msg/decrypt ciphertext (constantly keypair))
+              (is @error-occured? "A PGP error was simulated but not passed to the error handler."))))))))
 
 
 (deftest encryption-scenarios