release 5.3.6

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [5.3.6]
+
+- Ignore invalid Cache-Control header values (#1619)
+
 ## [5.3.5]
 
 - Fixed an issue with the aspect ratio of images of some feeds (#1595)

commafeed-client/package-lock.json

@@ -67,7 +67,7 @@
                 "vite": "^5.4.11",
                 "vite-plugin-checker": "^0.8.0",
                 "vite-tsconfig-paths": "^5.1.3",
-                "vitest": "^2.1.6",
+                "vitest": "^2.1.8",
                 "vitest-mock-extended": "^2.0.2"
             }
         },
@@ -2301,14 +2301,14 @@
             }
         },
         "node_modules/@vitest/expect": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.6.tgz",
-            "integrity": "sha512-9M1UR9CAmrhJOMoSwVnPh2rELPKhYo0m/CSgqw9PyStpxtkwhmdM6XYlXGKeYyERY1N6EIuzkQ7e3Lm1WKCoUg==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.8.tgz",
+            "integrity": "sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/spy": "2.1.6",
-                "@vitest/utils": "2.1.6",
+                "@vitest/spy": "2.1.8",
+                "@vitest/utils": "2.1.8",
                 "chai": "^5.1.2",
                 "tinyrainbow": "^1.2.0"
             },
@@ -2317,13 +2317,13 @@
             }
         },
         "node_modules/@vitest/mocker": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.6.tgz",
-            "integrity": "sha512-MHZp2Z+Q/A3am5oD4WSH04f9B0T7UvwEb+v5W0kCYMhtXGYbdyl2NUk1wdSMqGthmhpiThPDp/hEoVwu16+u1A==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.8.tgz",
+            "integrity": "sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/spy": "2.1.6",
+                "@vitest/spy": "2.1.8",
                 "estree-walker": "^3.0.3",
                 "magic-string": "^0.30.12"
             },
@@ -2332,7 +2332,7 @@
             },
             "peerDependencies": {
                 "msw": "^2.4.9",
-                "vite": "^5.0.0 || ^6.0.0"
+                "vite": "^5.0.0"
             },
             "peerDependenciesMeta": {
                 "msw": {
@@ -2344,9 +2344,9 @@
             }
         },
         "node_modules/@vitest/pretty-format": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.6.tgz",
-            "integrity": "sha512-exZyLcEnHgDMKc54TtHca4McV4sKT+NKAe9ix/yhd/qkYb/TP8HTyXRFDijV19qKqTZM0hPL4753zU/U8L/gAA==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.8.tgz",
+            "integrity": "sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2357,13 +2357,13 @@
             }
         },
         "node_modules/@vitest/runner": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.6.tgz",
-            "integrity": "sha512-SjkRGSFyrA82m5nz7To4CkRSEVWn/rwQISHoia/DB8c6IHIhaE/UNAo+7UfeaeJRE979XceGl00LNkIz09RFsA==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.8.tgz",
+            "integrity": "sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/utils": "2.1.6",
+                "@vitest/utils": "2.1.8",
                 "pathe": "^1.1.2"
             },
             "funding": {
@@ -2371,13 +2371,13 @@
             }
         },
         "node_modules/@vitest/snapshot": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.6.tgz",
-            "integrity": "sha512-5JTWHw8iS9l3v4/VSuthCndw1lN/hpPB+mlgn1BUhFbobeIUj1J1V/Bj2t2ovGEmkXLTckFjQddsxS5T6LuVWw==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.8.tgz",
+            "integrity": "sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/pretty-format": "2.1.6",
+                "@vitest/pretty-format": "2.1.8",
                 "magic-string": "^0.30.12",
                 "pathe": "^1.1.2"
             },
@@ -2386,9 +2386,9 @@
             }
         },
         "node_modules/@vitest/spy": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.6.tgz",
-            "integrity": "sha512-oTFObV8bd4SDdRka5O+mSh5w9irgx5IetrD5i+OsUUsk/shsBoHifwCzy45SAORzAhtNiprUVaK3hSCCzZh1jQ==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.8.tgz",
+            "integrity": "sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2399,13 +2399,13 @@
             }
         },
         "node_modules/@vitest/utils": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.6.tgz",
-            "integrity": "sha512-ixNkFy3k4vokOUTU2blIUvOgKq/N2PW8vKIjZZYsGJCMX69MRa9J2sKqX5hY/k5O5Gty3YJChepkqZ3KM9LyIQ==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.8.tgz",
+            "integrity": "sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/pretty-format": "2.1.6",
+                "@vitest/pretty-format": "2.1.8",
                 "loupe": "^3.1.2",
                 "tinyrainbow": "^1.2.0"
             },
