Merge pull request #342 from AtlasOfLivingAustralia/dev

Preparing v7.1

Author: chrisala

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install nodejs
         uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '24.x'
           registry-url: 'https://npm.pkg.github.com'
           scope: 'AtlasOfLivingAustralia'
 
@@ -40,19 +40,24 @@ jobs:
         id: pre-release-version
         uses: adobe/update-prerelease-npm-version@4dea8f295023f5b18126afd79bae1057a5b92d6e #v1.2.0
 
-      - run: npm publish
+      - run: npm publish --tag=snapshot
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
 
+      - name: Check chromedriver is available
+        run: echo $CHROMEWEBDRIVER
+
+      - name: Check chromedriver version
+        run: $CHROMEWEBDRIVER/chromedriver --version
 
       - name: Run tests and jacoco coverage report with Gradle
-        run: ./gradlew -PenableJacoco=true check
+        run: ./gradlew -PenableJacoco=true -Dwebdriver.chrome.driver=$CHROMEWEBDRIVER/chromedriver check
 
       - name: Run javascript unit tests
-        run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
+        run: npm run test
 
       - name: Clean to remove clover instrumentation
         run: ./gradlew clean

build.gradle

@@ -17,7 +17,7 @@ plugins {
     id 'jacoco'
 }
 
-version "9.0"
+version "9.1-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"
@@ -108,6 +108,7 @@ dependencies {
 tasks.withType(Test) {
     systemProperty 'geb.env', System.getProperty('geb.env') ?: 'chromeHeadless'
     systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
+    systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
 
     testLogging {
         events "passed", "skipped", "failed"

gradle.properties

@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xss2048k -Xmx1024M
 exploded=true
 enableClover=false
 enableJacoco=true
-alaSecurityLibsVersion=7.0.0
+alaSecurityLibsVersion=7.1.0-SNAPSHOT

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/conf/application.yml

@@ -104,7 +104,10 @@ environments:
                 appServerName: 'n/a'
             oidc:
                 enabled: true
-                discoveryUri: 'http://localhost:8080'
+                discoveryUri: 'file://${user.dir}/src/integration-test/resources/oidcDiscovery.json'
+                clientId: 'testClientId'
+                secret: 'testSecret'
+                allowUnsignedIdTokens: true
             jwt:
                 enabled: false
 

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/EcpWebService.groovy

@@ -95,6 +95,41 @@ class EcpWebService {
         }
     }
 
+    /**
+     * This method is used when the response is expected to be a stream, e.g. for downloading files.
+     * It returns a Map with keys [statusCode: <http status code>, error: <error message if applicable>]
+     * The supplied outputStream will be written to with the response from the web service if the call is successful.
+     * The caller is responsible for closing the outputStream.
+     */
+    Map readToStream(String url, OutputStream outputStream, boolean includeUserId = true, Integer timeout = null) {
+        HttpURLConnection conn = null
+        Map resp = [:]
+        try {
+            conn = configureConnection(url, includeUserId, timeout)
+            try (InputStream inputStream = conn.inputStream) {
+                outputStream << inputStream
+            }
+            resp = [statusCode: conn.responseCode]
+
+        } catch (SocketTimeoutException e) {
+            int statusCode = conn ? (conn.responseCode ?: HttpStatus.SC_GATEWAY_TIMEOUT) : HttpStatus.SC_GATEWAY_TIMEOUT
+            resp = [error: "Timed out calling web service. URL= ${url}.", statusCode: statusCode]
+            log.error "Timed out calling web service. URL= ${url}.", e
+        } catch (SocketException se) {
+            int statusCode = conn ? (conn.responseCode ?: HttpStatus.SC_GATEWAY_TIMEOUT) : HttpStatus.SC_GATEWAY_TIMEOUT
+            resp = [error: "Timed out calling web service. URL= ${url}.", statusCode: statusCode]
+
+            log.warn "Socket connection closed. ${se.getMessage()} URL= ${url}.", se
+        } catch (Exception e) {
+            int statusCode = conn ? (conn.responseCode ?: HttpStatus.SC_INTERNAL_SERVER_ERROR) : HttpStatus.SC_INTERNAL_SERVER_ERROR
+            resp = [error: "Timed out calling web service. URL= ${url}.", statusCode: statusCode]
+
+            log.error "Failed calling web service. ${e.getClass()} ${e.getMessage()} URL= ${url}.", e
+        }
+
+        resp
+    }
+
     Map getString(String url, boolean includeAuth) {
         URLConnection conn = null
         Map resp = [:]
@@ -104,7 +139,7 @@ class EcpWebService {
             resp.statusCode = conn.responseCode
         } catch (SocketTimeoutException e) {
             resp.error = "Timed out calling web service. URL= ${url}."
-            resp.statusCode = HttpStatus.CONNECTION_TIMED_OUT
+            resp.statusCode = HttpStatus.SC_GATEWAY_TIMEOUT
             log.warn resp.error
         } catch (SocketException se) {
             resp.error = "Socket connection closed. ${se.getMessage()} URL= ${url}."
@@ -607,9 +642,10 @@ class EcpWebService {
             }
 
             def user = userService.getUser()
-            String userId = user.userId
-            String userIdHeader = grailsApplication.config.getProperty('app.http.header.userId')
+
             if (user) {
+                String userIdHeader = grailsApplication.config.getProperty('app.http.header.userId')
+                String userId = user.userId
                 requestBuilder.addHeader(userIdHeader, userId)
             } else {
                 log.warn("No user associated with request: ${url}")

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()
     }
 }