Fix for TC Issue 2478 - log the bad cert import and keep moving

apache · Jun 28, 2018 · 87343a1 · 87343a1
1 parent 99d9bab
commit 87343a1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.../main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java b/.../main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
@@ -53,10 +53,14 @@ private static class CertificateRegistryHolder {
 	public void importCertificateDataList(final List<CertificateData> certificateDataList) {
 		final Map<String, HandshakeData> map = new HashMap<>();
 		for (final CertificateData certificateData : certificateDataList) {
-			final HandshakeData handshakeData = certificateDataConverter.toHandshakeData(certificateData);
-			final String alias = handshakeData.getHostname().replaceFirst("\\*\\.", "");
-			log.warn("Imported handshake data with alias " + alias);
-			map.put(alias, handshakeData);
+			try {
+				final HandshakeData handshakeData = certificateDataConverter.toHandshakeData(certificateData);
+				final String alias = handshakeData.getHostname().replaceFirst("\\*\\.", "");
+				log.warn("Imported handshake data with alias " + alias);
+				map.put(alias, handshakeData);
+			} catch (Exception e) {
+				log.error("Failed to import certificate data for delivery service: '" + certificateData.getDeliveryservice() + "', hostname: '" + certificateData.getHostname() + "'");
+			}
 		}
 
 		handshakeDataMap = map;