third try

danielsz · Jan 6, 2018 · 3d53c03 · 3d53c03
1 parent 3a30dc2
commit 3d53c03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/certificaat/acme4j/authorization.clj b/src/certificaat/acme4j/authorization.clj
@@ -6,7 +6,8 @@
             [certificaat.acme4j.session :as session])
   (:import [org.shredzone.acme4j Authorization]
            [org.shredzone.acme4j.challenge Http01Challenge Dns01Challenge]
-           org.shredzone.acme4j.Status))
+           org.shredzone.acme4j.Status
+           org.shredzone.acme4j.exception.AcmeProtocolException))
 
 (defn create [domain reg]
   (let [auth (.authorizeDomain reg domain)]
@@ -22,6 +23,8 @@
 (extend-type Authorization
   Certificaat
   (valid? [this]
-    (let [status (.getStatus this)]
+    (let [status (try
+                   (.getStatus this)
+                   (catch AcmeProtocolException e (log/warn (.getMessage e))))]
       (log/info "Authorization status:" status)
       (or (= Status/VALID status) (= Status/PENDING status))))) ; (.isBefore (.getExpires this) (Instant/now)))
diff --git a/src/certificaat/kung_fu.clj b/src/certificaat/kung_fu.clj
@@ -13,7 +13,6 @@
             [clojure.spec.alpha :as s])
   (:import java.net.URI
            org.shredzone.acme4j.exception.AcmeUnauthorizedException
-           org.shredzone.acme4j.exception.AcmeServerException
            org.shredzone.acme4j.Status))
 
 (defn setup [{:keys [config-dir domain key-type key-size keypair-filename] :as options}]
@@ -55,10 +54,8 @@
                             (let [registration (registration/restore session registration-uri)]
                               (d/valid? registration)))
       ::d/authorization-uri (if-let [authorization-uri (c/load-uri frozen-resource)]
-                              (try
-                                (let [authorization (authorization/restore session authorization-uri)]
-                                  (d/valid? authorization))
-                                (catch AcmeServerException e (log/warn (.getMessage e)))))
+                              (let [authorization (authorization/restore session authorization-uri)]
+                                (d/valid? authorization)))
       ::d/certificate-uri (if-let [certificate-uri (c/load-uri frozen-resource)]
                            (let [certificate (certificate/restore session certificate-uri)]
                              (d/valid? certificate))))))