Catch Throwable in op handlers to prevent client hangs

Author: JarrodCTaylor

server/src/clojure_cli/repl/inspect.clj

@@ -184,7 +184,7 @@
         target-ns (session-binding session-id #'clojure.core/*ns*)
         var-symbol (with-meta (symbol var-name) {:browse-path (mapv :key (rest stack))})
         result (try {:defd (str (intern target-ns var-symbol (:value (peek stack))))}
-                    (catch Exception e {:note (ex-message e)}))]
+                    (catch Throwable e {:note (ex-message e)}))]
     (respond result)))
 
 (def op-fns
@@ -200,7 +200,7 @@
   (fn [{:keys [op transport] :as msg}]
     (if-let [f (op-fns op)]
       (let [view (try (f msg)
-                      (catch Exception e (assoc (render) :note (ex-message e))))]
+                      (catch Throwable e (assoc (render) :note (ex-message e))))]
         (transport/send transport (response-for msg :view (pr-str view) :status ["done"])))
       (handler msg))))
 

server/src/clojure_cli/repl/server.clj

@@ -46,7 +46,7 @@
               (map (fn [v] [(str (:ns v) "/" (:name v))
                             (update v :arglists (fn [arglists] (mapv #(str "[" % "]") arglists)))]))
               (:vars (json/read-str (slurp f) :key-fn keyword))))
-      (catch Exception _ nil))))
+      (catch Throwable _ nil))))
 
 (defn clojuredocs-examples [fq]
   (when-let [examples (seq (:examples (get @clojuredocs-index fq)))]
@@ -57,7 +57,7 @@
   (str/join "\n" (remove str/blank? [fq-name (str/join " " arglists) doc])))
 
 (defn resolved [sym]
-  (try (ns-resolve *ns* sym) (catch Exception _ nil)))
+  (try (ns-resolve *ns* sym) (catch Throwable _ nil)))
 
 (defn clojuredocs-doc [sym]
   (let [fq (if-let [{:keys [ns name]} (some-> (resolved sym) meta)]
@@ -72,7 +72,7 @@
 
 (defn java-doc [sym]
   (try (with-out-str ((requiring-resolve 'clojure.java.doc.api/javadoc-fn) (str sym) nil))
-       (catch Exception _ nil)))
+       (catch Throwable _ nil)))
 
 (defn doc-for [token ns-name]
   (binding [*ns* (the-ns (symbol ns-name))]
@@ -97,7 +97,7 @@
   (binding [*ns* (the-ns (symbol ns-name))]
     (try (apply require (edn/read-string libspecs))
          nil
-         (catch Exception e (ex-message e)))))
+         (catch Throwable e (ex-message e)))))
 
 (defn auto-require-middleware [handler]
   (fn [{:keys [op libspecs ns transport] :as msg}]