fix: Use content headers when parsing HTTP requests/responses

Fixes #221

Signed-off-by: Jon Skeet <jonskeet@google.com>

Author: jskeet

src/CloudNative.CloudEvents/Http/HttpClientExtensions.cs

@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Mime;
@@ -36,7 +35,7 @@ public static bool IsCloudEvent(this HttpRequestMessage httpRequestMessage)
         {
             Validation.CheckNotNull(httpRequestMessage, nameof(httpRequestMessage));
             return HasCloudEventsContentType(httpRequestMessage.Content) ||
-                httpRequestMessage.Headers.Contains(HttpUtilities.SpecVersionHttpHeader);
+                (MaybeGetVersionId(httpRequestMessage.Headers) ?? MaybeGetVersionId(httpRequestMessage.Content?.Headers)) is not null;
         }
 
         /// <summary>
@@ -48,7 +47,7 @@ public static bool IsCloudEvent(this HttpResponseMessage httpResponseMessage)
         {
             Validation.CheckNotNull(httpResponseMessage, nameof(httpResponseMessage));
             return HasCloudEventsContentType(httpResponseMessage.Content) ||
-                httpResponseMessage.Headers.Contains(HttpUtilities.SpecVersionHttpHeader);
+                (MaybeGetVersionId(httpResponseMessage.Headers) ?? MaybeGetVersionId(httpResponseMessage.Content?.Headers)) is not null;
         }
 
         /// <summary>
@@ -143,9 +142,7 @@ private static async Task<CloudEvent> ToCloudEventInternalAsync(HttpHeaders head
             }
             else
             {
-                string? versionId = headers.Contains(HttpUtilities.SpecVersionHttpHeader)
-                    ? headers.GetValues(HttpUtilities.SpecVersionHttpHeader).First()
-                    : null;
+                string? versionId = MaybeGetVersionId(headers) ?? MaybeGetVersionId(content.Headers);
                 if (versionId is null)
                 {
                     throw new ArgumentException($"Request does not represent a CloudEvent. It has neither a {HttpUtilities.SpecVersionHttpHeader} header, nor a suitable content type.", nameof(paramName));
@@ -154,7 +151,7 @@ private static async Task<CloudEvent> ToCloudEventInternalAsync(HttpHeaders head
                     ?? throw new ArgumentException($"Unknown CloudEvents spec version '{versionId}'", paramName);
 
                 var cloudEvent = new CloudEvent(version, extensionAttributes);
-                foreach (var header in headers)
+                foreach (var header in headers.Concat(content.Headers))
                 {
                     string? attributeName = HttpUtilities.GetAttributeNameFromHeaderName(header.Key);
                     if (attributeName is null || attributeName == CloudEventsSpecVersion.SpecVersionAttribute.Name)
@@ -174,6 +171,8 @@ private static async Task<CloudEvent> ToCloudEventInternalAsync(HttpHeaders head
                 }
                 return Validation.CheckCloudEventArgument(cloudEvent, paramName);
             }
+
+
         }
 
         /// <summary>
@@ -345,5 +344,10 @@ private static bool HasCloudEventsContentType(HttpContent content) =>
 
         private static bool HasCloudEventsBatchContentType(HttpContent content) =>
             MimeUtilities.IsCloudEventsBatchContentType(content?.Headers?.ContentType?.MediaType);
+
+        private static string? MaybeGetVersionId(HttpHeaders? headers) =>
+            headers is not null && headers.Contains(HttpUtilities.SpecVersionHttpHeader)
+            ? headers.GetValues(HttpUtilities.SpecVersionHttpHeader).First()
+            : null;
     }
 }

test/CloudNative.CloudEvents.UnitTests/Http/HttpClientExtensionsTest.cs

@@ -8,7 +8,6 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -40,6 +39,20 @@ public class HttpClientExtensionsTest : HttpTestBase
                 "Structured",
                 new StringContent("content is ignored", Encoding.UTF8, "application/cloudevents+json"),
                 null
+            },
+            {
+                "Binary with header in content",
+                new StringContent("header is in the content", Encoding.UTF8, "application/json")
+                {
+                    Headers =
+                    {
+                        { "ce-specversion", "1.0" },
+                        { "ce-type", "test-type" },
+                        { "ce-id", "test-id" },
+                        { "ce-source", "//test" }
+                    }
+                },
+                null
             }
         };
 
@@ -203,7 +216,7 @@ public async Task HttpBinaryClientReceiveTest()
                 };
 
                 await cloudEvent.CopyToHttpListenerResponseAsync(context.Response, ContentMode.Binary, new JsonEventFormatter());
-                context.Response.StatusCode = (int)HttpStatusCode.OK;
+                context.Response.StatusCode = (int) HttpStatusCode.OK;
             });
 
             var httpClient = new HttpClient();
@@ -270,7 +283,7 @@ public async Task HttpBinaryClientSendTest()
                 Assert.Equal("value", receivedCloudEvent["comexampleextension1"]);
                 // The non-ASCII attribute value should have been correctly URL-decoded.
                 Assert.Equal("æøå", receivedCloudEvent["utf8examplevalue"]);
-                context.Response.StatusCode = (int)HttpStatusCode.NoContent;
+                context.Response.StatusCode = (int) HttpStatusCode.NoContent;
                 return Task.CompletedTask;
             });
 
@@ -301,7 +314,7 @@ public async Task HttpStructuredClientReceiveTest()
                 };
 
                 await cloudEvent.CopyToHttpListenerResponseAsync(context.Response, ContentMode.Structured, new JsonEventFormatter());
-                context.Response.StatusCode = (int)HttpStatusCode.OK;
+                context.Response.StatusCode = (int) HttpStatusCode.OK;
             });
 
             var httpClient = new HttpClient();
@@ -371,7 +384,7 @@ public async Task HttpStructuredClientSendTest()
 
                 Assert.Equal("value", receivedCloudEvent["comexampleextension1"]);
                 Assert.Equal("æøå", receivedCloudEvent["utf8examplevalue"]);
-                context.Response.StatusCode = (int)HttpStatusCode.NoContent;
+                context.Response.StatusCode = (int) HttpStatusCode.NoContent;
                 return Task.CompletedTask;
             });
 
@@ -438,6 +451,32 @@ public async Task ToHttpContent_Batch()
             AssertBatchesEqual(batch, parsedBatch);
         }
 
+        [Theory]
+        [InlineData(ContentMode.Binary)]
+        [InlineData(ContentMode.Structured)]
+        public async Task RoundtripRequest(ContentMode contentMode)
+        {
+            var cloudEvent = new CloudEvent().PopulateRequiredAttributes();
+            var formatter = new JsonEventFormatter();
+            var content = cloudEvent.ToHttpContent(contentMode, formatter);
+            var request = new HttpRequestMessage { Content = content };
+            var parsed = await request.ToCloudEventAsync(formatter);
+            AssertCloudEventsEqual(cloudEvent, parsed);
+        }
+
+        [Theory]
+        [InlineData(ContentMode.Binary)]
+        [InlineData(ContentMode.Structured)]
+        public async Task RoundtripResponse(ContentMode contentMode)
+        {
+            var cloudEvent = new CloudEvent().PopulateRequiredAttributes();
+            var formatter = new JsonEventFormatter();
+            var content = cloudEvent.ToHttpContent(contentMode, formatter);
+            var request = new HttpResponseMessage { Content = content };
+            var parsed = await request.ToCloudEventAsync(formatter);
+            AssertCloudEventsEqual(cloudEvent, parsed);
+        }
+
         internal static void CopyHeaders(IDictionary<string, string>? source, HttpHeaders target)
         {
             if (source is null)