Issue/175 Template Engine for HTML UIs

.gitignore

@@ -22,6 +22,7 @@ dsf-bpe/dsf-bpe-server-jetty/process/*.jar
 # dsf-fhir ignores
 ###
 dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
+dsf-fhir/dsf-fhir-server-jetty/ui
 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-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/config/BpeHttpJettyConfig.java

@@ -1,6 +1,5 @@
 package dev.dsf.bpe.config;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.glassfish.jersey.servlet.init.JerseyServletContainerInitializer;
@@ -20,6 +19,6 @@ protected String mavenServerModuleName()
 	@Override
 	protected List<Class<? extends ServletContainerInitializer>> servletContainerInitializers()
 	{
-		return Arrays.asList(JerseyServletContainerInitializer.class, SpringServletContainerInitializer.class);
+		return List.of(JerseyServletContainerInitializer.class, SpringServletContainerInitializer.class);
 	}
 }

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

@@ -1,6 +1,5 @@
 package dev.dsf.bpe.config;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.glassfish.jersey.servlet.init.JerseyServletContainerInitializer;
@@ -20,6 +19,6 @@ protected String mavenServerModuleName()
 	@Override
 	protected List<Class<? extends ServletContainerInitializer>> servletContainerInitializers()
 	{
-		return Arrays.asList(JerseyServletContainerInitializer.class, SpringServletContainerInitializer.class);
+		return List.of(JerseyServletContainerInitializer.class, SpringServletContainerInitializer.class);
 	}
 }

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/AbstractProcessPlugin.java

@@ -145,12 +145,12 @@ Resource getResource()
 			.compile(Pattern.quote(PLACEHOLDER_PREFIX_TMP));
 	private static final Pattern PLACEHOLDER_PREFIX_PATTERN = Pattern.compile(Pattern.quote(PLACEHOLDER_PREFIX));
 
-	private static final String ACTIVITY_DEFINITION_URL_PATTERN_STRING = "^(?<processUrl>http[s]{0,1}://(?<domain>(?:(?:[a-zA-Z0-9]{1,63}|[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.)+(?:[a-zA-Z0-9]{1,63}))"
+	private static final String ACTIVITY_DEFINITION_URL_PATTERN_STRING = "^(?<processUrl>http[s]{0,1}://(?<domain>(?:(?:[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.)+(?:[a-zA-Z0-9]{1,63}))"
 			+ "/bpe/Process/(?<processName>[a-zA-Z0-9-]+))$";
 	private static final Pattern ACTIVITY_DEFINITION_URL_PATTERN = Pattern
 			.compile(ACTIVITY_DEFINITION_URL_PATTERN_STRING);
 
-	private static final String INSTANTIATES_CANONICAL_PATTERN_STRING = "(?<processUrl>http[s]{0,1}://(?<domain>(?:(?:[a-zA-Z0-9]{1,63}|[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.)+(?:[a-zA-Z0-9]{1,63}))"
+	private static final String INSTANTIATES_CANONICAL_PATTERN_STRING = "(?<processUrl>http[s]{0,1}://(?<domain>(?:(?:[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.)+(?:[a-zA-Z0-9]{1,63}))"
 			+ "/bpe/Process/(?<processName>[a-zA-Z0-9-]+))\\|(?<processVersion>\\d+\\.\\d+)$";
 	private static final Pattern INSTANTIATES_CANONICAL_PATTERN = Pattern
 			.compile(INSTANTIATES_CANONICAL_PATTERN_STRING);

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java

@@ -28,23 +28,23 @@ public class PropertiesConfig implements InitializingBean
 {
 	private static final Logger logger = LoggerFactory.getLogger(PropertiesConfig.class);
 
-	@Documentation(required = true, description = "The 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")
+	@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")
+	@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(required = true, description = "The 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")
+	@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;
 
-	@Documentation(description = "The user name 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*")
+	@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(required = true, description = "The 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")
+	@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;
 
@@ -64,27 +64,27 @@ public class PropertiesConfig implements InitializingBean
 	@Value("${dev.dsf.bpe.fhir.client.certificate.private.key.password:#{null}}")
 	private char[] clientCertificatePrivateKeyFilePassword;
 
-	@Documentation(description = "The timeout in milliseconds until a reading a resource from a remote DSF FHIR server is aborted", recommendation = "Change default value only if timeout exceptions occur")
+	@Documentation(description = "Timeout in milliseconds until a reading a resource from a remote DSF FHIR server is aborted", recommendation = "Change default value only if timeout exceptions occur")
 	@Value("${dev.dsf.bpe.fhir.client.remote.timeout.read:60000}")
 	private int webserviceClientRemoteReadTimeout;
 
-	@Documentation(description = "The timeout in milliseconds until a connection is established with a remote DSF FHIR server", recommendation = "Change default value only if timeout exceptions occur")
+	@Documentation(description = "Timeout in milliseconds until a connection is established with a remote DSF FHIR server", recommendation = "Change default value only if timeout exceptions occur")
 	@Value("${dev.dsf.bpe.fhir.client.remote.timeout.connect:5000}")
 	private int webserviceClientRemoteConnectTimeout;
 
 	@Documentation(description = "To enable verbose logging of requests to and replies from remote DSF FHIR servers, set to `true`")
 	@Value("${dev.dsf.bpe.fhir.client.remote.verbose:false}")
 	private boolean webserviceClientRemoteVerbose;
 
-	@Documentation(required = true, description = "The base address of the local DSF FHIR server to read/store fhir resources", example = "https://foo.bar/fhir")
+	@Documentation(required = true, description = "Base address of the local DSF FHIR server to read/store fhir resources", example = "https://foo.bar/fhir")
 	@Value("${dev.dsf.bpe.fhir.server.base.url}")
 	private String serverBaseUrl;
 
-	@Documentation(description = "The timeout in milliseconds until reading a resource from the local DSF FHIR server is aborted", recommendation = "Change default value only if timeout exceptions occur")
+	@Documentation(description = "Timeout in milliseconds until reading a resource from the local DSF FHIR server is aborted", recommendation = "Change default value only if timeout exceptions occur")
 	@Value("${dev.dsf.bpe.fhir.client.local.timeout.read:60000}")
 	private int webserviceClientLocalReadTimeout;
 
-	@Documentation(description = "The timeout in milliseconds until a connection is established with the local DSF FHIR server", recommendation = "Change default value only if timeout exceptions occur")
+	@Documentation(description = "Timeout in milliseconds until a connection is established with the local DSF FHIR server", recommendation = "Change default value only if timeout exceptions occur")
 	@Value("${dev.dsf.bpe.fhir.client.local.timeout.connect:2000}")
 	private int webserviceClientLocalConnectTimeout;
 

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java

@@ -90,7 +90,8 @@ String getShortMessage()
 
 	public static final String TASK_VARIABLE = TaskHandler.class.getName() + ".task";
 
-	private static final String INSTANTIATES_CANONICAL_PATTERN_STRING = "(?<processUrl>http://(?<processDomain>(?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*(?:[A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]))/bpe/Process/(?<processDefinitionKey>[-\\w]+))\\|(?<processVersion>\\d+\\.\\d+)";
+	private static final String INSTANTIATES_CANONICAL_PATTERN_STRING = "(?<processUrl>http[s]{0,1}://(?<domain>(?:(?:[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.)+(?:[a-zA-Z0-9]{1,63}))"
+			+ "/bpe/Process/(?<processName>[a-zA-Z0-9-]+))\\|(?<processVersion>\\d+\\.\\d+)$";
 	private static final Pattern INSTANTIATES_CANONICAL_PATTERN = Pattern
 			.compile(INSTANTIATES_CANONICAL_PATTERN_STRING);
 
@@ -125,8 +126,8 @@ public void onResource(Task task)
 			throw new IllegalStateException("InstantiatesCanonical of Task with id " + task.getIdElement().getIdPart()
 					+ " does not match " + INSTANTIATES_CANONICAL_PATTERN_STRING);
 
-		String processDomain = matcher.group("processDomain").replace(".", "");
-		String processDefinitionKey = matcher.group("processDefinitionKey");
+		String processDomain = matcher.group("domain").replace(".", "");
+		String processDefinitionKey = matcher.group("processName");
 		String processVersion = matcher.group("processVersion");
 
 		String messageName = getFirstInputParameter(task, BpmnMessage.messageName());

dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/auth/StatusPortAuthenticator.java

@@ -39,6 +39,12 @@ public String getAuthMethod()
 	}
 
 	public boolean isStatusPortRequest(ServletRequest req)
+	{
+		HttpServletRequest request = (HttpServletRequest) req;
+		return statusPortSupplier.get() != null && statusPortSupplier.get() == request.getLocalPort();
+	}
+
+	private boolean isStatusPortAndPathGetRequest(ServletRequest req)
 	{
 		HttpServletRequest request = (HttpServletRequest) req;
 		return HttpMethod.GET.is(request.getMethod()) && STATUS_PATH.equals(request.getPathInfo())
@@ -55,7 +61,7 @@ public void prepareRequest(ServletRequest request)
 	public Authentication validateRequest(ServletRequest request, ServletResponse response, boolean mandatory)
 			throws ServerAuthException
 	{
-		if (isStatusPortRequest(request))
+		if (isStatusPortAndPathGetRequest(request))
 			return new UserAuthentication(getAuthMethod(), null);
 		else
 			return Authentication.UNAUTHENTICATED;

dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/jetty/JettyServer.java

@@ -1,7 +1,6 @@
 package dev.dsf.common.jetty;
 
 import java.io.IOException;
-import java.io.Writer;
 import java.net.InetSocketAddress;
 import java.net.StandardSocketOptions;
 import java.nio.channels.ServerSocketChannel;
@@ -24,6 +23,7 @@
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConfiguration.Customizer;
 import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -41,6 +41,7 @@
 import jakarta.servlet.ServletContainerInitializer;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public final class JettyServer
 {
@@ -325,8 +326,8 @@ private ErrorHandler statusCodeOnlyErrorHandler()
 		return new ErrorHandler()
 		{
 			@Override
-			protected void writeErrorPage(HttpServletRequest request, Writer writer, int code, String message,
-					boolean showStacks) throws IOException
+			protected void generateAcceptableResponse(Request baseRequest, HttpServletRequest request,
+					HttpServletResponse response, int code, String message) throws IOException
 			{
 				logger.info("Error {}: {}", code, message);
 			}