ignore invalid cache control values (#1619)

Athou · Dec 2, 2024 · a073d84 · a073d84
1 parent 8ccb59e
commit a073d84
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java
@@ -162,7 +162,7 @@ private HttpResponse invoke(HttpRequest request) throws IOException {
 			CacheControl cacheControl = Optional.ofNullable(resp.getFirstHeader(HttpHeaders.CACHE_CONTROL))
 					.map(NameValuePair::getValue)
 					.map(StringUtils::trimToNull)
-					.map(CacheControlDelegate.INSTANCE::fromString)
+					.map(HttpGetter::toCacheControl)
 					.orElse(null);
 
 			String contentType = Optional.ofNullable(resp.getEntity()).map(HttpEntity::getContentType).orElse(null);
@@ -176,6 +176,15 @@ private HttpResponse invoke(HttpRequest request) throws IOException {
 		});
 	}
 
+	private static CacheControl toCacheControl(String headerValue) {
+		try {
+			return CacheControlDelegate.INSTANCE.fromString(headerValue);
+		} catch (Exception e) {
+			log.debug("Invalid Cache-Control header: {}", headerValue);
+			return null;
+		}
+	}
+
 	private static byte[] toByteArray(HttpEntity entity, long maxBytes) throws IOException {
 		if (entity.getContentLength() > maxBytes) {
 			throw new IOException(

diff --git a/commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java b/commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java
@@ -94,7 +94,7 @@ void validFeed() throws Exception {
 						.withContentType(MediaType.APPLICATION_ATOM_XML)
 						.withHeader(HttpHeaders.LAST_MODIFIED, "123456")
 						.withHeader(HttpHeaders.ETAG, "78910")
-						.withHeader(HttpHeaders.CACHE_CONTROL, "max-age=60"));
+						.withHeader(HttpHeaders.CACHE_CONTROL, "max-age=60, must-revalidate"));
 
 		HttpResult result = getter.get(this.feedUrl);
 		Assertions.assertArrayEquals(feedContent, result.getContent());
@@ -105,6 +105,18 @@ void validFeed() throws Exception {
 		Assertions.assertEquals(this.feedUrl, result.getUrlAfterRedirect());
 	}
 
+	@Test
+	void ignoreInvalidCacheControlValue() throws Exception {
+		this.mockServerClient.when(HttpRequest.request().withMethod("GET"))
+				.respond(HttpResponse.response()
+						.withBody(feedContent)
+						.withContentType(MediaType.APPLICATION_ATOM_XML)
+						.withHeader(HttpHeaders.CACHE_CONTROL, "max-age=60; must-revalidate"));
+
+		HttpResult result = getter.get(this.feedUrl);
+		Assertions.assertEquals(Duration.ZERO, result.getValidFor());
+	}
+
 	@ParameterizedTest
 	@ValueSource(
 			ints = { HttpStatus.SC_MOVED_PERMANENTLY, HttpStatus.SC_MOVED_TEMPORARILY, HttpStatus.SC_TEMPORARY_REDIRECT,