The organization thumbprint now gets computed from DSF_DEV_FHIR_CLIENT_CERTIFICATE if the DSF_DEV_FHIR_SERVER_ORGANIZATION_THUMBPRINT is omitted in the configuration

Author: jaboehri

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

@@ -1,14 +1,20 @@
 package dev.dsf.fhir.spring.config;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.KeyStore;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.time.Duration;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Properties;
 
@@ -169,6 +175,7 @@ public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderCon
 		new DockerSecretsPropertySourceFactory(environment).readDockerSecretsAndAddPropertiesToEnvironment();
 
 		injectEndpointProperties(environment);
+		computeOrganizationThumbprintPropertyIfPossible(environment);
 
 		return new PropertySourcesPlaceholderConfigurer();
 	}
@@ -193,6 +200,31 @@ private static void injectEndpointProperties(ConfigurableEnvironment environment
 		}
 	}
 
+	private static void computeOrganizationThumbprintPropertyIfPossible(ConfigurableEnvironment environment)
+	{
+		try
+		{
+			String organizationThumbprint = environment.getProperty("dev.dsf.fhir.server.organization.thumbprint");
+
+			if (organizationThumbprint == null)
+			{
+				Path clientCertPath = Paths.get(environment.getRequiredProperty("dev.dsf.fhir.client.certificate"));
+				X509Certificate clientCert = PemReader.readCertificate(clientCertPath);
+				MessageDigest md = MessageDigest.getInstance("SHA-512");
+				HexFormat hexFormat = HexFormat.of();
+				String thumbprint = hexFormat.formatHex(md.digest(clientCert.getEncoded())).toLowerCase();
+
+				Properties properties = new Properties();
+				properties.put("dev.dsf.fhir.server.organization.thumbprint", thumbprint);
+
+				environment.getPropertySources().addFirst(new PropertiesPropertySource("organization-thumbprint-properties", properties));
+			}
+		} catch (IOException | NoSuchAlgorithmException | CertificateEncodingException e)
+		{
+			throw new RuntimeException(e);
+		}
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception
 	{