diff options
author | Ed Tanous <edtanous@google.com> | 2022-09-22 01:28:04 +0300 |
---|---|---|
committer | Gunnar Mills <gmills@us.ibm.com> | 2022-09-22 23:37:39 +0300 |
commit | 4a0e1a0cf378e7bf4909c2ea8fc6e77e0d77ca6d (patch) | |
tree | 30e03e09b078d0bb2d1f6812852beb75f0569939 /test/include | |
parent | 656472d942f46194bcd6f59c6eca4658fee20c71 (diff) | |
download | bmcweb-4a0e1a0cf378e7bf4909c2ea8fc6e77e0d77ca6d.tar.xz |
Fix content-type return behavior for */*
An HTTP header of Accepts: */* throws a big wrench into our
implementation for a couple reasons. First, because it's the default in
a lot of commonly-used libraries, and second, because clients use it
when they certainly don't mean what the specification says it should
mean "ie, I accept ANY type".
This commit tries to address some of that, by making an explicit option
for content-type="ANY" and pushes it to the individual callers to handle
explicitly as if it were yet another type. In most protocols, there's a
"most common" representation, so protocols are free to use that, or to
explicitly handle it, and require that the user be explicit.
Tested:
Redfish Protocol Validator no longer locks up. (TBD, getting bugs filed
with protocol validator for this missing Accepts header).
For ServiceRoot
GET /redfish/v1 Accepts: application/json - returns json
GET /redfish/v1 Accepts: */* - returns json
GET /redfish/v1 Accepts: text/html - returns html
GET /redfish/v1 no-accepts header - returns json
Redfish-service-validator passes.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Iae6711ae587115d3e159a48a6fc46a903ed6c403
Diffstat (limited to 'test/include')
-rw-r--r-- | test/include/http_utility_test.cpp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/test/include/http_utility_test.cpp b/test/include/http_utility_test.cpp index d1df6d1087..6878001e6a 100644 --- a/test/include/http_utility_test.cpp +++ b/test/include/http_utility_test.cpp @@ -13,38 +13,42 @@ namespace TEST(isContentTypeAllowed, PositiveTest) { - EXPECT_TRUE(isContentTypeAllowed("*/*, application/octet-stream", - ContentType::OctetStream)); + EXPECT_TRUE(isContentTypeAllowed("*/*", ContentType::HTML, true)); EXPECT_TRUE(isContentTypeAllowed("application/octet-stream", - ContentType::OctetStream)); - EXPECT_TRUE(isContentTypeAllowed("text/html", ContentType::HTML)); - EXPECT_TRUE(isContentTypeAllowed("application/json", ContentType::JSON)); - EXPECT_TRUE(isContentTypeAllowed("application/cbor", ContentType::CBOR)); + ContentType::OctetStream, false)); + EXPECT_TRUE(isContentTypeAllowed("text/html", ContentType::HTML, false)); EXPECT_TRUE( - isContentTypeAllowed("application/json, text/html", ContentType::HTML)); + isContentTypeAllowed("application/json", ContentType::JSON, false)); + EXPECT_TRUE( + isContentTypeAllowed("application/cbor", ContentType::CBOR, false)); + EXPECT_TRUE(isContentTypeAllowed("application/json, text/html", + ContentType::HTML, false)); } TEST(isContentTypeAllowed, NegativeTest) { + EXPECT_FALSE(isContentTypeAllowed("application/octet-stream", + ContentType::HTML, false)); + EXPECT_FALSE( + isContentTypeAllowed("application/html", ContentType::JSON, false)); EXPECT_FALSE( - isContentTypeAllowed("application/octet-stream", ContentType::HTML)); - EXPECT_FALSE(isContentTypeAllowed("application/html", ContentType::JSON)); - EXPECT_FALSE(isContentTypeAllowed("application/json", ContentType::CBOR)); - EXPECT_FALSE(isContentTypeAllowed("application/cbor", ContentType::HTML)); + isContentTypeAllowed("application/json", ContentType::CBOR, false)); + EXPECT_FALSE( + isContentTypeAllowed("application/cbor", ContentType::HTML, false)); EXPECT_FALSE(isContentTypeAllowed("application/json, text/html", - ContentType::OctetStream)); + ContentType::OctetStream, false)); } TEST(isContentTypeAllowed, ContainsAnyMimeTypeReturnsTrue) { EXPECT_TRUE( - isContentTypeAllowed("text/html, */*", ContentType::OctetStream)); + isContentTypeAllowed("text/html, */*", ContentType::OctetStream, true)); } TEST(isContentTypeAllowed, ContainsQFactorWeightingReturnsTrue) { - EXPECT_TRUE( - isContentTypeAllowed("text/html, */*;q=0.8", ContentType::OctetStream)); + EXPECT_TRUE(isContentTypeAllowed("text/html, */*;q=0.8", + ContentType::OctetStream, true)); } TEST(getPreferedContentType, PositiveTest) @@ -69,6 +73,7 @@ TEST(getPreferedContentType, PositiveTest) EXPECT_EQ(getPreferedContentType("application/json", cborJson), ContentType::JSON); + EXPECT_EQ(getPreferedContentType("*/*", cborJson), ContentType::ANY); } TEST(getPreferedContentType, NegativeTest) |