Pull request #190: Hotfix/v1.25.2

Merge in ITB/gitb from hotfix/v1.25.2 to master

* commit '8c929469c06fd54249343a03db230cbe1473e7e5':
  Preparation for release 1.25.2
  [ITB-1779] Importing a community export archive does not delete undefined community resources
  [ITB-1789] Optimize virus scanning for uploaded files
  [ITB-1788] Input parameters ignored when launching test sessions via REST API

Author: costas80

etc/k8s/helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: itb
-version: 1.2.0
+version: 1.3.0
 description: A Helm chart to install the Interoperability Test Bed (ITB) on Kubernetes
 type: application
 keywords:
@@ -17,4 +17,4 @@ maintainers:
     email: DIGIT-ITB@ec.europa.eu
     url: https://ec.europa.eu/info/departments/informatics_en
 icon: https://www.itb.ec.europa.eu/files/itb_logo.png
-appVersion: "1.25.1"
+appVersion: "1.25.2"

etc/k8s/helm/values.yaml

@@ -12,7 +12,7 @@
 #
 redis:
   # redis.image is the (full) image to use to create redis container(s).
-  image: isaitb/gitb-redis:1.25.1
+  image: isaitb/gitb-redis:1.25.2
   #
   # redis.name is the name to use for the redis deployment and (by default) service.
   name: itb-redis
@@ -45,7 +45,7 @@ redis:
 #
 mysql:
   # mysql.image is the (full) image to use to create mysql container(s).
-  image: isaitb/gitb-mysql:1.25.1
+  image: isaitb/gitb-mysql:1.25.2
   #
   # mysql.name is the name to use for the mysql deployment and (by default) service.
   name: itb-mysql
@@ -94,7 +94,7 @@ mysql:
 #
 srv:
   # srv.image is the (full) image to use to create srv container(s).
-  image: isaitb/gitb-srv:1.25.1
+  image: isaitb/gitb-srv:1.25.2
   #
   # srv.name is the name to use for the srv deployment and (by default) service.
   name: itb-srv
@@ -137,7 +137,7 @@ srv:
 #
 ui:
   # ui.image is the (full) image to use to create ui container(s).
-  image: isaitb/gitb-ui:1.25.1
+  image: isaitb/gitb-ui:1.25.2
   #
   # ui.name is the name to use for the ui deployment and (by default) service.
   name: itb-ui

etc/k8s/manifests/03-mysql-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       automountServiceAccountToken: false
       containers:
-        - image: "isaitb/gitb-mysql:1.25.1"
+        - image: "isaitb/gitb-mysql:1.25.2"
           imagePullPolicy: "IfNotPresent"
           name: itb-mysql
           livenessProbe:

etc/k8s/manifests/05-redis-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       automountServiceAccountToken: false
       containers:
-        - image: "isaitb/gitb-redis:1.25.1"
+        - image: "isaitb/gitb-redis:1.25.2"
           imagePullPolicy: "IfNotPresent"
           name: itb-redis
           ports:

etc/k8s/manifests/07-srv-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       automountServiceAccountToken: false
       containers:
-        - image: "isaitb/gitb-srv:1.25.1"
+        - image: "isaitb/gitb-srv:1.25.2"
           imagePullPolicy: "IfNotPresent"
           name: itb-srv
           env:

etc/k8s/manifests/09-ui-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       automountServiceAccountToken: false
       containers:
-        - image: "isaitb/gitb-ui:1.25.1"
+        - image: "isaitb/gitb-ui:1.25.2"
           imagePullPolicy: "IfNotPresent"
           name: itb-ui
           env:

gitb-ui/app/actors/SessionLaunchActor.scala

