Merge branch 'pr/391'

Author: dakrone

README.org

@@ -987,6 +987,24 @@ would:
              (conn-mgr/make-socks-proxied-conn-manager "localhost" 8081)})
 #+END_SRC
 
+If your SOCKS connection requires a keystore / trust-store, you can specify that too:
+
+#+BEGIN_SRC clojure
+(ns foo.bar
+  (:require [clj-http.client :as client]
+            [clj-http.conn-mgr :as conn-mgr]))
+
+(client/get "https://google.com"
+            {:connection-manager
+             (conn-mgr/make-socks-proxied-conn-manager "localhost" 8081
+               {:keystore "/path/to/keystore.ks"
+                :keystore-type "jks" ; default: jks
+                :keystore-pass "secretpass"
+                :trust-store "/path/to/trust-store.ks"
+                :trust-store-type "jks" ; default jks
+                :trust-store-pass "trustpass"})})
+#+END_SRC
+
 You can also store the proxied connection manager and reuse it later.
 
 ** Custom Middleware

src/clj_http/conn_mgr.clj

@@ -50,12 +50,13 @@
 (defn ^SSLConnectionSocketFactory SSLGenericSocketFactory
   "Given a function that returns a new socket, create an
   SSLConnectionSocketFactory that will use that socket."
-  [socket-factory]
-  (proxy [SSLConnectionSocketFactory] [(SSLContexts/createDefault)]
-    (connectSocket [timeout socket host remoteAddress localAddress context]
-      (let [^SSLConnectionSocketFactory this this] ;; avoid reflection
-        (proxy-super connectSocket timeout (socket-factory) host remoteAddress
-                     localAddress context)))))
+  ([socket-factory] (SSLGenericSocketFactory socket-factory (SSLContexts/createDefault)))
+  ([socket-factory ^SSLContext ssl-context]
+   (proxy [SSLConnectionSocketFactory] [ssl-context]
+     (connectSocket [timeout socket host remoteAddress localAddress context]
+       (let [^SSLConnectionSocketFactory this this] ;; avoid reflection
+         (proxy-super connectSocket timeout (socket-factory) host remoteAddress
+                      localAddress context))))))
 
 (defn ^PlainConnectionSocketFactory PlainGenericSocketFactory
   "Given a Function that returns a new socket, create a
@@ -70,41 +71,6 @@
   [^String hostname ^Integer port]
   (Socket. (Proxy. Proxy$Type/SOCKS (InetSocketAddress. hostname port))))
 
-(defn make-socks-proxied-conn-manager
-  "Given an optional hostname and a port, create a connection manager that's
-  proxied using a SOCKS proxy."
-  [^String hostname ^Integer port]
-  (let [socket-factory #(socks-proxied-socket hostname port)
-        reg (-> (RegistryBuilder/create)
-                (.register "http" (PlainGenericSocketFactory socket-factory))
-                (.register "https" (SSLGenericSocketFactory socket-factory))
-                (.build))]
-    (PoolingHttpClientConnectionManager. reg)))
-
-(def insecure-scheme-registry
-  (-> (RegistryBuilder/create)
-      (.register "http" PlainConnectionSocketFactory/INSTANCE)
-      (.register "https" insecure-socket-factory)
-      (.build)))
-
-(def insecure-strategy-registry
-  (-> (RegistryBuilder/create)
-      (.register "http" NoopIOSessionStrategy/INSTANCE)
-      (.register "https" insecure-strategy)
-      (.build)))
-
-(def regular-scheme-registry
-  (-> (RegistryBuilder/create)
-      (.register "http" (PlainConnectionSocketFactory/getSocketFactory))
-      (.register "https" secure-ssl-socket-factory)
-      (.build)))
-
-(def regular-strategy-registry
-  (-> (RegistryBuilder/create)
-      (.register "http" NoopIOSessionStrategy/INSTANCE)
-      (.register "https" secure-strategy)
-      (.build)))
-
 (defn ^KeyStore get-keystore*
   [keystore-file keystore-type ^String keystore-pass]
   (when keystore-file
@@ -139,6 +105,44 @@
                  NoopHostnameVerifier/INSTANCE
                  (DefaultHostnameVerifier.))}))
 
+(defn make-socks-proxied-conn-manager
+  "Given an optional hostname and a port, create a connection manager that's
+  proxied using a SOCKS proxy."
+  ([^String hostname ^Integer port] (make-socks-proxied-conn-manager hostname port {}))
+  ([^String hostname ^Integer port {:keys [keystore keystore-type keystore-pass trust-store trust-store-type trust-store-pass] :as opts}]
+   (let [socket-factory #(socks-proxied-socket hostname port)
+         ssl-context (when (some (complement nil?) [keystore keystore-type keystore-pass trust-store trust-store-type trust-store-pass])
+                           (-> opts get-keystore-context-verifier :context))
+         reg (-> (RegistryBuilder/create)
+                 (.register "http" (PlainGenericSocketFactory socket-factory))
+                 (.register "https" (SSLGenericSocketFactory socket-factory ssl-context))
+                 (.build))]
+     (PoolingHttpClientConnectionManager. reg))))
+
+(def insecure-scheme-registry
+  (-> (RegistryBuilder/create)
+      (.register "http" PlainConnectionSocketFactory/INSTANCE)
+      (.register "https" insecure-socket-factory)
+      (.build)))
+
+(def insecure-strategy-registry
+  (-> (RegistryBuilder/create)
+      (.register "http" NoopIOSessionStrategy/INSTANCE)
+      (.register "https" insecure-strategy)
+      (.build)))
+
+(def regular-scheme-registry
+  (-> (RegistryBuilder/create)
+      (.register "http" (PlainConnectionSocketFactory/getSocketFactory))
+      (.register "https" secure-ssl-socket-factory)
+      (.build)))
+
+(def regular-strategy-registry
+  (-> (RegistryBuilder/create)
+      (.register "http" NoopIOSessionStrategy/INSTANCE)
+      (.register "https" secure-strategy)
+      (.build)))
+
 (defn ^Registry get-keystore-scheme-registry
   [req]
   (let [{:keys [context verifier]} (get-keystore-context-verifier req)