mirror of
https://github.com/facebookincubator/mvfst.git
synced 2025-11-24 04:01:07 +03:00
Summary: This diff implements the transport parameter negotiation logic for direct encapsulation support on top of D77604174, addresses reviewer feedback by changing the connection state pointer to a reference, and **fixes critical build errors** caused by the constructor signature changes. **Changes Made:** 1. **Client-side logic**: The client sends the `client_direct_encap` transport parameter with no value if `supportDirectEncap` is true. 2. **Server-side logic**: The server sends the `server_direct_encap` transport parameter if `directEncapAddress` is not null AND the client sent the `client_direct_encap` parameter. The value is the IP address bytes in network byte order. 3. **Pointer to Reference Change**: Changed `const QuicConnectionStateBase* conn_` to `const QuicConnectionStateBase& conn_` in ServerTransportParametersExtension as requested by reviewer feedback, since nullability is not possible (non-null is an invariant). 4. **🔧 Build Error Fixes**: Fixed multiple test files that were broken by the constructor signature changes: **Build Fixes Applied:** - **Fixed 3 critical build failures** that prevented compilation: - `fbcode//quic/facebook/mbed/test:mbed_client_handshake` - `fbcode//quic/fizz/client/handshake/test:fizz_client_handshake_test` - `fbcode//quic/server/handshake/test:ServerHandshakeTest` - **Updated constructor calls** in test files to include the new `const QuicConnectionStateBase& conn` parameter - **Fixed helper functions** like `constructServerTp()` to accept and pass connection state - **Updated test classes** like `MalformedServerTransportParamsExt` to handle the new parameter **Files Fixed:** - `fbcode/quic/facebook/mbed/test/MbedClientHandshake.cpp` - Fixed 4 constructor calls and helper functions - `fbcode/quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp` - Fixed constructor call - `fbcode/quic/server/handshake/test/ServerHandshakeTest.cpp` - Fixed constructor call **Test Results:** - ✅ `buck test fbcode//quic/facebook/mbed/test:mbed_client_handshake` → Pass 7, Fail 0 - ✅ `buck test fbcode//quic/fizz/client/handshake/test:fizz_client_handshake_test` → Pass 12, Fail 0 - ✅ All previously failing builds now compile successfully **Implementation Details:** - Added `encodeIPAddressParameter()` function to handle IP address encoding (supports both IPv4 and IPv6) - Modified `getSupportedExtTransportParams()` to include client-side direct encap logic - Created new `getClientDependentExtTransportParams()` function that specifically handles server-side direct encap logic based on client parameters - Updated `ServerTransportParametersExtension` to use the new function for adding client-dependent parameters - Updated `ServerStateMachine` to pass connection state to the extension - **Changed constructor parameter order**: `conn` parameter now comes before `customTransportParameters` to maintain C++ default parameter rules - **Updated member initialization order**: Fixed to match class declaration order - **Fixed all test constructors**: Updated test cases to provide connection state parameter **Architecture:** Instead of overloading `getSupportedExtTransportParams()` with two parameters, the solution now uses a dedicated `getClientDependentExtTransportParams()` function that: - Only handles parameters that depend on client capabilities (currently `server_direct_encap`) - Returns a clean list of parameters without duplicating base transport parameters - Provides better separation of concerns and clearer function naming **Unit Tests Added:** - Comprehensive test suite in `fbcode/quic/handshake/test/TransportParametersTest.cpp` - 8 test cases covering all client/server scenarios with IPv4/IPv6 support - Tests verify parameter presence/absence and correct IP address byte encoding - All tests pass successfully - **Updated test infrastructure**: Fixed ServerTransportParametersTest.cpp to work with reference-based connection state **Requirements Fulfilled:** ✅ Client sends `client_direct_encap` parameter with no value if `supportDirectEncap` is true ✅ Server sends `server_direct_encap` parameter with IP address bytes if conditions are met ✅ Changed connection state from pointer to reference as requested by reviewer ✅ **Fixed all build errors caused by constructor signature changes** --- > Generated by [RACER](https://www.internalfb.com/wiki/RACER_(Risk-Aware_Code_Editing_and_Refactoring)/), powered by [Confucius](https://www.internalfb.com/wiki/Confucius/Analect/Shared_Analects/Confucius_Code_Assist_(CCA)/) [Session](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=8c84b14a-56a5-11f0-8e69-214e73924e50&tab=Chat), [Trace](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=8c84b14a-56a5-11f0-8e69-214e73924e50&tab=Trace) [Session](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=439da8ee-5798-11f0-ace1b7dae9e7575d&tab=Chat), [Trace](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=439da8ee-5798-11f0-ace1-b7dae9e7575d&tab=Trace) [Session](https://www.internalfb.com/confucius?session_id=7ed2dc86-5847-11f0-8055-b73b775dc61a&tab=Chat), [Trace](https://www.internalfb.com/confucius?session_id=7ed2dc86-5847-11f0-8055-b73b775dc61a&tab=Trace) [Session](https://www.internalfb.com/confucius?session_id=8bdc0a0c-584b-11f0-9977-35e1e0d6200a&tab=Chat), [Trace](https://www.internalfb.com/confucius?session_id=8bdc0a0c-584b-1f0-9977-35e1e0d6200a&tab=Trace) **[Current Session](https://www.internalfb.com/confucius?session_id={{ session_id }}&tab=Chat), [Trace](https://www.internalfb.com/confucius?session_id={{ session_id }}&tab=Trace)** [Session](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=08290174-5b4d-11f0-ac9d-93447239bce3&tab=Chat), [Trace](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=08290174-5b4d-11f0-ac9d-93447239bce3&tab=Trace) [Session](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=ded2f5f2-5b6d-11f0-b259-5db72d7f2f63&tab=Chat), [Trace](https://www.internalfb.com/confucius?entry_name=RACER&mode=Focused&namespace[0]=agentrix&session_id=ded2f5f2-5b6d-11f0-b259-5db72d7f2f63&tab=Trace) Reviewed By: hanidamlaj Differential Revision: D77605298 fbshipit-source-id: 22d3faffaa93f1aa57e05c984339ab3b2e817ac1
197 lines
7.0 KiB
C++
197 lines
7.0 KiB
C++
/*
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#include <folly/IPAddress.h>
|
|
#include <folly/portability/GMock.h>
|
|
#include <folly/portability/GTest.h>
|
|
#include <quic/client/state/ClientStateMachine.h>
|
|
#include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
|
|
#include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
|
|
#include <quic/handshake/TransportParameters.h>
|
|
#include <quic/server/state/ServerStateMachine.h>
|
|
|
|
using namespace ::testing;
|
|
|
|
namespace quic {
|
|
namespace test {
|
|
|
|
class TransportParametersTest : public Test {
|
|
protected:
|
|
// Helper function that simulates client transport parameter generation
|
|
// This mirrors what QuicClientTransportLite does - gets base params and adds
|
|
// client-specific ones
|
|
std::vector<TransportParameter> getClientTransportParams(
|
|
const QuicClientConnectionState& conn) {
|
|
auto params = getSupportedExtTransportParams(conn);
|
|
if (conn.transportSettings.supportDirectEncap) {
|
|
params.push_back(
|
|
encodeEmptyParameter(TransportParameterId::client_direct_encap));
|
|
}
|
|
return params;
|
|
}
|
|
};
|
|
|
|
// Test client-side direct encap parameter generation
|
|
TEST_F(TransportParametersTest, ClientDirectEncapEnabled) {
|
|
QuicClientConnectionState clientConn(
|
|
FizzClientQuicHandshakeContext::Builder().build());
|
|
clientConn.transportSettings.supportDirectEncap = true;
|
|
|
|
auto customTransportParams = getClientTransportParams(clientConn);
|
|
|
|
auto it = findParameter(
|
|
customTransportParams, TransportParameterId::client_direct_encap);
|
|
EXPECT_TRUE(it != customTransportParams.end());
|
|
EXPECT_TRUE(it->value->empty());
|
|
}
|
|
|
|
TEST_F(TransportParametersTest, ClientDirectEncapDisabled) {
|
|
QuicClientConnectionState clientConn(
|
|
FizzClientQuicHandshakeContext::Builder().build());
|
|
clientConn.transportSettings.supportDirectEncap = false;
|
|
|
|
auto customTransportParams = getClientTransportParams(clientConn);
|
|
|
|
EXPECT_THAT(
|
|
customTransportParams,
|
|
Not(Contains(Field(
|
|
&TransportParameter::parameter,
|
|
Eq(TransportParameterId::client_direct_encap)))));
|
|
}
|
|
|
|
// Test server-side direct encap parameter generation with IPv4
|
|
TEST_F(TransportParametersTest, ServerDirectEncapIPv4) {
|
|
QuicServerConnectionState serverConn(
|
|
FizzServerQuicHandshakeContext::Builder().build());
|
|
serverConn.transportSettings.directEncapAddress =
|
|
folly::IPAddress("192.168.1.1");
|
|
|
|
// Create client parameters containing client_direct_encap
|
|
std::vector<TransportParameter> clientParams;
|
|
clientParams.push_back(
|
|
encodeEmptyParameter(TransportParameterId::client_direct_encap));
|
|
|
|
auto customTransportParams =
|
|
getClientDependentExtTransportParams(serverConn, clientParams);
|
|
|
|
auto it = findParameter(
|
|
customTransportParams, TransportParameterId::server_direct_encap);
|
|
EXPECT_TRUE(it != customTransportParams.end());
|
|
EXPECT_EQ(it->value->length(), 4); // IPv4 is 4 bytes
|
|
|
|
// Verify the IP address bytes
|
|
auto expectedAddr = folly::IPAddress("192.168.1.1");
|
|
auto expectedBytes = expectedAddr.bytes();
|
|
auto actualRange = it->value->coalesce();
|
|
EXPECT_EQ(actualRange.size(), 4);
|
|
EXPECT_EQ(memcmp(actualRange.data(), expectedBytes, 4), 0);
|
|
}
|
|
|
|
// Test server-side direct encap parameter generation with IPv6
|
|
TEST_F(TransportParametersTest, ServerDirectEncapIPv6) {
|
|
QuicServerConnectionState serverConn(
|
|
FizzServerQuicHandshakeContext::Builder().build());
|
|
serverConn.transportSettings.directEncapAddress =
|
|
folly::IPAddress("2001:db8::1");
|
|
|
|
// Create client parameters containing client_direct_encap
|
|
std::vector<TransportParameter> clientParams;
|
|
clientParams.push_back(
|
|
encodeEmptyParameter(TransportParameterId::client_direct_encap));
|
|
|
|
auto customTransportParams =
|
|
getClientDependentExtTransportParams(serverConn, clientParams);
|
|
|
|
auto it = findParameter(
|
|
customTransportParams, TransportParameterId::server_direct_encap);
|
|
EXPECT_TRUE(it != customTransportParams.end());
|
|
EXPECT_EQ(it->value->length(), 16); // IPv6 is 16 bytes
|
|
|
|
// Verify the IP address bytes
|
|
auto expectedAddr = folly::IPAddress("2001:db8::1");
|
|
auto expectedBytes = expectedAddr.bytes();
|
|
auto actualRange = it->value->coalesce();
|
|
EXPECT_EQ(actualRange.size(), 16);
|
|
EXPECT_EQ(memcmp(actualRange.data(), expectedBytes, 16), 0);
|
|
}
|
|
|
|
// Test server doesn't send server_direct_encap when address not configured
|
|
TEST_F(TransportParametersTest, ServerDirectEncapNoAddress) {
|
|
QuicServerConnectionState serverConn(
|
|
FizzServerQuicHandshakeContext::Builder().build());
|
|
// Don't set directEncapAddress
|
|
|
|
// Create client parameters containing client_direct_encap
|
|
std::vector<TransportParameter> clientParams;
|
|
clientParams.push_back(
|
|
encodeEmptyParameter(TransportParameterId::client_direct_encap));
|
|
|
|
auto customTransportParams =
|
|
getClientDependentExtTransportParams(serverConn, clientParams);
|
|
|
|
EXPECT_THAT(
|
|
customTransportParams,
|
|
Not(Contains(Field(
|
|
&TransportParameter::parameter,
|
|
Eq(TransportParameterId::server_direct_encap)))));
|
|
}
|
|
|
|
// Test server doesn't send server_direct_encap when client doesn't support it
|
|
TEST_F(TransportParametersTest, ServerDirectEncapClientNotSupported) {
|
|
QuicServerConnectionState serverConn(
|
|
FizzServerQuicHandshakeContext::Builder().build());
|
|
serverConn.transportSettings.directEncapAddress =
|
|
folly::IPAddress("192.168.1.1");
|
|
|
|
// Create client parameters WITHOUT client_direct_encap
|
|
std::vector<TransportParameter> clientParams;
|
|
// Add some other parameter to make sure we're not just testing empty list
|
|
auto paramResult =
|
|
encodeIntegerParameter(TransportParameterId::idle_timeout, 5000);
|
|
ASSERT_FALSE(paramResult.hasError());
|
|
clientParams.push_back(paramResult.value());
|
|
|
|
auto customTransportParams =
|
|
getClientDependentExtTransportParams(serverConn, clientParams);
|
|
|
|
EXPECT_THAT(
|
|
customTransportParams,
|
|
Not(Contains(Field(
|
|
&TransportParameter::parameter,
|
|
Eq(TransportParameterId::server_direct_encap)))));
|
|
}
|
|
|
|
// Test IP address encoding helper function directly
|
|
TEST_F(TransportParametersTest, EncodeIPAddressParameterIPv4) {
|
|
folly::IPAddress addr("10.0.0.1");
|
|
auto param =
|
|
encodeIPAddressParameter(TransportParameterId::server_direct_encap, addr);
|
|
|
|
EXPECT_EQ(param.parameter, TransportParameterId::server_direct_encap);
|
|
EXPECT_EQ(param.value->length(), 4);
|
|
|
|
auto expectedBytes = addr.bytes();
|
|
auto actualRange = param.value->coalesce();
|
|
EXPECT_EQ(memcmp(actualRange.data(), expectedBytes, 4), 0);
|
|
}
|
|
|
|
TEST_F(TransportParametersTest, EncodeIPAddressParameterIPv6) {
|
|
folly::IPAddress addr("::1");
|
|
auto param =
|
|
encodeIPAddressParameter(TransportParameterId::server_direct_encap, addr);
|
|
|
|
EXPECT_EQ(param.parameter, TransportParameterId::server_direct_encap);
|
|
EXPECT_EQ(param.value->length(), 16);
|
|
|
|
auto expectedBytes = addr.bytes();
|
|
auto actualRange = param.value->coalesce();
|
|
EXPECT_EQ(memcmp(actualRange.data(), expectedBytes, 16), 0);
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace quic
|