Issue/268 port 1 7 0 to 2 0 0

.gitignore

@@ -17,6 +17,7 @@ dsf-bpe/dsf-bpe-server-jetty/api/v2/*.jar
 dsf-bpe/dsf-bpe-server-jetty/conf/config.properties
 dsf-bpe/dsf-bpe-server-jetty/docker/api/v1/*.jar
 dsf-bpe/dsf-bpe-server-jetty/docker/api/v2/*.jar
+dsf-bpe/dsf-bpe-server-jetty/docker/ca/*.pem
 dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe.jar
 dsf-bpe/dsf-bpe-server-jetty/docker/dsf_status_client.jar
 dsf-bpe/dsf-bpe-server-jetty/docker/lib/*.jar
@@ -25,15 +26,10 @@ dsf-bpe/dsf-bpe-server-jetty/process/*.jar
 dsf-bpe/dsf-bpe-server-jetty/ui
 
 ###
-# dsf-fhir ignores
+# dsf-docker ignore
 ###
-dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
-dsf-fhir/dsf-fhir-server-jetty/conf/config.properties
-dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir.jar
-dsf-fhir/dsf-fhir-server-jetty/docker/dsf_status_client.jar
-dsf-fhir/dsf-fhir-server-jetty/docker/lib/*.jar
-dsf-fhir/dsf-fhir-server-jetty/ui
-dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/bundle.xml
+dsf-docker/bpe_proxy/ca/*.pem
+dsf-docker/fhir_proxy/ca/*.pem
 
 ###
 # dsf-docker-test-setup ignores
@@ -66,9 +62,23 @@ dsf-docker-test-setup-3dic-ttp/secrets/*.jks
 dsf-docker-test-setup-3dic-ttp/.env
 dsf-docker-test-setup-3dic-ttp/docker-compose.override.yml
 
+###
+# dsf-fhir ignores
+###
+dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
+dsf-fhir/dsf-fhir-server-jetty/conf/config.properties
+dsf-fhir/dsf-fhir-server-jetty/docker/ca/*.pem
+dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir.jar
+dsf-fhir/dsf-fhir-server-jetty/docker/dsf_status_client.jar
+dsf-fhir/dsf-fhir-server-jetty/docker/lib/*.jar
+dsf-fhir/dsf-fhir-server-jetty/ui
+dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/bundle.xml
+
 ###
 # dsf-tools ignores
 ###
+dsf-tools/dsf-tools-default-ca-files-generator/cert/*.pem
+
 dsf-tools/dsf-tools-test-data-generator/bundle/*.xml
 
 dsf-tools/dsf-tools-test-data-generator/cert/**/*.pem

CITATION.cff

@@ -25,7 +25,7 @@ preferred-citation:
   type: proceedings
 title: "Data Sharing Framework (DSF)"
 version: 2.0.0
-date-released: 2024-10-15
+date-released: 2025-01-22
 url: https://dsf.dev
 repository-code: https://github.com/datasharingframework/dsf
 repository-artifact: https://github.com/datasharingframework/dsf/releases
@@ -252,7 +252,7 @@ references:
       - family-names: Zilske
         given-names: Christoph
       - family-names: Böhringer
-        given-names: Jan P.
+        given-names: Jan Philipp
       - family-names: Fegeler
         given-names: Christian
     title: "Handling Complexity in Decentralized Research Networks: The Data Sharing Framework Allowlist Management Application"

dsf-bpe/dsf-bpe-server-jetty/docker/.dockerignore

@@ -1,9 +1,10 @@
-.dockerignore
-Dockerfile
 api/v1/README.md
 api/v2/README.md
+ca/README.md
 lib/README.md
 lib_external/README.md
 log/README.md
 process/README.md
-ui/README.md
+ui/README.md
+.dockerignore
+Dockerfile

dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile

@@ -3,8 +3,8 @@ RUN adduser --system --no-create-home --group --uid 2202 java
 WORKDIR /opt/bpe
 COPY --chown=root:java ./ ./
 RUN chown root:java ./ && \
