Lots of updates and ktlint syntax fixes

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Setup protoc
         uses: arduino/[email protected]
         with:

Dockerfile

@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:experimental
 
-ARG BUILDER_IMAGE=amd64/eclipse-temurin:17-jdk-focal
-ARG BASE_IMAGE=gcr.io/distroless/java17-debian11
+ARG BUILDER_IMAGE=amd64/eclipse-temurin:21-jdk
+ARG BASE_IMAGE=gcr.io/distroless/java21-debian12
 
 FROM $BUILDER_IMAGE AS builder
 LABEL AUTHOR="Michael Lux ([email protected])"

build.gradle.kts

@@ -27,7 +27,7 @@ allprojects {
     group = "de.fhg.aisec.ids"
     version = "7.2.0"
 
-    val versionRegex = ".*(rc-?[0-9]*|beta|-b.+)$".toRegex(RegexOption.IGNORE_CASE)
+    val versionRegex = ".*((rc|beta)-?[0-9]*|-b[0-9.]+)$".toRegex(RegexOption.IGNORE_CASE)
 
     tasks.withType<DependencyUpdatesTask> {
         rejectVersionIf {
@@ -81,6 +81,9 @@ subprojects {
             ),
             "org.eclipse.jetty" to mapOf(
                 "*" to versions.jetty.get()
+            ),
+            "org.bouncycastle" to mapOf(
+                "*" to versions.bouncyCastle.get()
             )
         )
         // We need to explicitly specify the kotlin version for all kotlin dependencies,
@@ -146,7 +149,9 @@ configure(subprojects.filter { it.name != "examples" }) {
     spotless {
         kotlin {
             target("src/*/kotlin/**/*.kt")
-            ktlint(libs.versions.ktlint.get())
+            ktlint(libs.versions.ktlint.get()).editorConfigOverride(mapOf(
+                "ktlint_code_style" to "ktlint_official"
+            ))
             licenseHeader(
                 """/*-
  * ========================LICENSE_START=================================

buildx/docker-buildx.sh

@@ -33,7 +33,7 @@ fi
 eval set -- "$PARSED"
 
 DOCKER_BUILD_TAGS="develop"
-BASE_IMAGE_ARG="gcr.io/distroless/java17-debian11"
+BASE_IMAGE_ARG="gcr.io/distroless/java21-debian12"
 TARGETS="core"
 OUTPUT_TYPE="docker"
 BAKE_ARGS=""

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ArtifactRequestCreationProcessor.kt

@@ -31,7 +31,6 @@ import java.net.URI
 
 @Component("artifactRequestCreationProcessor")
 class ArtifactRequestCreationProcessor : Processor {
-
     override fun process(exchange: Exchange) {
         if (LOG.isDebugEnabled) {
             LOG.debug("[IN] ${this::class.java.simpleName}")

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ArtifactRequestProcessor.kt

@@ -33,22 +33,23 @@ import org.springframework.stereotype.Component
 
 @Component("artifactRequestProcessor")
 class ArtifactRequestProcessor : Processor {
-
     override fun process(exchange: Exchange) {
         if (LOG.isDebugEnabled) {
             LOG.debug("[IN] ${this::class.java.simpleName}")
         }
 
-        val artifactRequestMessage = exchange.message.getHeader(
-            IDS_HEADER,
-            ArtifactRequestMessage::class.java
-        )
+        val artifactRequestMessage =
+            exchange.message.getHeader(
+                IDS_HEADER,
+                ArtifactRequestMessage::class.java
+            )
         val requestedArtifact = artifactRequestMessage.requestedArtifact
 
         // TODO: If transferContract doesn't match expected contract from database, send rejection!
-        val usedContract = ProviderDB.artifactUrisMapped2ContractAgreements[
-            Pair(requestedArtifact, UsageControlMaps.getExchangePeerIdentity(exchange))
-        ]
+        val usedContract =
+            ProviderDB.artifactUrisMapped2ContractAgreements[
+                Pair(requestedArtifact, UsageControlMaps.getExchangePeerIdentity(exchange))
+            ]
         if (LOG.isDebugEnabled) {
             LOG.debug("Contract for requested Artifact found {}", usedContract)
         }

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ContractAgreementReceiverProcessor.kt

@@ -31,21 +31,22 @@ import org.springframework.stereotype.Component
 
 @Component("contractAgreementReceiverProcessor")
 class ContractAgreementReceiverProcessor : Processor {
-
     override fun process(exchange: Exchange) {
         if (LOG.isDebugEnabled) {
             LOG.debug("[IN] ${this::class.java.simpleName}")
         }
 
-        val contractAgreementMessage = exchange.message.getHeader(
-            IDS_HEADER,
-            ContractAgreementMessage::class.java
-        )
+        val contractAgreementMessage =
+            exchange.message.getHeader(
+                IDS_HEADER,
+                ContractAgreementMessage::class.java
+            )
 
-        val contractAgreement = SERIALIZER.deserialize(
-            exchange.message.getBody(String::class.java),
-            ContractAgreement::class.java
-        )
+        val contractAgreement =
+            SERIALIZER.deserialize(
+                exchange.message.getBody(String::class.java),
+                ContractAgreement::class.java
+            )
 
         UsageControlMaps.addContractAgreement(contractAgreement)
         if (LOG.isDebugEnabled) {

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ContractHelper.kt

@@ -30,23 +30,27 @@ import org.slf4j.Logger
 import java.net.URI
 
 object ContractHelper {
-
-    fun collectContractProperties(requestedArtifact: URI, exchange: Exchange): Map<String, Any> {
-        val contractProperties = mutableMapOf<String, Any>(
-            ContractConstants.ARTIFACT_URI_PROPERTY to requestedArtifact
-        )
+    fun collectContractProperties(
+        requestedArtifact: URI,
+        exchange: Exchange
+    ): Map<String, Any> {
+        val contractProperties =
+            mutableMapOf<String, Any>(
+                ContractConstants.ARTIFACT_URI_PROPERTY to requestedArtifact
+            )
         // Docker image whitelisting
-        contractProperties[ContractConstants.UC_DOCKER_IMAGE_URIS] = (
-            exchange.getProperty(ContractConstants.UC_DOCKER_IMAGE_URIS)
-                // Legacy property name without "uc-" prefix
-                ?: exchange.getProperty("containerUri")
-                ?: ""
+        contractProperties[ContractConstants.UC_DOCKER_IMAGE_URIS] =
+            (
+                exchange.getProperty(ContractConstants.UC_DOCKER_IMAGE_URIS)
+                    // Legacy property name without "uc-" prefix
+                    ?: exchange.getProperty("containerUri")
+                    ?: ""
             ).toString()
-            .split(Regex("\\s+"))
-            .map(String::trim)
-            .filter(String::isNotEmpty)
-            .map(URI::create)
-            .toList()
+                .split(Regex("\\s+"))
+                .map(String::trim)
+                .filter(String::isNotEmpty)
+                .map(URI::create)
+                .toList()
         // Add not after (BEFORE) usage constraint
         exchange.getProperty(ContractConstants.UC_NOT_AFTER_DATETIME)?.let {
             contractProperties[ContractConstants.UC_NOT_AFTER_DATETIME] = it
@@ -58,11 +62,16 @@ object ContractHelper {
         return contractProperties
     }
 
-    fun handleContractOffer(exchange: Exchange, correlationId: URI, logger: Logger) {
-        val contractOfferReceived = ContractUtils.SERIALIZER.deserialize(
-            exchange.message.getBody(String::class.java),
-            ContractOffer::class.java
-        )
+    fun handleContractOffer(
+        exchange: Exchange,
+        correlationId: URI,
+        logger: Logger
+    ) {
+        val contractOfferReceived =
+            ContractUtils.SERIALIZER.deserialize(
+                exchange.message.getBody(String::class.java),
+                ContractOffer::class.java
+            )
 
         // if contract is denied send ContractRejectionMsg else send ContractAgreementMsg
         val contractOfferIsAccepted = true
@@ -79,18 +88,19 @@ object ContractHelper {
                 }
             }
 
-            val contractAgreement = ContractAgreementBuilder()
-                ._consumer_(contractOfferReceived.consumer)
-                ._provider_(contractOfferReceived.provider)
-                ._contractAnnex_(contractOfferReceived.contractAnnex)
-                ._contractDate_(contractOfferReceived.contractDate)
-                ._contractDocument_(contractOfferReceived.contractDocument)
-                ._contractEnd_(contractOfferReceived.contractEnd)
-                ._contractStart_(contractOfferReceived.contractStart)
-                ._obligation_(contractOfferReceived.obligation)
-                ._prohibition_(contractOfferReceived.prohibition)
-                ._permission_(contractOfferReceived.permission)
-                .build()
+            val contractAgreement =
+                ContractAgreementBuilder()
+                    ._consumer_(contractOfferReceived.consumer)
+                    ._provider_(contractOfferReceived.provider)
+                    ._contractAnnex_(contractOfferReceived.contractAnnex)
+                    ._contractDate_(contractOfferReceived.contractDate)
+                    ._contractDocument_(contractOfferReceived.contractDocument)
+                    ._contractEnd_(contractOfferReceived.contractEnd)
+                    ._contractStart_(contractOfferReceived.contractStart)
+                    ._obligation_(contractOfferReceived.obligation)
+                    ._prohibition_(contractOfferReceived.prohibition)
+                    ._permission_(contractOfferReceived.permission)
+                    .build()
 
             UsageControlMaps.addContractAgreement(contractAgreement)
             if (logger.isDebugEnabled) {
@@ -107,7 +117,11 @@ object ContractHelper {
         }
     }
 
-    private fun createContractRejectionMessage(exchange: Exchange, correlationId: URI, logger: Logger) {
+    private fun createContractRejectionMessage(
+        exchange: Exchange,
+        correlationId: URI,
+        logger: Logger
+    ) {
         if (logger.isDebugEnabled) {
             logger.debug("Constructing ContractRejectionMessage")
         }

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ContractOfferCreationProcessor.kt

@@ -35,8 +35,9 @@ import java.net.URI
  * This Processor handles a ContractRequestMessage and creates a ContractResponseMessage.
  */
 @Component("contractOfferCreationProcessor")
-class ContractOfferCreationProcessor(@Autowired private val contractManager: ContractManager) : Processor {
-
+class ContractOfferCreationProcessor(
+    @Autowired private val contractManager: ContractManager
+) : Processor {
     override fun process(exchange: Exchange) {
         if (LOG.isDebugEnabled) {
             LOG.debug("[IN] ${this::class.java.simpleName}")
@@ -49,13 +50,14 @@ class ContractOfferCreationProcessor(@Autowired private val contractManager: Con
             exchange.message.setHeader(IDS_HEADER, it)
         }
 
-        val artifactUri = exchange.getProperty(ContractConstants.ARTIFACT_URI_PROPERTY)?.let {
-            if (it is URI) {
-                it
-            } else {
-                URI.create(it.toString())
-            }
-        } ?: throw RuntimeException("No property \"artifactUri\" found in Exchange, cannot build contract!")
+        val artifactUri =
+            exchange.getProperty(ContractConstants.ARTIFACT_URI_PROPERTY)?.let {
+                if (it is URI) {
+                    it
+                } else {
+                    URI.create(it.toString())
+                }
+            } ?: throw RuntimeException("No property \"artifactUri\" found in Exchange, cannot build contract!")
 
         val contractProperties = ContractHelper.collectContractProperties(artifactUri, exchange)
         val contractOffer = contractManager.makeContract(contractProperties)

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ContractOfferLoaderProcessor.kt

@@ -34,8 +34,9 @@ import org.springframework.stereotype.Component
  * This Processor handles a ContractRequestMessage and creates a ContractResponseMessage.
  */
 @Component("contractOfferLoaderProcessor")
-class ContractOfferLoaderProcessor(@Autowired private val contractManager: ContractManager) : Processor {
-
+class ContractOfferLoaderProcessor(
+    @Autowired private val contractManager: ContractManager
+) : Processor {
     override fun process(exchange: Exchange) {
         if (LOG.isDebugEnabled) {
             LOG.debug("[IN] ${this::class.java.simpleName}")
@@ -49,9 +50,10 @@ class ContractOfferLoaderProcessor(@Autowired private val contractManager: Contr
         }
 
         val storeKey = exchange.getProperty(CONTRACT_STORE_KEY)?.toString()
-        val contractOffer = storeKey?.let {
-            contractManager.loadContract(it)
-        } ?: throw RuntimeException("Error loading ContractOffer with store key \"$storeKey\"")
+        val contractOffer =
+            storeKey?.let {
+                contractManager.loadContract(it)
+            } ?: throw RuntimeException("Error loading ContractOffer with store key \"$storeKey\"")
 
         SERIALIZER.serialize(contractOffer).let {
             if (LOG.isDebugEnabled) {

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ContractOfferProcessor.kt

@@ -31,16 +31,16 @@ import org.springframework.stereotype.Component
  */
 @Component("contractOfferProcessor")
 class ContractOfferProcessor : Processor {
-
     override fun process(exchange: Exchange) {
         if (LOG.isDebugEnabled) {
             LOG.debug("[IN] ${this::class.java.simpleName}")
         }
 
-        val contractOfferMessage = exchange.message.getHeader(
-            IDS_HEADER,
-            ContractOfferMessage::class.java
-        )
+        val contractOfferMessage =
+            exchange.message.getHeader(
+                IDS_HEADER,
+                ContractOfferMessage::class.java
+            )
 
         ContractHelper.handleContractOffer(exchange, contractOfferMessage.id, LOG)
     }

camel-processors/src/main/kotlin/de/fhg/aisec/ids/camel/processors/ContractOfferStoreProcessor.kt

@@ -33,20 +33,22 @@ import java.net.URI
  * This Processor handles a ContractRequestMessage and creates a ContractResponseMessage.
  */
 @Component("contractOfferStoreProcessor")
-class ContractOfferStoreProcessor(@Autowired private val contractManager: ContractManager) : Processor {
-
+class ContractOfferStoreProcessor(
+    @Autowired private val contractManager: ContractManager
+) : Processor {
     override fun process(exchange: Exchange) {
         if (LOG.isDebugEnabled) {
             LOG.debug("[IN] ${this::class.java.simpleName}")
         }
 
-        val artifactUri = exchange.getProperty(ContractConstants.ARTIFACT_URI_PROPERTY)?.let {
-            if (it is URI) {
-                it
-            } else {
-                URI.create(it.toString())
-            }
-        } ?: throw RuntimeException("No property \"artifactUri\" found in Exchange, cannot build contract!")
+        val artifactUri =
+            exchange.getProperty(ContractConstants.ARTIFACT_URI_PROPERTY)?.let {
+                if (it is URI) {
+                    it
+                } else {
+                    URI.create(it.toString())
+                }
+            } ?: throw RuntimeException("No property \"artifactUri\" found in Exchange, cannot build contract!")
 
         exchange.getProperty(CONTRACT_STORE_KEY)?.toString()?.let {
             val contractProperties = ContractHelper.collectContractProperties(artifactUri, exchange)