env/property based logging config for style and level

The new implementation configures log4j based on values from a
jetty.properties file or environment variables. Values from environment
variables have precedence over properties.

A custom log4j config can be applied by defining a conf/log4j2.xml file
or any other file by also configuring the dev.dsf.log.config property
with a different file location.

All config options have default values.

Implementation also adds infos about the current authenticated user to
the Mapped Diagnostic Context of http requests.

property: dev.dsf.log.audit
env: DEV_DSF_LOG_AUDIT
values: SYS_OUT, SYS_ERROR, FILE, OFF
default: FILE

property: dev.dsf.log.file.style
env: DEV_DSF_LOG_FILE_STYLE
values: JSON_ECS, JSON_GCP, JSON_GELF, JSON_LOGSTASH, TEXT_MDC, TEXT
default: TEXT_MDC

property: dev.dsf.log.file.level
env: DEV_DSF_LOG_FILE_LEVEL
values: TRACE, DEBUG, INFO, WARN, ERROR, OFF
default: DEBUG

property: dev.dsf.log.console.style
env: DEV_DSF_LOG_CONSOLE_STYLE
values: JSON_ECS, JSON_GCP, JSON_GELF, JSON_LOGSTASH, TEXT_MDC, TEXT
default: TEXT

property: dev.dsf.log.console.level
env: DEV_DSF_LOG_CONSOLE_LEVEL
values: TRACE, DEBUG, INFO, WARN, ERROR, OFF
default: INFO

property: dev.dsf.log.config
env: DEV_DSF_LOG_CONFIG
values: <file>
default: conf/log4j2.xml

Author: hhund

dsf-bpe/dsf-bpe-server-jetty/conf/jetty.properties

@@ -7,4 +7,8 @@ dev.dsf.server.certificate.chain=cert/issuing_ca.crt
 dev.dsf.server.certificate.key=cert/bpe.key
 dev.dsf.server.certificate.key.password=password
 
-dev.dsf.server.auth.trust.client.certificate.cas=cert/ca_chain.crt
+dev.dsf.server.auth.trust.client.certificate.cas=cert/ca_chain.crt
+
+dev.dsf.log.file.level=OFF
+dev.dsf.log.console.style=TEXT_MDC
+dev.dsf.log.console.level=TRACE

dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml

@@ -1,6 +1,7 @@
 api/v1/README.md
 api/v2/README.md
 ca/README.md
+conf/README.md
 lib/README.md
 lib_external/README.md
 log/README.md

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

@@ -4,7 +4,7 @@ WORKDIR /opt/bpe
 COPY --chown=root:java ./ ./
 RUN chown root:java ./ && \
     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 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./dsf_bpe.jar ./lib/*.jar && \
 	chmod 1775 ./log
 
 

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

@@ -0,0 +1 @@
+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/conf/README.md

@@ -7,7 +7,7 @@
 import dev.dsf.bpe.config.BpeHttpJettyConfig;
 import dev.dsf.common.db.migration.DbMigrator;
 import dev.dsf.common.jetty.JettyServer;
-import dev.dsf.common.jetty.Log4jInitializer;
+import dev.dsf.common.logging.Log4jInitializer;
 
 public final class BpeJettyServer
 {
@@ -16,7 +16,7 @@ public final class BpeJettyServer
 		SLF4JBridgeHandler.removeHandlersForRootLogger();
 		SLF4JBridgeHandler.install();
 
-		Log4jInitializer.initializeLog4j();
+		new Log4jInitializer("bpe").initializeLog4j();
 	}
 
 	private BpeJettyServer()

dsf-bpe/dsf-bpe-server-jetty/docker/conf/log4j2.xml

@@ -7,7 +7,7 @@
 import dev.dsf.bpe.config.BpeHttpsJettyConfig;
 import dev.dsf.common.db.migration.DbMigrator;
 import dev.dsf.common.jetty.JettyServer;
-import dev.dsf.common.jetty.Log4jInitializer;
+import dev.dsf.common.logging.Log4jInitializer;
 
 public final class BpeJettyServerHttps
 {
@@ -16,7 +16,7 @@ public final class BpeJettyServerHttps
 		SLF4JBridgeHandler.removeHandlersForRootLogger();
 		SLF4JBridgeHandler.install();
 
-		Log4jInitializer.initializeLog4j();
+		new Log4jInitializer("bpe").initializeLog4j();
 	}
 
 	private BpeJettyServerHttps()

dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/BpeJettyServer.java

@@ -14,6 +14,7 @@
 import dev.dsf.bpe.spring.config.PropertiesConfig;
 import dev.dsf.common.auth.filter.AuthenticationFilter;
 import dev.dsf.common.auth.logging.CurrentUserLogger;
+import dev.dsf.common.auth.logging.CurrentUserMdcLogger;
 import jakarta.inject.Inject;
 import jakarta.servlet.ServletContext;
 import jakarta.ws.rs.ApplicationPath;
@@ -51,6 +52,8 @@ public BpeJerseyApplication(ServletContext servletContext)
 		if (context.getBean(PropertiesConfig.class).getDebugLogMessageCurrentUser())
 			register(CurrentUserLogger.class);
 
+		register(CurrentUserMdcLogger.class);
+
 		if (context.getBean(PropertiesConfig.class).getDebugLogMessageWebserviceRequest())
 		{
 			java.util.logging.Logger l = java.util.logging.Logger.getLogger(BpeJerseyApplication.class.getName());

dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/BpeJettyServerHttps.java

@@ -21,6 +21,11 @@
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-security</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>