@@ -4938,12 +4938,13 @@
             }
         },
         "node_modules/is-number-object": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-            "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.0.tgz",
+            "integrity": "sha512-KVSZV0Dunv9DTPkhXwcZ3Q+tUc9TsaE1ZwX5J2WMvsSGS6Md8TFPun5uwh0yRdrNerI6vf/tbJxqSx4c1ZI1Lw==",
             "license": "MIT",
             "dependencies": {
-                "has-tostringtag": "^1.0.0"
+                "call-bind": "^1.0.7",
+                "has-tostringtag": "^1.0.2"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -8435,9 +8436,9 @@
             }
         },
         "node_modules/vite-node": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.6.tgz",
-            "integrity": "sha512-DBfJY0n9JUwnyLxPSSUmEePT21j8JZp/sR9n+/gBwQU6DcQOioPdb8/pibWfXForbirSagZCilseYIwaL3f95A==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.8.tgz",
+            "integrity": "sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8445,13 +8446,13 @@
                 "debug": "^4.3.7",
                 "es-module-lexer": "^1.5.4",
                 "pathe": "^1.1.2",
-                "vite": "^5.0.0 || ^6.0.0"
+                "vite": "^5.0.0"
             },
             "bin": {
                 "vite-node": "vite-node.mjs"
             },
             "engines": {
-                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+                "node": "^18.0.0 || >=20.0.0"
             },
             "funding": {
                 "url": "https://opencollective.com/vitest"
@@ -8584,19 +8585,19 @@
             }
         },
         "node_modules/vitest": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.6.tgz",
-            "integrity": "sha512-isUCkvPL30J4c5O5hgONeFRsDmlw6kzFEdLQHLezmDdKQHy8Ke/B/dgdTMEgU0vm+iZ0TjW8GuK83DiahBoKWQ==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.8.tgz",
+            "integrity": "sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/expect": "2.1.6",
-                "@vitest/mocker": "2.1.6",
-                "@vitest/pretty-format": "^2.1.6",
-                "@vitest/runner": "2.1.6",
-                "@vitest/snapshot": "2.1.6",
-                "@vitest/spy": "2.1.6",
-                "@vitest/utils": "2.1.6",
+                "@vitest/expect": "2.1.8",
+                "@vitest/mocker": "2.1.8",
+                "@vitest/pretty-format": "^2.1.8",
+                "@vitest/runner": "2.1.8",
+                "@vitest/snapshot": "2.1.8",
+                "@vitest/spy": "2.1.8",
+                "@vitest/utils": "2.1.8",
                 "chai": "^5.1.2",
                 "debug": "^4.3.7",
                 "expect-type": "^1.1.0",
@@ -8607,24 +8608,24 @@
                 "tinyexec": "^0.3.1",
                 "tinypool": "^1.0.1",
                 "tinyrainbow": "^1.2.0",
-                "vite": "^5.0.0 || ^6.0.0",
-                "vite-node": "2.1.6",
+                "vite": "^5.0.0",
+                "vite-node": "2.1.8",
                 "why-is-node-running": "^2.3.0"
             },
             "bin": {
                 "vitest": "vitest.mjs"
             },
             "engines": {
-                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+                "node": "^18.0.0 || >=20.0.0"
             },
             "funding": {
                 "url": "https://opencollective.com/vitest"
             },
             "peerDependencies": {
                 "@edge-runtime/vm": "*",
-                "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-                "@vitest/browser": "2.1.6",
-                "@vitest/ui": "2.1.6",
+                "@types/node": "^18.0.0 || >=20.0.0",
+                "@vitest/browser": "2.1.8",
+                "@vitest/ui": "2.1.8",
                 "happy-dom": "*",
                 "jsdom": "*"
             },

commafeed-client/package.json

@@ -74,7 +74,7 @@
         "vite": "^5.4.11",
         "vite-plugin-checker": "^0.8.0",
         "vite-tsconfig-paths": "^5.1.3",
-        "vitest": "^2.1.6",
+        "vitest": "^2.1.8",
         "vitest-mock-extended": "^2.0.2"
     }
 }

commafeed-client/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.3.5</version>
+		<version>5.3.6</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>

commafeed-server/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.3.5</version>
+		<version>5.3.6</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
@@ -297,7 +297,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>5.3.5</version>
+			<version>5.3.6</version>
 		</dependency>
 
 		<!-- compile-time processors -->

commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java

@@ -162,7 +162,7 @@ public class HttpGetter {
 			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 @@ public class HttpGetter {
 		});
 	}
 
+	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(

commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java

@@ -94,7 +94,7 @@ class HttpGetterTest {
 						.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 @@ class HttpGetterTest {
 		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,

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>5.3.5</version>
+	<version>5.3.6</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>