Changes after review 7

- Add filename to request instead of exception.
- Move the code adding filename to req into its own private function.

Author: expez

ring-core/src/ring/middleware/multipart_params.clj

@@ -139,10 +139,14 @@
 
 (defn default-invalid-filename-handler
   ([request]
-   (-> request ::invalid-filename-exception .getMessage response/bad-request))
+   (-> request ::invalid-filename response/bad-request))
   ([request respond raise]
    (respond (default-invalid-filename-handler request))))
 
+(defn- add-invalid-filename-to-req
+  [request invalid-filename-exception]
+  (assoc request ::invalid-filename (.getName invalid-filename-exception) ))
+
 (defn wrap-multipart-params
   "Middleware to parse multipart parameters from a request. Adds the following
   keys to the request map:
@@ -177,7 +181,7 @@
   :invalid-filename-handler
   - A handler that gets called when the file being uploaded has an invalid name.
     When this handler receives the request it can expect one additional key,
-    ::invalid-filename-exception, which contains an InvalidFileNameException."
+    ::invalid-filename, which contains the name of the invalid file."
   ([handler]
    (wrap-multipart-params handler {}))
   ([handler options]
@@ -188,14 +192,16 @@
                             (multipart-params-request request options)
                             (catch InvalidFileNameException ex ex))]
             (if (instance? InvalidFileNameException req-or-ex)
-              (invalid-filename-handler
-               (assoc request ::invalid-filename-exception req-or-ex))
+              (-> request
+                  (add-invalid-filename-to-req req-or-ex)
+                  invalid-filename-handler)
               (handler req-or-ex))))
        ([request respond raise]
         (let [req-or-ex (try
                           (multipart-params-request request options)
                           (catch InvalidFileNameException ex ex))]
           (if (instance? InvalidFileNameException req-or-ex)
-            (invalid-filename-handler
-             (assoc request ::invalid-filename-exception req-or-ex) respond raise)
+            (-> request
+                (add-invalid-filename-to-req req-or-ex)
+                (invalid-filename-handler respond raise))
             (handler req-or-ex respond raise))))))))

ring-core/test/ring/middleware/test/multipart_params.clj

@@ -191,10 +191,10 @@
         invalid-filename-exception
         (try
           (org.apache.commons.fileupload.util.Streams/checkFileName invalid-filename)
-          (catch Exception e e))
+          (catch Exception e (println (.getName e)) e))
         err-response (default-invalid-filename-handler
-                      {::multipart-params/invalid-filename-exception
-                       invalid-filename-exception})]
+                      {::multipart-params/invalid-filename
+                       (.getName invalid-filename-exception)})]
     (testing "Synchronous error response"
       (let [handler (wrap-multipart-params identity)]
         (is (= err-response (handler request)))))