Merge pull request #88 from Fraunhofer-AISEC/daps-adaptations

DAPS adaptations

Author: milux

build.gradle.kts

@@ -16,7 +16,7 @@ plugins {
     java
 
     // Spring Boot
-    id("org.springframework.boot") version "2.6.1" apply false
+    id("org.springframework.boot") version "2.5.8" apply false
     id("io.spring.dependency-management") version "1.0.11.RELEASE"
 
     // Other needed plugins

examples/etc/settings.mapdb

@@ -21,21 +21,21 @@ package de.fhg.aisec.ids.api.settings
 
 import java.io.Serializable
 
-class ConnectorConfig : Serializable {
-    val appstoreUrl = "https://raw.githubusercontent.com/industrial-data-space/templates/master/templates.json"
-    val brokerUrl = ""
-    val ttpHost = ""
-    val ttpPort = 443
-    val acmeServerWebcon = ""
-    val acmeDnsWebcon = ""
-    val acmePortWebcon = 80
-    val tosAcceptWebcon = false
-    val dapsUrl = "https://daps.aisec.fraunhofer.de"
-    val keystoreName = "provider-keystore.p12"
-    val keystorePassword = "password"
-    val keystoreAliasName = "1"
-    val truststoreName = "truststore.p12"
-
+data class ConnectorConfig(
+    val appstoreUrl: String = "https://raw.githubusercontent.com/industrial-data-space/templates/master/templates.json",
+    val brokerUrl: String = "",
+    val ttpHost: String = "",
+    val ttpPort: Int = 443,
+    val acmeServerWebcon: String = "",
+    val acmeDnsWebcon: String = "",
+    val acmePortWebcon: Int = 80,
+    val tosAcceptWebcon: Boolean = false,
+    val dapsUrl: String = "https://daps.aisec.fraunhofer.de/v2",
+    val keystoreName: String = "provider-keystore.p12",
+    val keystorePassword: String = "password",
+    val keystoreAliasName: String = "1",
+    val truststoreName: String = "truststore.p12"
+) : Serializable {
     companion object {
         private const val serialVersionUID = 1L
     }

examples/etc/settings2.mapdb

@@ -67,6 +67,8 @@ val copyProjectJars = tasks.create<Copy>("copyProjectJars") {
 
 tasks.withType<Jar> {
     enabled = true
+    // Always execute!
+    outputs.upToDateWhen { false }
     dependsOn(copyLibraryJars)
     dependsOn(copyProjectJars)
     // Copy the resulting JAR to internal libraries

ids-api/src/main/java/de/fhg/aisec/ids/api/settings/ConnectorConfig.kt

@@ -55,7 +55,11 @@ class ConnectorConfiguration {
                 settings.connectorProfile.maintainerUrl
                     ?: URI.create("http://connector-maintainer.ids")
             }
-            Utils.dapsUrlProducer = { settings.connectorConfig.dapsUrl }
+            Utils.dapsUrlProducer = {
+                System.getenv("TC_DAPS_URL")?.also {
+                    TrustedConnector.LOG.info("Found DAPS_URL env var, DAPS URL is overridden with $it")
+                } ?: settings.connectorConfig.dapsUrl
+            }
             TrustedConnector.LOG.info("Information model {} loaded", BuildConfig.INFOMODEL_VERSION)
             Utils.infomodelVersion = BuildConfig.INFOMODEL_VERSION
 

ids-connector/build.gradle.kts

@@ -83,6 +83,19 @@ class SettingsComponent : Settings {
                     settingsStore -= DAT_KEY
                     dbVersion = 3
                 }
+                3 -> {
+                    if (connectorConfig.dapsUrl == "https://daps.aisec.fraunhofer.de") {
+                        connectorConfig.let {
+                            connectorConfig = ConnectorConfig(
+                                it.appstoreUrl, it.brokerUrl, it.ttpHost, it.ttpPort, it.acmeServerWebcon,
+                                it.acmeDnsWebcon, it.acmePortWebcon, it.tosAcceptWebcon,
+                                "https://daps.aisec.fraunhofer.de/v2",
+                                it.keystoreName, it.keystorePassword, it.keystoreAliasName, it.truststoreName
+                            )
+                        }
+                    }
+                    dbVersion = 4
+                }
             }
             settingsStore[DB_VERSION_KEY] = dbVersion
             mapDB.commit()
@@ -155,7 +168,7 @@ class SettingsComponent : Settings {
 
     companion object {
         internal const val DB_VERSION_KEY = "db_version"
-        internal const val CURRENT_DB_VERSION = 3
+        internal const val CURRENT_DB_VERSION = 4
         internal const val CONNECTOR_SETTINGS_KEY = "main_config"
         internal const val CONNECTOR_PROFILE_KEY = "connector_profile"
         internal const val CONNECTOR_JSON_LD_KEY = "connector_json_ld"

ids-connector/src/main/kotlin/de/fhg/aisec/ids/ConnectorConfiguration.kt

@@ -1,4 +1,4 @@
-idscp2: "0.8.1"
+idscp2: "0.9.0"
 ktlint: "0.43.2"
 
 # Pinning
@@ -68,5 +68,5 @@ auth0Jwt: "3.8.2"
 swagger: "1.5.18"
 jose4j: "0.7.6"
 
-springBoot: "2.6.1"
+springBoot: "2.5.8"
 bouncyCastle: "1.68"