commit 463b2934e2857195fa56003fdff0127d130089d0
author Ed Tanous <etanous@nvidia.com> Tue Jul 16 17:02:42 2024 -0700
committer Ed Tanous <ed@tanous.net> Tue Dec 03 17:05:43 2024 +0000
tree cb8f0591b222b00eb1326937085de9ba85ea0e8a
parent 90fcc26a44645c69f57629de84645839e4dead6c

Make accepts a real parser

We somewhat copped out a little with regards to this originally, because
writing parsers is hard, and we don't have to implement the full field
of what the Accepts header allows.

We should aim to be correct where we can, so implement a real parser
that parses values, including the floats.

Tested: Unit tests pass, good coverage.

Change-Id: I1b4232929367d230641be9f41f5af6e6dbcea037
Signed-off-by: Ed Tanous <etanous@nvidia.com>

test/include/http_utility_test.cpp

diff --git a/test/include/http_utility_test.cpp b/test/include/http_utility_test.cpp
index d4823da..72c4759 100644
--- a/test/include/http_utility_test.cpp
+++ b/test/include/http_utility_test.cpp
@@ -60,6 +60,18 @@
     EXPECT_EQ(getPreferredContentType("text/html, application/json", htmlJson),
               ContentType::HTML);
 
+    // String the chrome gives
+    EXPECT_EQ(getPreferredContentType(
+                  "text/html,"
+                  "application/xhtml+xml,"
+                  "application/xml;q=0.9,"
+                  "image/avif,"
+                  "image/webp,"
+                  "image/apng,*/*;q=0.8,"
+                  "application/signed-exchange;v=b3;q=0.7",
+                  htmlJson),
+              ContentType::HTML);
+
     std::array<ContentType, 2> jsonHtml{ContentType::JSON, ContentType::HTML};
     EXPECT_EQ(getPreferredContentType("text/html, application/json", jsonHtml),
               ContentType::HTML);
@@ -72,6 +84,27 @@
     EXPECT_EQ(getPreferredContentType("application/json", cborJson),
               ContentType::JSON);
     EXPECT_EQ(getPreferredContentType("*/*", cborJson), ContentType::ANY);
+
+    // Application types with odd characters
+    EXPECT_EQ(getPreferredContentType(
+                  "application/prs.nprend, application/json", cborJson),
+              ContentType::JSON);
+
+    EXPECT_EQ(getPreferredContentType("application/rdf+xml, application/json",
+                                      cborJson),
+              ContentType::JSON);
+
+    // Q values are ignored, but should parse
+    EXPECT_EQ(getPreferredContentType(
+                  "application/rdf+xml;q=0.9, application/json", cborJson),
+              ContentType::JSON);
+    EXPECT_EQ(getPreferredContentType(
+                  "application/rdf+xml;q=1, application/json", cborJson),
+              ContentType::JSON);
+    EXPECT_EQ(getPreferredContentType("application/json;q=0.9", cborJson),
+              ContentType::JSON);
+    EXPECT_EQ(getPreferredContentType("application/json;q=1", cborJson),
+              ContentType::JSON);
 }
 
 TEST(getPreferredContentType, NegativeTest)