diff --git a/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/RecordSessionTests.cs b/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/RecordSessionTests.cs index 03d3e12bd6a..4e5a8ee765b 100644 --- a/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/RecordSessionTests.cs +++ b/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/RecordSessionTests.cs @@ -7,16 +7,13 @@ using System.IO; using System.Linq; using System.Text; -using System.Text.Encodings.Web; using System.Text.Json; using System.Threading.Tasks; using Azure.Core; using Azure.Core.Pipeline; using Azure.Sdk.Tools.TestProxy.Common; using Microsoft.AspNetCore.Http; -using Microsoft.VisualBasic; -using Moq; -using NuGet.ContentModel; +using Microsoft.AspNetCore.Http.Features; using Xunit; namespace Azure.Sdk.Tools.TestProxy.Tests @@ -175,6 +172,71 @@ public async Task CanRoundTripDockerDigest() Assert.Equal(sampleExpected, content); } + [Fact] + public async Task CheckDigestNotNormalized() + { + var session = TestHelpers.LoadRecordSession("Test.RecordEntries/response_with_content_digest.json"); + + DefaultHttpContext ctx = new DefaultHttpContext(); + DefaultHttpContext requestCtx = new DefaultHttpContext(); + + var handler = new RecordingHandler(Directory.GetCurrentDirectory()); + var guid = Guid.NewGuid().ToString(); + + handler.PlaybackSessions.AddOrUpdate( + guid, + session, + (key, oldValue) => session + ); + + // we know that on disk and when loaded from memory these bytes are totally untouached + // we need to make certain this is the case during matching as well + var untouchedBytes = session.Session.Entries[1].Request.Body; + + // define all this stuff where it's easy to observe it + var testEntry = new RecordEntry() + { + RequestUri = "\"https://Sanitized.azurecr.io/v2/hello-world/manifests/test", + RequestMethod = RequestMethod.Put, + Request = new RequestOrResponse() + { + Headers = new SortedDictionary() + { + { "Accept", new string[]{ "application/json" } }, + { "Accept-Encoding", new string[]{ "gzip" } }, + { "Authorization", new string[]{ "Sanitized" } }, + { "Content-Length", new string[] { "11387" } }, + { "User-Agent", new string[]{ "azsdk-go-azcontainerregistry/v0.2.2 (go1.22.2; Windows_NT)" } }, + { "Content-Type", new string[] { "application/vnd.oci.image.index.v1+json" } }, + { "x-recording-upstream-base-uri", new string[] { "https://Sanitized.azurecr.io" } } + }, + Body = untouchedBytes, + } + }; + + // now pull it into where it HAS to be, but is a fairly awkward preparation + var httpRequest = requestCtx.Request; + var httpResponse = requestCtx.Response; + httpRequest.Method = testEntry.RequestMethod.ToString(); + httpRequest.Scheme = "https"; + httpRequest.Host = new HostString("Sanitized.azurecr.io"); + httpRequest.Path = "/v2/hello-world/manifests/test"; + foreach (var header in testEntry.Request.Headers) + { + httpRequest.Headers[header.Key] = header.Value; + } + httpRequest.Body = new MemoryStream(testEntry.Request.Body); + + var requestFeature = requestCtx.Features.Get(); + if (requestFeature != null) + { + requestFeature.RawTarget = httpRequest.Path; + } + + // if we successfully match, the test is working as expected + await handler.HandlePlaybackRequest(guid, httpRequest, httpResponse); + } + [Fact] public void EnsureJsonEscaping() { diff --git a/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/Test.RecordEntries/response_with_content_digest.json b/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/Test.RecordEntries/response_with_content_digest.json index f89b903eeb9..5f69daf95c7 100644 --- a/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/Test.RecordEntries/response_with_content_digest.json +++ b/tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/Test.RecordEntries/response_with_content_digest.json @@ -10,7 +10,7 @@ ], "Accept-Encoding": "gzip", "Authorization": "Sanitized", - "User-Agent": "azsdk-go-azcontainerregistry/v0.2.2 (go1.22.2; Windows_NT)" + "User-Agent": "azsdk-go-azcontainerregistry/v0.2.2 (go1.21.6; linux)" }, "RequestBody": null, "StatusCode": 200, @@ -24,7 +24,7 @@ "Connection": "keep-alive", "Content-Length": "528", "Content-Type": "application/vnd.docker.distribution.manifest.v2+json", - "Date": "Wed, 22 May 2024 20:40:43 GMT", + "Date": "Fri, 17 May 2024 21:42:34 GMT", "Docker-Content-Digest": "sha256:93d5a28ff72d288d69b5997b8ba47396d2cbb62a72b5d87cd3351094b5d578a0", "Docker-Distribution-Api-Version": "registry/2.0", "ETag": "\"sha256:93d5a28ff72d288d69b5997b8ba47396d2cbb62a72b5d87cd3351094b5d578a0\"", @@ -35,22 +35,62 @@ ], "X-Content-Type-Options": "nosniff", "X-Ms-Client-Request-Id": "", - "X-Ms-Correlation-Request-Id": "19affbee-3510-45b1-8248-9dc23982613b", + "X-Ms-Correlation-Request-Id": "caf56438-d3ba-469d-a30c-360a4ff536c1", "X-Ms-Request-Id": "Sanitized" }, + "ResponseBody": "ewogICAic2NoZW1hVmVyc2lvbiI6IDIsCiAgICJtZWRpYVR5cGUiOiAiYXBwbGljYXRpb24vdm5kLmRvY2tlci5kaXN0cmlidXRpb24ubWFuaWZlc3QudjIranNvbiIsCiAgICJjb25maWciOiB7CiAgICAgICJtZWRpYVR5cGUiOiAiYXBwbGljYXRpb24vdm5kLmRvY2tlci5jb250YWluZXIuaW1hZ2UudjEranNvbiIsCiAgICAgICJzaXplIjogMTQ3MiwKICAgICAgImRpZ2VzdCI6ICJzaGEyNTY6MDQyYTgxNjgwOWFhYzhkMGY3ZDdjYWNhYzc5NjU3ODJlZTJlY2FjM2YyMWJjZjlmMjRiMWRlMWE3Mzg3Yjc2OSIKICAgfSwKICAgImxheWVycyI6IFsKICAgICAgewogICAgICAgICAibWVkaWFUeXBlIjogImFwcGxpY2F0aW9uL3ZuZC5kb2NrZXIuaW1hZ2Uucm9vdGZzLmRpZmYudGFyLmd6aXAiLAogICAgICAgICAic2l6ZSI6IDMzNzA2MjgsCiAgICAgICAgICJkaWdlc3QiOiAic2hhMjU2Ojg5MjFkYjI3ZGYyODMxZmE2ZWFhODUzMjEyMDVhMjQ3MGM2NjliODU1ZjNlYzk1ZDVhM2MyYjQ2ZGUwNDQyYzkiCiAgICAgIH0KICAgXQp9" + }, + { + "RequestUri": "https://Sanitized.azurecr.io/v2/hello-world/manifests/test", + "RequestMethod": "PUT", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip", + "Authorization": "Sanitized", + "Content-Length": "11387", + "Content-Type": "application/vnd.oci.image.index.v1+json", + "User-Agent": "azsdk-go-azcontainerregistry/v0.2.2 (go1.22.2; Windows_NT)" + }, + "RequestBody": "{"manifests":[{"annotations":{"com.docker.official-images.bashbrew.arch":"amd64","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:amd64\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:e2fc4e5012d16e7fe466f5291c476431beaa1f9b90a5c2125b493ed28e2aba57","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"amd64","os":"linux"},"size":861},{"annotations":{"com.docker.official-images.bashbrew.arch":"amd64","vnd.docker.reference.digest":"sha256:e2fc4e5012d16e7fe466f5291c476431beaa1f9b90a5c2125b493ed28e2aba57","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:579b3724a7b189f6dca599a46f16d801a43d5def185de0b7bcd5fb9d1e312c27","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":837},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm32v5","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:arm32v5\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:c2d891e5c2fb4c723efb72b064be3351189f62222bd3681ce7e57f2a1527362c","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"arm","os":"linux","variant":"v5"},"size":863},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm32v5","vnd.docker.reference.digest":"sha256:c2d891e5c2fb4c723efb72b064be3351189f62222bd3681ce7e57f2a1527362c","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:6901d6a88eee6e90f0baa62b020bb61c4f13194cbcd9bf568ab66e8cc3f940dd","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":566},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm32v6","org.opencontainers.image.base.name":"scratch","org.opencontainers.image.created":"2024-03-11T22:49:19Z","org.opencontainers.image.revision":"61f3ba26fe1d027b5b443c04ac2b0690fd97561a","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#61f3ba26fe1d027b5b443c04ac2b0690fd97561a:arm32v6\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:1363c810cc39a563c6f315e26951d2ed9e93f3bf929fde8223633ecf81a4a430","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"arm","os":"linux","variant":"v6"},"size":1039},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm32v6","vnd.docker.reference.digest":"sha256:1363c810cc39a563c6f315e26951d2ed9e93f3bf929fde8223633ecf81a4a430","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:085e87951950ac62a771af158d4d8275505088897a0e520a8a5bd582343631b0","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":566},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm32v7","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:arm32v7\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:20aea1c63c90d5e117db787c9fe1a8cd0ad98bedb5fd711273ffe05c084ff18a","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"arm","os":"linux","variant":"v7"},"size":863},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm32v7","vnd.docker.reference.digest":"sha256:20aea1c63c90d5e117db787c9fe1a8cd0ad98bedb5fd711273ffe05c084ff18a","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:70304c314d8a61ba1b36518624bb00bfff8d4b6016153792042de43f0453ca61","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":837},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm64v8","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:arm64v8\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:2d4e459f4ecb5329407ae3e47cbc107a2fbace221354ca75960af4c047b3cb13","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"arm64","os":"linux","variant":"v8"},"size":863},{"annotations":{"com.docker.official-images.bashbrew.arch":"arm64v8","vnd.docker.reference.digest":"sha256:2d4e459f4ecb5329407ae3e47cbc107a2fbace221354ca75960af4c047b3cb13","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:1f11fbd1720fcae3e402fc3eecb7d57c67023d2d1e11becc99ad9c7fe97d65ca","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":837},{"annotations":{"com.docker.official-images.bashbrew.arch":"i386","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:i386\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:dbbd3cf666311ad526fad9d1746177469268f32fd91b371df2ebd1c84eb22f23","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"386","os":"linux"},"size":860},{"annotations":{"com.docker.official-images.bashbrew.arch":"i386","vnd.docker.reference.digest":"sha256:dbbd3cf666311ad526fad9d1746177469268f32fd91b371df2ebd1c84eb22f23","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:18b1c92de36d42c75440c6fd6b25605cc91709d176faaccca8afe58b317bc33a","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":566},{"annotations":{"com.docker.official-images.bashbrew.arch":"mips64le","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:mips64le\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:c19784034d46da48550487c5c44639f5f92d48be7b9baf4d67b5377a454d92af","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"mips64le","os":"linux"},"size":864},{"annotations":{"com.docker.official-images.bashbrew.arch":"mips64le","vnd.docker.reference.digest":"sha256:c19784034d46da48550487c5c44639f5f92d48be7b9baf4d67b5377a454d92af","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:951bcd144ddccd1ee902dc180b435faabaaa6a8747e70cbc893f2dca16badb94","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":566},{"annotations":{"com.docker.official-images.bashbrew.arch":"ppc64le","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:ppc64le\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:f0c95f1ebb50c9b0b3e3416fb9dd4d1d197386a076c464cceea3d1f94c321b8f","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"ppc64le","os":"linux"},"size":863},{"annotations":{"com.docker.official-images.bashbrew.arch":"ppc64le","vnd.docker.reference.digest":"sha256:f0c95f1ebb50c9b0b3e3416fb9dd4d1d197386a076c464cceea3d1f94c321b8f","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:838d191bca398e46cddebc48e816da83b0389d4ed2d64f408d618521b8fd1a57","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":837},{"annotations":{"com.docker.official-images.bashbrew.arch":"riscv64","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:riscv64\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:8d064a6fc27fd5e97fa8225994a1addd872396236367745bea30c92d6c032fa3","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"riscv64","os":"linux"},"size":863},{"annotations":{"com.docker.official-images.bashbrew.arch":"riscv64","vnd.docker.reference.digest":"sha256:8d064a6fc27fd5e97fa8225994a1addd872396236367745bea30c92d6c032fa3","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:48147407c4594e45b7c3f0be1019bb0f44d78d7f037ce63e0e3da75b256f849e","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":837},{"annotations":{"com.docker.official-images.bashbrew.arch":"s390x","org.opencontainers.image.revision":"3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee","org.opencontainers.image.source":"https:\/\/github.com\/docker-library\/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:s390x\/hello-world","org.opencontainers.image.url":"https:\/\/hub.docker.com\/_\/hello-world","org.opencontainers.image.version":"linux"},"digest":"sha256:65f4b0d1802589b418bb6774d85de3d1a11d5bd971ee73cb8569504d928bb5d9","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"s390x","os":"linux"},"size":861},{"annotations":{"com.docker.official-images.bashbrew.arch":"s390x","vnd.docker.reference.digest":"sha256:65f4b0d1802589b418bb6774d85de3d1a11d5bd971ee73cb8569504d928bb5d9","vnd.docker.reference.type":"attestation-manifest"},"digest":"sha256:50f420e8710676da03668e446f1f51097b745e3e2c9807b018e569d26d4f65f7","mediaType":"application\/vnd.oci.image.manifest.v1+json","platform":{"architecture":"unknown","os":"unknown"},"size":837},{"annotations":{"com.docker.official-images.bashbrew.arch":"windows-amd64"},"digest":"sha256:bedd92f20131366f172675aa8d227f0574410df94f7f449d8abb40638b9ad774","mediaType":"application\/vnd.docker.distribution.manifest.v2+json","platform":{"architecture":"amd64","os":"windows","os.version":"10.0.20348.2527"},"size":946},{"annotations":{"com.docker.official-images.bashbrew.arch":"windows-amd64"},"digest":"sha256:8a9cdbb7d87a5b96d51acc2f988b67264986508f284302b106f453429ba88b83","mediaType":"application\/vnd.docker.distribution.manifest.v2+json","platform":{"architecture":"amd64","os":"windows","os.version":"10.0.17763.5936"},"size":946}],"mediaType":"application\/vnd.oci.image.index.v1+json","schemaVersion":2}", + "StatusCode": 401, + "ResponseHeaders": { + "Access-Control-Expose-Headers": [ + "Docker-Content-Digest", + "WWW-Authenticate", + "Link", + "X-Ms-Correlation-Request-Id" + ], + "Connection": "keep-alive", + "Content-Length": "264", + "Content-Type": "application/json; charset=utf-8", + "Date": "Tue, 18 Jun 2024 20:54:11 GMT", + "Docker-Distribution-Api-Version": "registry/2.0", + "Server": "AzureContainerRegistry", + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains", + "max-age=31536000; includeSubDomains" + ], + "WWW-Authenticate": "Bearer realm=\"https://Sanitized.azurecr.io/oauth2/token\",service=\"Sanitized.azurecr.io\",scope=\"repository:hello-world:pull,push\",error=\"insufficient_scope\"", + "X-Content-Type-Options": "nosniff", + "X-Ms-Correlation-Request-Id": "bcd1db6c-05b3-421f-9a36-969ff4a8f625" + }, "ResponseBody": { - "schemaVersion": 2, - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "config": { - "mediaType": "application/vnd.docker.container.image.v1+json", - "size": 1472, - "digest": "sha256:042a816809aac8d0f7d7cacac7965782ee2ecac3f21bcf9f24b1de1a7387b769" - }, - "layers": [ + "errors": [ { - "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", - "size": 3370628, - "digest": "sha256:8921db27df2831fa6eaa85321205a2470c669b855f3ec95d5a3c2b46de0442c9" + "code": "UNAUTHORIZED", + "message": "authentication required, visit https://aka.ms/acr/authorization for more information.", + "detail": [ + { + "Type": "repository", + "Name": "hello-world", + "Action": "pull" + }, + { + "Type": "repository", + "Name": "hello-world", + "Action": "push" + } + ] } ] } diff --git a/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/ContentTypeUtilities.cs b/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/ContentTypeUtilities.cs index 3decf6be096..2dbb3421941 100644 --- a/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/ContentTypeUtilities.cs +++ b/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/ContentTypeUtilities.cs @@ -10,6 +10,15 @@ namespace Azure.Sdk.Tools.TestProxy.Common { internal static class ContentTypeUtilities { + + public static bool IsManifestContentType(string contentType) + { + const string dockerManifest = "application/vnd.docker.distribution.manifest.v"; + const string dockerIndex = "application/vnd.oci.image.index.v"; + + return contentType.Contains(dockerManifest) || contentType.Contains(dockerIndex); + } + public static bool TryGetTextEncoding(string contentType, out Encoding encoding) { const string charsetMarker = "; charset="; @@ -22,7 +31,6 @@ public static bool TryGetTextEncoding(string contentType, out Encoding encoding) // Default is technically US-ASCII, but will default to UTF-8 which is a superset. const string appFormUrlEncoded = "application/x-www-form-urlencoded"; - const string dockerManifest = "application/vnd.docker.distribution.manifest.v2"; if (contentType == null) { @@ -41,7 +49,6 @@ public static bool TryGetTextEncoding(string contentType, out Encoding encoding) } } - if ( ( contentType.StartsWith(textContentTypePrefix, StringComparison.OrdinalIgnoreCase) || @@ -50,7 +57,7 @@ public static bool TryGetTextEncoding(string contentType, out Encoding encoding) contentType.EndsWith(urlEncodedSuffix, StringComparison.OrdinalIgnoreCase) || contentType.StartsWith(appJsonPrefix, StringComparison.OrdinalIgnoreCase) || contentType.StartsWith(appFormUrlEncoded, StringComparison.OrdinalIgnoreCase) - ) && !contentType.Contains(dockerManifest) + ) && !ContentTypeUtilities.IsManifestContentType(contentType) ) { encoding = Encoding.UTF8; diff --git a/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/RecordEntry.cs b/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/RecordEntry.cs index 8e35ee47974..235780323c0 100644 --- a/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/RecordEntry.cs +++ b/tools/test-proxy/Azure.Sdk.Tools.TestProxy/Common/RecordEntry.cs @@ -126,7 +126,7 @@ private static void DeserializeBody(RequestOrResponse requestOrResponse, in Json public static void NormalizeJsonBody(RequestOrResponse requestOrResponse) { - if (requestOrResponse.TryGetContentType(out string contentType) && contentType.Contains("json")) + if (requestOrResponse.TryGetContentType(out string contentType) && contentType.Contains("json") && !ContentTypeUtilities.IsManifestContentType(contentType)) { try {