Merge pull request #587 from tatut/master

Fix NPE crash in "slurp" middleware

Author: cichli

src/cider/nrepl/middleware/content_type.clj

@@ -108,7 +108,7 @@
     (with-open [bos (ByteArrayOutputStream.)]
       (merge response
              (when (ImageIO/write ^Image value "png" ^OutputStream bos)
-               (slurp-reply ["image/png" {}] (.toByteArray bos)))))
+               (slurp-reply "" ["image/png" {}] (.toByteArray bos)))))
 
     :else response))
 

src/cider/nrepl/middleware/slurp.clj

@@ -65,7 +65,8 @@
 
 (defn get-file-content-type [^Path p]
   (or (get known-content-types (split-last (.toString p) "."))
-      (Files/probeContentType p)))
+      (Files/probeContentType p)
+      "application/octet-stream"))
 
 ;; FIXME (arrdem 2018-04-11):
 ;;   Remove this if-class when we have jdk1.8 min
@@ -74,15 +75,23 @@
   (if-class java.util.Base64
     (.encodeToString (Base64/getEncoder) buff)))
 
-(defn slurp-reply [content-type buff]
+(defn slurp-reply [location content-type buff]
   (let [^String real-type (first content-type)
+        binary? (= "application/octet-stream" real-type)
         text? (.contains real-type "text")]
-    (if-not text?
+    (cond
+      binary?
       {:content-type content-type
-       :content-transfer-encoding "base64"
-       :body (base64-bytes buff)}
+       :body (str "#binary[location=" location ",size=" (count buff) "]")}
+
+      text?
+      {:content-type content-type
+       :body (String. buff "utf-8")}
+
+      :default
       {:content-type content-type
-       :body (String. buff "utf-8")})))
+       :content-transfer-encoding "base64"
+       :body (base64-bytes buff)})))
 
 (defn slurp-url-to-content+body
   "Attempts to parse and then to slurp a URL, producing a content-typed response."
@@ -91,10 +100,9 @@
                     (catch MalformedURLException e nil))]
     (if (= (.getProtocol url) "file") ;; expected common case
       (let [^Path p (Paths/get (.toURI url))
-            content-type (normalize-content-type
-                          (get-file-content-type p))
+            content-type (normalize-content-type (get-file-content-type p))
             buff (Files/readAllBytes p)]
-        (slurp-reply content-type buff))
+        (slurp-reply p content-type buff))
 
       ;; It's not a file, so just try to open it on up
       (let [conn (.openConnection url)
@@ -109,7 +117,7 @@
             (when (<= 0 b)
               (.write os b)
               (recur))))
-        (slurp-reply content-type (.toByteArray os))))))
+        (slurp-reply url content-type (.toByteArray os))))))
 
 ;; FIXME (arrdem 2018-04-11):
 ;;   Remove this if-class when we have jdk1.8 min

test/clj/cider/nrepl/middleware/slurp_test.clj

@@ -2,7 +2,8 @@
   (:require
    [cider.nrepl.middleware.slurp :refer [if-class slurp-url-to-content+body]]
    [clojure.java.io :as io]
-   [clojure.test :as t]))
+   [clojure.test :as t]
+   [clojure.string :as str]))
 
 ;; FIXME (arrdem 2018-04-11):
 ;;   Remove these if-classes when we have jdk1.8 min
@@ -22,3 +23,11 @@
                  (io/resource "sum-types-are-cool.jpg")))]
       (t/is (= ["image/jpeg" {}] (:content-type resp)))
       (t/is (= "base64" (:content-transfer-encoding resp))))))
+
+(if-class java.util.Base64
+  (t/deftest test-unrecognized-file
+    (let [resp (slurp-url-to-content+body
+                (.toString (io/resource "unknown.bin")))]
+      (t/is (= ["application/octet-stream" {}] (:content-type resp)))
+      (t/is (str/starts-with? (:body resp) "#binary[location="))
+      (t/is (str/ends-with? (:body resp) ",size=3]")))))

test/resources/unknown.bin

@@ -0,0 +1 @@
+foo