@@ -121,11 +121,12 @@ class SessionLaunchActor @Inject() (reportManager: ReportManager, testbedBackend
           try {
             val sessionIdToAssign = latestState.assignPredefinedSessionId(testCaseId)
             testSessionId = Some(testbedBackendClient.initiate(testCaseId, sessionIdToAssign))
+            val testCaseInputs = latestState.testCaseInputs(testCaseId)
             latestState = replace(latestState.newForConfiguredTestSession(testCaseId, testSessionId.get))
             if (LOGGER.isDebugEnabled()) LOGGER.debug("Configuring test session [{}] for test case [{}]. {}", testSessionId.get, testCaseDefinitionLoad._1.getId, latestState.statusText())
             webSocketActor.registerActiveTestSession(testSessionId.get)
             // Send the configure request. The response will be returned asynchronously.
-            testbedBackendClient.configure(testSessionId.get, latestState.data.get.statementParameters, latestState.data.get.domainParameters, latestState.data.get.organisationParameters, latestState.data.get.systemParameters, latestState.testCaseInputs(testCaseId))
+            testbedBackendClient.configure(testSessionId.get, latestState.data.get.statementParameters, latestState.data.get.domainParameters, latestState.data.get.organisationParameters, latestState.data.get.systemParameters, testCaseInputs)
           } catch {
             case e: Exception =>
               if (testSessionId.isEmpty) {

gitb-ui/app/controllers/AccountService.scala

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.StringUtils
 import org.apache.tika.Tika
 import org.slf4j.{Logger, LoggerFactory}
 import play.api.mvc._
-import utils.{ClamAVClient, CryptoUtil, HtmlUtil, JsonUtil}
+import utils.{CryptoUtil, HtmlUtil, JsonUtil}
 
 import java.nio.file.Files
 import javax.inject.Inject
@@ -199,20 +199,10 @@ class AccountService @Inject() (authorizedAction: AuthorizedAction, cc: Controll
             // Size.
             response = ResponseConstructor.constructErrorResponse(ErrorCodes.EMAIL_ATTACHMENT_COUNT_EXCEEDED, s"The total size of attachments cannot exceed ${Configurations.EMAIL_ATTACHMENTS_MAX_SIZE} MBs.", Some("files"))
           } else {
-            var virusScanner: Option[ClamAVClient] = None
-            if (Configurations.ANTIVIRUS_SERVER_ENABLED) {
-              virusScanner = Some(new ClamAVClient(Configurations.ANTIVIRUS_SERVER_HOST, Configurations.ANTIVIRUS_SERVER_PORT, Configurations.ANTIVIRUS_SERVER_TIMEOUT))
-            }
             if (response == null) {
               // Check for viruses.
-              attachments.foreach { attachment =>
-                if (virusScanner.isDefined && response != null) {
-                  val scanResult = virusScanner.get.scan(attachment._2.getContent)
-                  if (!ClamAVClient.isCleanReply(scanResult)) {
-                    logger.warn("Attachment [" + attachment._2.getName + "] found to contain virus.")
-                    response = ResponseConstructor.constructBadRequestResponse(ErrorCodes.VIRUS_FOUND, "Attachments failed virus scan.")
-                  }
-                }
+              if (Configurations.ANTIVIRUS_SERVER_ENABLED && ParameterExtractor.virusPresentInFiles(attachments.map(_._2.getContent))) {
+                response = ResponseConstructor.constructBadRequestResponse(ErrorCodes.VIRUS_FOUND, "Attachments failed virus scan.")
               }
               // Check (and set) mime types.
               if (response == null) {

gitb-ui/app/controllers/TestService.scala

@@ -2,13 +2,13 @@ package controllers
 
 import actors.events.TestSessionStartedEvent
 import actors.events.sessions.TerminateAllSessionsEvent
-import org.apache.pekko.actor.ActorSystem
 import com.gitb.tbs._
 import config.Configurations
 import controllers.util._
 import exceptions.ErrorCodes
 import managers._
 import org.apache.commons.io.FileUtils
+import org.apache.pekko.actor.ActorSystem
 import play.api.mvc._
 import utils._
 
@@ -73,17 +73,9 @@ class TestService @Inject() (authorizedAction: AuthorizedAction, cc: ControllerC
     val paramMap = ParameterExtractor.paramMap(request)
     val files = ParameterExtractor.extractFiles(request)
     var response: Result = null
-    if (Configurations.ANTIVIRUS_SERVER_ENABLED) {
-      // Check for viruses in the uploaded file(s)
-      val scanner = new ClamAVClient(Configurations.ANTIVIRUS_SERVER_HOST, Configurations.ANTIVIRUS_SERVER_PORT, Configurations.ANTIVIRUS_SERVER_TIMEOUT)
-      files.foreach { file =>
-        if (response == null) {
-          val scanResult = scanner.scan(file._2.file)
-          if (!ClamAVClient.isCleanReply(scanResult)) {
-            response = ResponseConstructor.constructBadRequestResponse(ErrorCodes.VIRUS_FOUND, "Provided file failed virus scan.")
-          }
-        }
-      }
+    // Check for viruses in the uploaded file(s)
+    if (Configurations.ANTIVIRUS_SERVER_ENABLED && ParameterExtractor.virusPresentInFiles(files.map(_._2.file))) {
+      response = ResponseConstructor.constructBadRequestResponse(ErrorCodes.VIRUS_FOUND, "Provided file failed virus scan.")
     }
     if (response == null) {
       val inputs = ParameterExtractor.requiredBodyParameter(paramMap, Parameters.INPUTS)

gitb-ui/app/managers/export/ImportCompleteManager.scala

@@ -2365,7 +2365,7 @@ class ImportCompleteManager @Inject()(systemConfigurationManager: SystemConfigur
         toDBIO(dbActions)
       }
       _ <- {
-        processRemaining(ImportItemType.Trigger, ctx,
+        processRemaining(ImportItemType.CommunityResource, ctx,
           (targetKey: String, item: ImportItem) => {
             communityResourceManager.deleteCommunityResourceInternal(Some(item.parentItem.get.targetKey.get.toLong), targetKey.toLong, ctx.onSuccessCalls)
           }