Poll Order for READY status

Author: danielsz

src/certificaat/acme4j/order.clj

@@ -1,11 +1,12 @@
 (ns certificaat.acme4j.order
   (:require [certificaat.domain :refer [Certificaat]]
-            [certificaat.utils :refer [load-url]]
+            [certificaat.utils :refer [load-url exit]]
+            [clojure.core.async :as a :refer [<! <!! >!! chan thread go-loop]]
             [clojure.tools.logging :as log]
             [clojure.java.io :as io])
   (:import [org.shredzone.acme4j Order]
            [org.shredzone.acme4j Status]
-           [org.shredzone.acme4j.exception AcmeProtocolException]
+           [org.shredzone.acme4j.exception AcmeException AcmeRetryAfterException AcmeServerException AcmeProtocolException]
            [java.net URL]))
 
 
@@ -36,3 +37,20 @@
     (= Status/INVALID (.getStatus this)))
   (marshal [this path]
     (spit path (.getLocation this))))
+
+(defn ready-to-finalize? [order]
+  (let [c (chan)]
+    (a/thread (loop [y 1
+                     ms nil]
+                (<!! (a/timeout (or ms 15000)))
+                (log/debug "Retrieving order status, attempt" y ms)
+                (cond
+                  (d/ready? order) (do (log/debug "Order is ready")
+                                       true)
+                  (d/invalid? order) (exit 1 "Order is invalid")
+                  (> y 10) (exit 1 "Too many attempts ")
+                  :else (recur (inc y) (try
+                                         (.update order)
+                                         (catch AcmeRetryAfterException e
+                                           (log/error (.getMessage e))
+                                           (.getRetryAfter e)))))))))

src/certificaat/kung_fu.clj

@@ -122,7 +122,7 @@
         csrb (certificate/prepare domain-keypair domains (:organisation options))
         csr (.getEncoded csrb)]
     (certificate/persist-certificate-request csrb (str config-dir domain "/cert.csr")) 
-    (.execute order csr)))
+    (when (<!! (order/ready-to-finalize? order)) (.execute order csr))))
 
 (defn certificate-location [{{{path :path enabled :enabled} :copy-to-path} :plugins config-dir :config-dir domain :domain :as options}]
   (if enabled path (str config-dir domain "/")))

test/certificaat/kung_fu_test.clj

@@ -205,7 +205,7 @@
         csrb (certificate/prepare domain-keypair domains (:organisation options))
         csr (.getEncoded csrb)]
     (certificate/persist-certificate-request csrb (str (:config-dir options) (:domain options) "/cert.csr")) 
-    (.execute order csr)
+    (when (<!! (order/ready-to-finalize? order)) (.execute order csr))
     (.update order)
     (is (= true (valid? order)))))