Merge branch 'pr/213'

Author: dakrone

README.org

@@ -462,6 +462,9 @@ used:
                                    :trust-store-pass "trustpass"})
 #+END_SRC
 
+The =:keystore/:trust-store= values may be either paths to keystore
+files or =KeyStore= instances.
+
 ** Cookie stores
 
 clj-http can simplify the maintenance of cookies across requests if it is

src/clj_http/client.clj

@@ -833,9 +833,9 @@
   :insecure? - Boolean flag to specify allowing insecure HTTPS connections
     default: false
 
-  :keystore - keystore file to be used for connection manager
+  :keystore - keystore file path or KeyStore instance to be used for connection manager
   :keystore-pass - keystore password
-  :trust-store - trust store file to be used for connection manager
+  :trust-store - trust store file path or KeyStore instance to be used for connection manager
   :trust-store-pass - trust store password
 
   Note that :insecure? and :keystore/:trust-store options are mutually exclusive

src/clj_http/conn_mgr.clj

@@ -91,16 +91,21 @@
     (.register (Scheme. "http" 80 (PlainSocketFactory/getSocketFactory)))
     (.register (Scheme. "https" 443 (SSLSocketFactory/getSocketFactory)))))
 
-(defn ^KeyStore get-keystore [keystore-file keystore-type ^String keystore-pass]
+(defn ^KeyStore get-keystore* [keystore-file keystore-type ^String keystore-pass]
   (when keystore-file
     (let [keystore (KeyStore/getInstance (or keystore-type
                                              (KeyStore/getDefaultType)))]
       (with-open [is (io/input-stream keystore-file)]
         (.load keystore is (when keystore-pass (.toCharArray keystore-pass)))
         keystore))))
 
+(defn ^KeyStore get-keystore [keystore & args]
+  (if (instance? KeyStore keystore)
+    keystore
+    (apply get-keystore* keystore args)))
+
 (defn ^SchemeRegistry get-keystore-scheme-registry
-  [{:keys [keystore keystore-type keystore-pass
+  [{:keys [keystore keystore-type keystore-pass keystore-instance
            trust-store trust-store-type trust-store-pass]
     :as req}]
   (let [ks (get-keystore keystore keystore-type keystore-pass)

test/clj_http/test/conn_mgr.clj

@@ -26,6 +26,12 @@
     (is (instance? KeyStore ks))
     (is (> (.size ks) 0))))
 
+(deftest use-existing-keystore
+  (let [ks (conn-mgr/get-keystore "test-resources/keystore" nil "keykey")
+        ks (conn-mgr/get-keystore ks nil nil)]
+    (is (instance? KeyStore ks))
+    (is (> (.size ks) 0))))
+
 (deftest load-keystore-with-nil-pass
   (let [ks (conn-mgr/get-keystore "test-resources/keystore" nil nil)]
     (is (instance? KeyStore ks))))