Merge pull request #1278 from johnoliver/fix-etag

take into account the url when calculating etag

Author: johnoliver

adoptium-frontend-parent/adoptium-api-v3-frontend/src/main/kotlin/net/adoptium/api/v3/CacheControlService.kt

@@ -11,6 +11,9 @@ import net.adoptium.api.v3.dataSources.APIDataStore
 import org.jboss.resteasy.reactive.common.headers.CacheControlDelegate
 import org.jboss.resteasy.reactive.common.util.ExtendedCacheControl
 import org.jboss.resteasy.reactive.server.ServerResponseFilter
+import java.math.BigInteger
+import java.security.MessageDigest
+import java.util.*
 
 
 @Provider
@@ -28,9 +31,19 @@ class CacheControlService @Inject constructor(private var apiDataStore: APIDataS
         return CACHE_CONTROLLED_PATHS.any { path.startsWith(it) }
     }
 
+    private fun calculateEtag(requestContext: ContainerRequestContext): String {
+        val md = MessageDigest.getInstance("SHA1")
+        if (apiDataStore.getUpdateInfo().hexChecksum != null) {
+            md.update(HexFormat.of().parseHex(apiDataStore.getUpdateInfo().hexChecksum))
+        }
+        md.update(requestContext.uriInfo.requestUri.toString().toByteArray())
+        return BigInteger(1, md.digest()).toString(16)
+    }
+
     override fun filter(requestContext: ContainerRequestContext?) {
         if (isCacheControlledPath(requestContext)) {
-            val etag = apiDataStore.getUpdateInfo().hexChecksum
+            val etag = calculateEtag(requestContext!!)
+
             val lastModified = apiDataStore.getUpdateInfo().lastModified
 
             if (lastModified == null || etag == null) {

adoptium-frontend-parent/adoptium-api-v3-frontend/src/test/kotlin/net/adoptium/api/AssetsResourceFeatureReleasePathTest.kt

@@ -258,7 +258,7 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() {
     fun `if none match applied`() {
         RestAssured.given()
             .`when`()
-            .header("If-None-Match", "d76df8e7aefcf7")
+            .header("If-None-Match", "808bc9e876e1dd5e15b8eb3377618e1c1b313a1e")
             .get("/v3/assets/feature_releases/8/ga")
             .then()
             .statusCode(304)
@@ -268,7 +268,7 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() {
     fun `etag applied match applied`() {
         RestAssured.given()
             .`when`()
-            .header("If-Match", "d76df8e7aefcf7")
+            .header("If-Match", "808bc9e876e1dd5e15b8eb3377618e1c1b313a1e")
             .get("/v3/assets/feature_releases/8/ga")
             .then()
             .statusCode(200)

adoptium-updater-parent/adoptium-api-v3-updater/src/main/kotlin/net/adoptium/api/v3/V3Updater.kt

@@ -55,7 +55,7 @@ class V3Updater @Inject constructor(
         private val LOGGER = LoggerFactory.getLogger(this::class.java)
 
         fun calculateChecksum(repo: AdoptRepos): String {
-            val md = MessageDigest.getInstance("MD5")
+            val md = MessageDigest.getInstance("SHA256")
             val outputStream = object : OutputStream() {
                 override fun write(b: Int) {
                     md.update(b.toByte())
@@ -269,6 +269,8 @@ class V3Updater @Inject constructor(
                 LOGGER.info("Updating Release Notes")
                 adoptReleaseNotes.updateReleaseNotes(repo)
 
+                printRepoDebugInfo(currentRepo, repo, repo)
+
                 LOGGER.info("Full update done")
                 return@runBlocking repo
             }

adoptium-updater-parent/adoptium-api-v3-updater/src/test/kotlin/net/adoptium/api/V3UpdaterTest.kt

@@ -25,7 +25,7 @@ class V3UpdaterTest {
     fun `checksum works`() {
         runBlocking {
             val checksum = V3Updater.calculateChecksum(BaseTest.adoptRepos)
-            assertTrue(checksum.length == 24)
+            assertTrue(checksum.length == 44)
         }
     }