Merge pull request #19 from SURFnet/ioexception

Handle IOException

Author: mdemare

src/nl/jomco/apie/report.clj

@@ -477,6 +477,10 @@
            (into [:dl])))
     [:dl [:dt "Collection is empty!"]]))
 
+(defmethod issue-details "network-error"
+  [_ _]
+  nil)
+
 ;; this also works for non-json-schema issue types
 (defmethod issue-details :default
   [openapi {:keys [instance path schema-path] :as issue}]
@@ -527,6 +531,11 @@
    (list-summary (:ranges hints))
    ", got " [:code instance]])
 
+(defmethod issue-summary "network-error"
+  [_ {:keys [hints instance path]}]
+  [:span
+   (str "Network error: " (:message hints))])
+
 (defmethod issue-summary :default
   [_ {:keys [issue]}]
   [:span

src/nl/jomco/apie/spider.clj

@@ -10,7 +10,8 @@
             [clojure.string :as string]
             [babashka.json :as json]
             [babashka.http-client :as http-client])
-  (:import [java.net URI URL]))
+  (:import [java.net URI URL]
+           [java.io IOException]))
 
 (defn fixup-request
   "Convert spider request to format expected by validator"
@@ -82,9 +83,12 @@
       (assoc :uri (select-keys req [:host :port :path :scheme]))
       (dissoc :host :port :path :scheme)))
 
-(defn fixup-validator-request
-  [req]
-  (assoc req :uri (:path req)))
+(defn wrap-io-exception-handler [f]
+  (fn [request]
+    (try
+      (f request)
+      (catch IOException ex
+        {:status 0, :body (.getMessage ex), :headers {}}))))
 
 (defn wrap-client
   [f client]
@@ -195,6 +199,9 @@
 (defn mk-exec-request
   [{:keys [base-url headers basic-auth bearer-token]}]
   (cond-> http-client/request
+    :always
+    (wrap-io-exception-handler)
+
     :always
     (wrap-client (http-client/client (assoc http-client/default-client-opts
                                             :follow-redirects :never)))
@@ -226,13 +233,21 @@
          'assoc assoc
          'dissoc dissoc))
 
+(defn wrap-network-error [validate]
+   (fn [{:keys [response] :as interaction} path]
+     (if (= 0 (:status response))
+       [{:issue "network-error"
+         :hints {:message (:body response)}}]
+       (validate interaction path))))
+
 (defn spider-and-validate
   [openapi-spec
    {:keys [rules seeds] :as _profile}
    {:keys [max-requests-per-operation max-total-requests spider-timeout-millis] :as options}]
   (let [seeds (or (:seeds options) seeds)
         validate (-> (validator/validator-context openapi-spec {})
-                     (validator/interaction-validator))
+                     (validator/interaction-validator)
+                     (wrap-network-error))
         matcher  (paths-matcher (keys (get openapi-spec "paths")))
         op-path  (fn [request]
                    (when-let [template (:template (matcher (path request)))]