Consolidate disallowedModernHTTPFields()

Summary: Cleaning up duplicate perHopHeaderCodes by introducing disallowedModernHTTPFields. perHopHeaderCodes is for all HTTP versions and disallowedModernHTTPFields is specifically for RFC 9113, or H2.

Reviewed By: afrind

Differential Revision: D71986737

fbshipit-source-id: 5de0da57af6e7e1ebc302ce1ce7054db2b128c71

Author: Joanna Jo

proxygen/lib/http/codec/CodecUtil.cpp

@@ -89,21 +89,9 @@ bool CodecUtil::appendHeaders(const HTTPHeaders& inputHeaders,
   inputHeaders.forEachWithCode([&](HTTPHeaderCode code,
                                    const std::string& name,
                                    const std::string& value) {
-    static const std::bitset<256> s_perHopHeaderCodes{[] {
-      std::bitset<256> bs;
-      // HTTP/1.x per-hop headers that have no meaning in HTTP/2
-      bs[HTTP_HEADER_CONNECTION] = true;
-      bs[HTTP_HEADER_HOST] = true;
-      bs[HTTP_HEADER_KEEP_ALIVE] = true;
-      bs[HTTP_HEADER_PROXY_CONNECTION] = true;
-      bs[HTTP_HEADER_TRANSFER_ENCODING] = true;
-      bs[HTTP_HEADER_UPGRADE] = true;
-      bs[HTTP_HEADER_SEC_WEBSOCKET_KEY] = true;
-      bs[HTTP_HEADER_SEC_WEBSOCKET_ACCEPT] = true;
-      return bs;
-    }()};
-
-    if (s_perHopHeaderCodes[code] || name.size() == 0 || name[0] == ':') {
+    auto s_disallowedModernHTTPFields = disallowedModernHTTPFields();
+    if (s_disallowedModernHTTPFields[code] || name.size() == 0 ||
+        name[0] == ':') {
       DCHECK_GT(name.size(), 0) << "Empty header";
       DCHECK_NE(name[0], ':') << "Invalid header=" << name;
       return;
@@ -124,8 +112,8 @@ bool CodecUtil::appendHeaders(const HTTPHeaders& inputHeaders,
   return headerToCheckExists;
 }
 
-const std::bitset<256>& CodecUtil::perHopHeaderCodes() {
-  static const std::bitset<256> s_perHopHeaderCodes{[] {
+const std::bitset<256>& CodecUtil::disallowedModernHTTPFields() {
+  static const std::bitset<256> s_disallowedModernHTTPFields{[] {
     std::bitset<256> bs;
     // HTTP/1.x per-hop headers that have no meaning in HTTP/2
     bs[HTTP_HEADER_CONNECTION] = true;
@@ -138,7 +126,7 @@ const std::bitset<256>& CodecUtil::perHopHeaderCodes() {
     bs[HTTP_HEADER_SEC_WEBSOCKET_ACCEPT] = true;
     return bs;
   }()};
-  return s_perHopHeaderCodes;
+  return s_disallowedModernHTTPFields;
 }
 
 std::string CodecUtil::debugString(const HTTPMessage& msg, uint8_t debugLevel) {

proxygen/lib/http/codec/CodecUtil.h

@@ -192,7 +192,7 @@ class CodecUtil {
                             std::vector<compress::Header>& headers,
                             HTTPHeaderCode headerToCheck);
 
-  static const std::bitset<256>& perHopHeaderCodes();
+  static const std::bitset<256>& disallowedModernHTTPFields();
 
   /**
    * Generates debug strings that omit the header values

proxygen/lib/http/codec/compress/HPACKCodec.cpp

@@ -119,7 +119,7 @@ void HPACKCodec::encodeHTTP(
   auto headerEncodeHelper = [&](HTTPHeaderCode code,
                                 const std::string& name,
                                 const std::string& value) {
-    if (CodecUtil::perHopHeaderCodes()[code] || name.empty() ||
+    if (CodecUtil::disallowedModernHTTPFields()[code] || name.empty() ||
         name[0] == ':') {
       DCHECK(!name.empty()) << "Empty header";
       DCHECK_NE(name[0], ':') << "Invalid header=" << name;

proxygen/lib/http/codec/compress/QPACKCodec.cpp

@@ -140,7 +140,7 @@ std::unique_ptr<folly::IOBuf> QPACKCodec::encodeHTTP(
   auto headerEncodeHelper = [&](HTTPHeaderCode code,
                                 folly::StringPiece name,
                                 folly::StringPiece value) {
-    if (CodecUtil::perHopHeaderCodes()[code] || name.empty() ||
+    if (CodecUtil::disallowedModernHTTPFields()[code] || name.empty() ||
         name[0] == ':') {
       DCHECK(!name.empty()) << "Empty header";
       DCHECK_NE(name[0], ':') << "Invalid header=" << name;