Merge pull request #165 from peggy-gov-bc-ca/httpFileNull

Process issue #164
bcgov · Jan 9, 2020 · cf8f5b3 · cf8f5b3
2 parents 7b53f73 + ab68cde
commit cf8f5b3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...c/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/http/DocumentInterceptor.java b/...c/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/http/DocumentInterceptor.java
@@ -2,6 +2,7 @@
 
 import ca.bc.gov.open.jrccaccess.autoconfigure.common.Constants;
 import org.slf4j.MDC;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -19,7 +20,13 @@ public boolean preHandle(HttpServletRequest req, HttpServletResponse res,
                              Object handler) throws Exception {
         if(req instanceof MultipartHttpServletRequest ){
             MultipartHttpServletRequest multiRequest=(MultipartHttpServletRequest) req;
+
             MultipartFile file = multiRequest.getFile("file");
+            if(file == null){
+                res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Expecting file in the request.");
+                return false;
+            }
+
             MDC.put(Constants.MDC_KEY_FILENAME,file.getOriginalFilename());
         }
         return true;

diff --git a/...t/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/http/DocumentInterceptorTests.java b/...t/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/http/DocumentInterceptorTests.java
@@ -13,8 +13,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.verify;
 
 public class DocumentInterceptorTests {
 
@@ -37,6 +37,14 @@ public void init() throws Exception {
         Mockito.when(request.getFile("file")).thenReturn(multipartFile);
     }
 
+    @Test
+    public void http_request_no_file_should_reture_bad_request() throws  Exception{
+        MultipartHttpServletRequest badRequest = Mockito.mock(MultipartHttpServletRequest.class);
+        Mockito.when(badRequest.getFile("file")).thenReturn(null);
+        assertFalse(interceptor.preHandle(badRequest, response, o ) );
+        verify(response).sendError(HttpServletResponse.SC_BAD_REQUEST,"Expecting file in the request." );
+    }
+
     @Test
     public void filename_should_be_added_to_MDC_after_preHandle() throws Exception{
         interceptor.preHandle(request, response, o);