Add MAS env properties for annotation

.github/workflows/.trivyignore

@@ -1,4 +1,4 @@
-# Date: June 16, 2023
-# Issue: snappy-java high issue, https://www.cvedetails.com/cve/CVE-2023-34453/
-# Solution: Spring needs to update its version
-CVE-2023-34455
+# Date: November 14, 2023
+# Issue: openssl: Incorrect cipher key and IV length processing https://avd.aquasec.com/nvd/cve-2023-5363
+# Solution: Docker image needs an update
+CVE-2023-5363

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.5</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
   <groupId>eu.dissco.core</groupId>
@@ -19,6 +19,7 @@
     <apachecommons.version>4.3</apachecommons.version>
     <k8s-client-java.version>18.0.0</k8s-client-java.version>
     <mockito-inline.version>5.2.0</mockito-inline.version>
+    <snappy-java.version>1.1.10.5</snappy-java.version>
     <snakeyaml.version>2.0</snakeyaml.version>
     <json-patch.version>1.13</json-patch.version>
     <sonar.organization>dissco</sonar.organization>
@@ -116,8 +117,9 @@
       <version>${json-patch.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
+      <groupId>org.xerial.snappy</groupId>
+      <artifactId>snappy-java</artifactId>
+      <version>${snappy-java.version}</version>
     </dependency>
 
 

src/main/java/eu/dissco/orchestration/backend/service/MachineAnnotationServiceService.java

@@ -184,6 +184,7 @@ private Map<String, Object> getDeploymentTemplateProperties(
     map.put("image", masRecord.mas().getContainerImage());
     map.put("imageTag", masRecord.mas().getContainerTag());
     map.put("name", name);
+    map.put("id", masRecord.id());
     map.put("kafkaHost", properties.getKafkaHost());
     map.put("topicName", masRecord.mas().getTopicName());
     return map;

src/main/java/eu/dissco/orchestration/backend/web/HandleComponent.java

@@ -33,8 +33,10 @@ public class HandleComponent {
   public String postHandle(JsonNode request)
       throws PidAuthenticationException, PidCreationException {
     var requestBody = BodyInserters.fromValue(List.of(request));
+    log.debug("Sending call to Handle API: {}", request.toPrettyString());
     var response = sendRequest(HttpMethod.POST, requestBody, "batch");
     var responseJson = validateResponse(response);
+    log.debug("Received response from Handle API: {}", responseJson.toPrettyString());
     return parseResponse(responseJson);
   }
 

src/main/java/eu/dissco/orchestration/backend/web/TokenAuthenticator.java

@@ -58,7 +58,7 @@ private String getToken(JsonNode tokenNode) throws PidAuthenticationException {
     if (tokenNode != null && tokenNode.get("access_token") != null) {
       return tokenNode.get("access_token").asText();
     }
-    log.debug("Unexpected response from keycloak server. Unable to parse access_token");
+    log.warn("Unexpected response from keycloak server. Unable to parse access_token: {}", tokenNode);
     throw new PidAuthenticationException(
         "Unable to authenticate processing service with Keycloak. An error has occurred parsing keycloak response");
   }

src/main/resources/templates/mas-template.ftl

@@ -27,6 +27,14 @@
           "image": "${image}:${imageTag}",
           "imagePullPolicy": "Always",
           "env": [
+            {
+            "name": "MAS_NAME",
+            "value": "${name}"
+            },
+            {
+            "name": "MAS_ID",
+            "value": "${id}"
+            },
             {
             "name": "KAFKA_CONSUMER_HOST",
             "value": "${kafkaHost}"