added null check for tc issue 2254 when the deliveryservice is missin…

…g from the ssl keys
apache · Jul 3, 2018 · 55b4a6e · 55b4a6e
1 parent e8fa8ea
commit 55b4a6e
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 2 deletions.
diff --git a/...n/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java b/...n/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
@@ -86,7 +86,10 @@ private Boolean deliveryServiceHasValidCertificates(final List<CertificateData>
 			}
 
 			for (final CertificateData certificateData : certificateDataList) {
-				if (certificateData.getDeliveryservice().equals(deliveryServiceId)) {
+				String certificateDeliveryServiceId = certificateData.getDeliveryservice();
+				if (deliveryServiceId == null) {
+					LOGGER.error("Delivery Service name is blank for hostname '" +  certificateData.getHostname() + "', skipping.");
+				} else if ((certificateDeliveryServiceId != null) && (deliveryServiceId != null) && (certificateDeliveryServiceId.equals(deliveryServiceId))) {
 					LOGGER.debug("Delivery Service " + deliveryServiceId + " has certificate data for https");
 					return true;
 				}

diff --git a/...va/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java b/...va/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java
@@ -33,14 +33,15 @@ public class CertificateCheckerTest {
 
 	private JsonNode deliveryServicesJson;
 	private List<CertificateData> certificateDataList;
+	private CertificateData certificateData;
 
 	@Before
 	public void before() throws Exception {
 		Certificate certificate = new Certificate();
 		certificate.setCrt("the-crt");
 		certificate.setKey("the-key");
 
-		CertificateData certificateData = new CertificateData();
+		certificateData = new CertificateData();
 		certificateData.setHostname("https-delivery-service.thecdn.example.com");
 		certificateData.setDeliveryservice("https-delivery-service");
 		certificateData.setCertificate(certificate);
@@ -51,6 +52,28 @@ public void before() throws Exception {
 
 	}
 
+	@Test
+	public void itReturnsFalseWhenDeliveryServiceNameIsNull() throws Exception {
+		final File file = new File("src/test/resources/deliveryServices_missingDSName.json");
+		final ObjectMapper mapper = new ObjectMapper();
+		deliveryServicesJson = mapper.readTree(file);
+		CertificateChecker certificateChecker = new CertificateChecker();
+		certificateData.setDeliveryservice(null);
+
+		assertThat(certificateChecker.certificatesAreValid(certificateDataList, deliveryServicesJson), equalTo(false));
+	}
+
+	@Test
+	public void itReturnsFalseWhenDeliveryServiceNameIsBlank() throws Exception {
+		final File file = new File("src/test/resources/deliveryServices_missingDSName.json");
+		final ObjectMapper mapper = new ObjectMapper();
+		deliveryServicesJson = mapper.readTree(file);
+		CertificateChecker certificateChecker = new CertificateChecker();
+		certificateData.setDeliveryservice("");
+
+		assertThat(certificateChecker.certificatesAreValid(certificateDataList, deliveryServicesJson), equalTo(false));
+	}
+
 	@Test
 	public void itReturnsTrueWhenAllHttpsDeliveryServicesHaveCertificates() throws Exception {
 		final File file = new File("src/test/resources/deliveryServices.json");

diff --git a/traffic_router/core/src/test/resources/deliveryServices_missingDSName.json b/traffic_router/core/src/test/resources/deliveryServices_missingDSName.json
@@ -0,0 +1,59 @@
+{
+    "http-delivery-service": {
+        "matchsets": [
+            {
+                "protocol": "HTTP",
+                "matchlist": [
+                    {
+                        "regex": ".*\\.http-delivery-service\\..*"
+                    }
+                ]
+            }
+        ],
+        "protocol": {
+            "acceptHttps": "false"
+        },
+        "sslEnabled": "false",
+        "domains": [
+            "*.http-delivery-service.thecdn.example.com"
+        ]
+    },
+    "": {
+        "matchsets": [
+            {
+                "protocol": "HTTP",
+                "matchlist": [
+                    {
+                        "regex": ".*\\.https-delivery-service\\..*"
+                    }
+                ]
+            }
+        ],
+        "protocol": {
+            "acceptHttps": "true"
+        },
+        "sslEnabled": "true",
+        "domains": [
+            "*.https-delivery-service.thecdn.example.com"
+        ]
+    },
+    "dnssec-delivery-service": {
+        "matchsets": [
+            {
+                "protocol": "DNS",
+                "matchlist": [
+                    {
+                        "regex": ".*\\.dnssec-delivery-service\\..*"
+                    }
+                ]
+            }
+        ],
+        "protocol": {
+            "acceptHttps": "true"
+        },
+        "sslEnabled": "true",
+        "domains": [
+            "*.dnssec-delivery-service.thecdn.example.com"
+        ]
+    }
+}