Merge pull request #340 from AtlasOfLivingAustralia/feature/3711-fieldcapture

Feature/3711 fieldcapture

Author: chrisala

grails-app/assets/javascripts/forms-knockout-bindings.js

@@ -104,9 +104,9 @@
 
             }).on('fileuploadfail', function(e, data) {
                 var jqXHR = data.jqXHR;
-                if (jqXHR && jqXHR.status === 422) {
-                    var resp = jqXHR.responseJSON || {message: "File upload could not be processed. Possible virus detected."};
-                    error(resp.message);
+                if (jqXHR && (jqXHR.status === 422 || jqXHR.status === 500)) {
+                    var resp = jqXHR.responseJSON || {};
+                    error(resp.message || jqXHR.responseText || 'File upload failed');
                 }
                 else {
                     error(data.errorThrown);
@@ -228,9 +228,9 @@
 
             }).on(eventPrefix+'fail', function(e, data) {
                 var jqXHR = data.jqXHR;
-                if (jqXHR && jqXHR.status === 422) {
-                    var resp = jqXHR.responseJSON || {message: "File upload could not be processed. Possible virus detected."};
-                    error(resp.message);
+                if (jqXHR && (jqXHR.status === 422 || jqXHR.status === 500)) {
+                    var resp = jqXHR.responseJSON || {};
+                    error(resp.message || jqXHR.responseText || 'File upload failed');
                 }
                 else {
                     error(data.errorThrown);

grails-app/controllers/au/org/ala/merit/FileScanInterceptor.groovy

@@ -14,22 +14,29 @@ class FileScanInterceptor {
 
     boolean before() {
         if (request.respondsTo('getFile')) {
-            boolean clean = true
+            List statusCodes = []
             def files = request.getFileNames()
             while(files.hasNext()) {
                 def fileName = files.next()
                 def file = request.getFile(fileName)
                 if (file) {
-                    boolean isClean = scanService.isDocumentClean(file)
-                    clean &= isClean
+                    statusCodes << scanService.getDocumentScanStatus(file)
                 }
             }
 
-            if (!clean) {
+            if (statusCodes.any { it == HttpStatus.SC_UNPROCESSABLE_ENTITY }) {
                 response.status = HttpStatus.SC_UNPROCESSABLE_ENTITY
                 render contentType: 'application/json', text: [success: false, message: "File upload rejected: virus detected"] as JSON, status: HttpStatus.SC_UNPROCESSABLE_ENTITY
                 return false
             }
+            else if (statusCodes.every { it == HttpStatus.SC_OK }) {
+                return true
+            }
+            else {
+                response.status = HttpStatus.SC_INTERNAL_SERVER_ERROR
+                render contentType: 'application/json', text: [success: false, message: "File upload failed during scanning"] as JSON, status: HttpStatus.SC_INTERNAL_SERVER_ERROR
+                return false
+            }
         }
 
         true

grails-app/services/au/org/ala/ecodata/forms/ScanService.groovy

@@ -1,15 +1,15 @@
 package au.org.ala.ecodata.forms
 
-
+import org.springframework.http.HttpStatus
 import org.springframework.web.multipart.MultipartFile
 
 class ScanService {
     EcpWebService ecpWebService
     def grailsApplication
 
-    boolean isDocumentClean(MultipartFile file) {
+    int getDocumentScanStatus(MultipartFile file) {
         if (file == null) {
-            return true
+            return HttpStatus.OK.value()
         }
 
         if (grailsApplication.config.getProperty('scanFile.enabled', Boolean, true)) {
@@ -20,9 +20,9 @@ class ScanService {
 
             baseUrl = baseUrl.replaceAll("/ws", '/reporting/ws')
             def result = ecpWebService.postMultipart("${baseUrl}/document/scanDocument", [:], file, "fileToScan", true)
-            return result.statusCode == org.springframework.http.HttpStatus.OK.value()
+            return result.statusCode
         }
 
-        return true
+        return HttpStatus.OK.value()
     }
 }

src/test/groovy/au/org/ala/merit/FileScanInterceptorSpec.groovy

@@ -8,11 +8,12 @@ import org.springframework.http.HttpStatus
 import spock.lang.Specification
 
 class FileScanInterceptorSpec extends Specification implements InterceptorUnitTest<FileScanInterceptor> {
-    def scanService, webService = Mock(EcpWebService)
+    def scanService, webService
 
     def setup() {
         interceptor.scanService = scanService = new ScanService()
-        scanService.ecpWebService = webService
+        scanService.ecpWebService = Mock(EcpWebService)
+        webService = scanService.ecpWebService
         scanService.grailsApplication = grailsApplication
     }
 
@@ -76,4 +77,29 @@ class FileScanInterceptorSpec extends Specification implements InterceptorUnitTe
         2 * webService.postMultipart(*_) >> [statusCode: HttpStatus.UNPROCESSABLE_ENTITY.value()]
         response.status == 422
     }
+
+    void "interceptor should handle multiple failed file scan results"() {
+        given:
+        def controller = (PreviewController) mockController(PreviewController)
+        def cleanFile = Mock(org.springframework.web.multipart.MultipartFile)
+        cleanFile.name >> "clean"
+        cleanFile.originalFilename >> "clean.txt"
+        cleanFile.inputStream >> new ByteArrayInputStream("clean file content".bytes)
+        def corruptFile = Mock(org.springframework.web.multipart.MultipartFile)
+        corruptFile.name >> "corrupt"
+        corruptFile.originalFilename >> "corrupt.txt"
+        corruptFile.inputStream >> new ByteArrayInputStream("corrupt file content".bytes)
+        request.getFileNames() >> ['clean.txt', 'corrupt.txt'].iterator()
+        request.addFile(cleanFile)
+        request.addFile(corruptFile)
+
+        when:
+        def result = withInterceptors(controller: PreviewController) {
+            controller.prepopulateConstraints()
+        }
+
+        then:
+        2 * scanService.ecpWebService.postMultipart(*_) >> [statusCode: HttpStatus.INTERNAL_SERVER_ERROR.value()]
+        response.status == 500
+    }
 }