-    chmod 750 ./ ./api ./api/v1 ./api/v2 ./conf ./lib ./lib_external ./process ./ui ./dsf_bpe_start.sh ./healthcheck.sh && \
-	chmod 440 ./conf/log4j2.xml ./dsf_bpe.jar ./lib/*.jar && \
+    chmod 750 ./ ./api ./api/v1 ./api/v2 ./ca ./conf ./lib ./lib_external ./process ./ui ./dsf_bpe_start.sh ./healthcheck.sh && \
+	chmod 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./conf/log4j2.xml ./dsf_bpe.jar ./lib/*.jar && \
 	chmod 1775 ./log
 
 

dsf-bpe/dsf-bpe-server-jetty/docker/ca/README.md

@@ -0,0 +1 @@
+Empty `ca` directory for maven/docker build, will contain default certificate authority pem files after maven build

dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe_start.sh

@@ -17,4 +17,4 @@ if [ $JAVA_EXIT -eq 143 ]; then
 else
 	echo java exited with code $JAVA_EXIT
 	exit $JAVA_EXIT
-fi
+fi

dsf-bpe/dsf-bpe-server-jetty/docker/lib/README.md

@@ -1 +1 @@
-Empty lib directory for jar-files used in docker container 
+Empty `lib` directory for maven/docker build, will contain dependency jar files after maven build

dsf-bpe/dsf-bpe-server-jetty/docker/lib_external/README.md

@@ -1 +1 @@
-empty lib_external directory for docker build
+Empty `lib_external` directory for docker build, can be used at runtime to add custom dependency jar files

dsf-bpe/dsf-bpe-server-jetty/docker/log/README.md

@@ -1 +1 @@
-empty log directory for docker build
+Empty `log` directory for docker build, will contain log files at runtime

dsf-bpe/dsf-bpe-server-jetty/docker/process/README.md

@@ -1 +1 @@
-empty process directory for docker build
+Empty `process` directory for docker build, used at runtime to place process plugin jar files

dsf-bpe/dsf-bpe-server-jetty/docker/ui/README.md

@@ -1 +1 @@
-empty ui directory for static override resources
+Empty `ui` directory for docker build, can be used at runtime to place static override resources

dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/config/BpeDbMigratorConfig.java

@@ -26,27 +26,27 @@ public class BpeDbMigratorConfig implements DbMigratorConfig
 	private static final String DB_CAMUNDA_USER = "db.camunda_user";
 	private static final String DB_CAMUNDA_USER_PASSWORD = "db.camunda_user_password";
 
-	// Documentation in dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java
+	@Documentation(required = true, description = "Address of the database used for the DSF BPE server", recommendation = "Change only if you don't use the provided docker-compose from the installation guide or made changes to the database settings/networking in the docker-compose", example = "jdbc:postgresql://db/bpe")
 	@Value("${dev.dsf.bpe.db.url}")
 	private String dbUrl;
 
-	@Documentation(description = "The user name to access the database from the DSF BPE server to execute database migrations")
+	@Documentation(description = "Username to access the database from the DSF BPE server to execute database migrations")
 	@Value("${dev.dsf.bpe.db.liquibase.username:liquibase_user}")
 	private String dbLiquibaseUsername;
 
-	@Documentation(required = true, description = "The password to access the database from the DSF BPE server to execute database migrations", recommendation = "Use docker secret file to configure by using *${env_variable}_FILE*", example = "/run/secrets/db_liquibase.password")
+	@Documentation(required = true, description = "Password to access the database from the DSF BPE server to execute database migrations", recommendation = "Use docker secret file to configure by using *${env_variable}_FILE*", example = "/run/secrets/db_liquibase.password")
 	@Value("${dev.dsf.bpe.db.liquibase.password}")
 	private char[] dbLiquibasePassword;
 
-	@Documentation(description = "The name of the user group to access the database from the DSF BPE server")
+	@Documentation(description = "Name of the user group to access the database from the DSF BPE server")
 	@Value("${dev.dsf.bpe.db.user.group:bpe_users}")
 	private String dbUsersGroup;
 
-	// Documentation in dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java
+	@Documentation(description = "Username to access the database from the DSF BPE server")
 	@Value("${dev.dsf.bpe.db.user.username:bpe_server_user}")
 	private String dbUsername;
 
-	// Documentation in dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java
+	@Documentation(required = true, description = "Password to access the database from the DSF BPE server", recommendation = "Use docker secret file to configure using *${env_variable}_FILE*", example = "/run/secrets/db_user.password")
 	@Value("${dev.dsf.bpe.db.user.password}")
 	private char[] dbPassword;
 
@@ -58,15 +58,15 @@ public class BpeDbMigratorConfig implements DbMigratorConfig
 	@Value("${dev.dsf.bpe.db.liquibase.lockWaitTime:2}")
 	private long dbLiquibaseLockWaitTime;
 
-	@Documentation(description = "The name of the user group to access the database from the DSF BPE server for camunda processes")
+	@Documentation(description = "Name of the user group to access the database from the DSF BPE server for camunda processes")
 	@Value("${dev.dsf.bpe.db.user.camunda.group:camunda_users}")
 	private String dbCamundaUsersGroup;
 
-	// Documentation in dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java
+	@Documentation(description = "Username to access the database from the DSF BPE server for camunda processes", recommendation = "Use a different user then in *DEV_DSF_BPE_DB_USER_USERNAME*")
 	@Value("${dev.dsf.bpe.db.user.camunda.username:camunda_server_user}")
 	private String dbCamundaUsername;
 
-	// Documentation in dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java
+	@Documentation(required = true, description = "Password to access the database from the DSF BPE server for camunda processes", recommendation = "Use docker secret file to configure using *${env_variable}_FILE*", example = "/run/secrets/db_user_camunda.password")
 	@Value("${dev.dsf.bpe.db.user.camunda.password}")
 	private char[] dbCamundaPassword;