Skip to content
This repository was archived by the owner on Jul 24, 2018. It is now read-only.

Workaround for "DH Keypair could not be generated" #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@
:integration :integration
:all (constantly true)}
:aliases {"all" ["with-profile" "dev,1.2:dev,1.3:dev:1.5,dev"]}
:checksum-deps true)
:checksum-deps true
:aot [clj-http.lite.NoDHSocketFactory]
)
35 changes: 35 additions & 0 deletions src/clj_http/lite/NoDHSocketFactory.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
(ns clj-http.lite.NoDHSocketFactory
(:import (javax.net.ssl SSLSocket SSLSocketFactory)
(java.net Socket))
(:gen-class
:name clj-http.lite.NoDHSocketFactory
:extends javax.net.ssl.SSLSocketFactory
:init init
:state state
:constructors {[javax.net.ssl.SSLSocketFactory] []}))

(defn strip-dh-suites
"Remove cipher suites containing 'DH'"
[suites]
(into-array String (filter #(not (or (re-find #"_DHE_" %)
(re-find #"_DH_" %)
(re-find #"_ECDH_" %)
(re-find #"_ECDHE_" %))) suites)))

(defn -init
[^SSLSocketFactory f]
(let [state {:factory f
:enabled-ciphers (strip-dh-suites (.getSupportedCipherSuites f))}]

[[] (atom state)]))

(defn -createSocket [this & args]
(doto
(apply (partial (memfn createSocket) (:factory @(.state this))) args)
(.setEnabledCipherSuites (:enabled-ciphers @(.state this)))))

(defn -getDefaultCipherSuites [this]
(strip-dh-suites (.getDefaultCipherSuites (:factory @(.state this)))))

(defn -getSupportedCipherSuites [this]
(strip-dh-suites (.getSupportedCipherSuites (:factory @(.state this)))))
17 changes: 15 additions & 2 deletions src/clj_http/lite/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"Core HTTP request/response implementation."
(:require [clojure.java.io :as io])
(:import (java.io ByteArrayOutputStream InputStream IOException)
(java.net URI URL HttpURLConnection)))
(java.net URI URL HttpURLConnection)
(javax.net.ssl HttpsURLConnection)
(clj-http.lite NoDHSocketFactory)))

(defn parse-headers
"Takes a URLConnection and returns a map of names to values.
Expand Down Expand Up @@ -39,6 +41,17 @@
(.flush baos)
(.toByteArray baos)))))

(defn- get-connection [^URL url]
"Wrap .openConnection to "
(let [conn (.openConnection url)]
(if (instance? HttpsURLConnection conn)
(doto conn
(.setSSLSocketFactory
(NoDHSocketFactory.
(.getSSLSocketFactory conn))))
conn)))


(defn request
"Executes the HTTP request corresponding to the given Ring request map and
returns the Ring response map corresponding to the resulting HTTP response.
Expand All @@ -52,7 +65,7 @@
(when server-port (str ":" server-port))
uri
(when query-string (str "?" query-string)))
conn (.openConnection ^URL (URL. http-url))]
conn (get-connection ^URL (URL. http-url))]
(when (and content-type character-encoding)
(.setRequestProperty conn "Content-Type" (str content-type
"; charset="
Expand Down