remove AcceptorConfiguration::allowedPlaintextUpgradeProtocols

Summary: * we're seeking to deprecate native upgrades (i.e. upgrading http/1.1->http/2 via "connection: upgrade" header)

Reviewed By: afrind

Differential Revision: D74831717

fbshipit-source-id: a06097ab74861e6171ff35e6c6e850ec1447dd8f

Author: hanidamlaj

hphp/runtime/server/proxygen/proxygen-server.cpp

@@ -269,8 +269,6 @@ ProxygenServer::ProxygenServer(
   m_httpsConfig->initialReceiveWindow = kStreamFlowControl;
   m_httpsConfig->receiveSessionWindowSize = kConnFlowControl;
   if (Cfg::Server::EnableH2C) {
-    m_httpConfig->allowedPlaintextUpgradeProtocols = {
-      proxygen::http2::kProtocolCleartextString };
     m_httpConfig->initialReceiveWindow = kStreamFlowControl;
     m_httpConfig->receiveSessionWindowSize = kConnFlowControl;
   }

third-party/proxygen/src/proxygen/lib/http/session/HTTPDefaultSessionCodecFactory.cpp

@@ -16,8 +16,6 @@ proxygen::HTTPCodecFactory::CodecConfig getCodecConfigFromAcceptorConfig(
     const proxygen::AcceptorConfiguration& accConfig) {
   proxygen::HTTPCodecFactory::CodecConfig config;
   config.h1.forceHTTP1xCodecTo1_1 = accConfig.forceHTTP1_0_to_1_1;
-  config.h1.allowedH1UpgradeProtocols =
-      accConfig.allowedPlaintextUpgradeProtocols;
   config.h2.headerIndexingStrategy = accConfig.headerIndexingStrategy;
   return config;
 }

third-party/proxygen/src/proxygen/lib/http/session/test/HTTPDefaultSessionCodecFactoryTest.cpp

@@ -39,27 +39,6 @@ TEST(HTTPDefaultSessionCodecFactoryTest, GetCodecH2) {
   EXPECT_EQ(http1Codec->getProtocol(), CodecProtocol::HTTP_1_1);
 }
 
-TEST(HTTPDefaultSessionCodecFactoryTest, GetCodecUpgradeProtocols) {
-  std::list<std::string> plainTextUpgrades = {http2::kProtocolCleartextString};
-  auto conf = std::make_shared<AcceptorConfiguration>();
-  conf->allowedPlaintextUpgradeProtocols = plainTextUpgrades;
-  HTTPDefaultSessionCodecFactory factory(std::move(conf));
-
-  auto codec =
-      factory.getCodec("http/1.1", TransportDirection::DOWNSTREAM, false);
-  HTTP1xCodec* downstreamCodec = dynamic_cast<HTTP1xCodec*>(codec.get());
-  EXPECT_NE(downstreamCodec, nullptr);
-  EXPECT_FALSE(downstreamCodec->getAllowedUpgradeProtocols().empty());
-  EXPECT_EQ(downstreamCodec->getAllowedUpgradeProtocols(),
-            http2::kProtocolCleartextString);
-
-  // If TLS, we should not attempt to upgrade.
-  codec = factory.getCodec("http/1.1", TransportDirection::DOWNSTREAM, true);
-  downstreamCodec = dynamic_cast<HTTP1xCodec*>(codec.get());
-  EXPECT_NE(downstreamCodec, nullptr);
-  EXPECT_TRUE(downstreamCodec->getAllowedUpgradeProtocols().empty());
-}
-
 TEST(HTTPDefaultSessionCodecFactoryTest, GetCodec) {
   auto conf = std::make_shared<AcceptorConfiguration>();
   HTTPDefaultSessionCodecFactory factory(std::move(conf));

third-party/proxygen/src/proxygen/lib/services/AcceptorConfiguration.h

@@ -46,11 +46,6 @@ struct AcceptorConfiguration : public wangle::ServerSocketConfig {
    */
   std::string plaintextProtocol;
 
-  /**
-   * Comma separated string of protocols that can be upgraded to from HTTP/1.1
-   */
-  std::list<std::string> allowedPlaintextUpgradeProtocols;
-
   /**
    * True if HTTP/1.0 messages should always be serialized as HTTP/1.1
    *