Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-11-12 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client/idd] network: allow unencrypted 1-RTT payloads

Browse Source 
Expose the insecure MsQuic draft API and add an opt-in setting on both
peers. Query the negotiated state after connection establishment so
one-sided opt-in remains encrypted and is logged accurately.
This commit is contained in:
Geoffrey McRae
2026-11-06 19:28:18 +11:00
parent ea24c288ad
commit 8bbf9c3056
9 changed files with 166 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/transports/Network/CMakeLists.txt
View File

@@ -37,6 +37,10 @@ endif()
add_library(transport_Network STATIC ${TRANSPORT_NETWORK_SOURCES}) add_library(transport_Network STATIC ${TRANSPORT_NETWORK_SOURCES})
target_compile_definitions(transport_Network PRIVATE
QUIC_API_ENABLE_INSECURE_FEATURES=1
)
target_include_directories(transport_Network PRIVATE target_include_directories(transport_Network PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../src ${CMAKE_CURRENT_SOURCE_DIR}/../../src
) )

64
client/transports/Network/connection.c
View File

@@ -213,6 +213,7 @@ struct NetworkConnection
uint16_t port; uint16_t port;
char * password; char * password;
char * endpoint; char * endpoint;
bool allowUnencrypted;
NetworkKnownHosts * knownHosts; NetworkKnownHosts * knownHosts;
NetworkTrustPromptFn trustPrompt; NetworkTrustPromptFn trustPrompt;
@@ -2922,8 +2923,28 @@ static QUIC_STATUS QUIC_API networkConnectionCallback(HQUIC handle,
return QUIC_STATUS_SUCCESS; return QUIC_STATUS_SUCCESS;
} }
HQUIC stream = NULL; BOOLEAN encryptionDisabled = FALSE;
QUIC_STATUS status = this->api->StreamOpen(handle, uint32_t encryptionDisabledLength = sizeof(encryptionDisabled);
QUIC_STATUS status = this->api->GetParam(handle,
QUIC_PARAM_CONN_DISABLE_1RTT_ENCRYPTION,
&encryptionDisabledLength, &encryptionDisabled);
if (QUIC_FAILED(status))
{
DEBUG_ERROR("Failed to query 1-RTT encryption for %s: 0x%08x",
this->endpoint, (unsigned)status);
networkConnectionFail(this, LG_TRANSPORT_ERROR);
this->api->ConnectionShutdown(handle,
QUIC_CONNECTION_SHUTDOWN_FLAG_SILENT, 0);
return QUIC_STATUS_SUCCESS;
}
DEBUG_INFO("Network connection to %s established in %s mode "
"(%s 1-RTT payloads)", this->endpoint,
encryptionDisabled ? "insecure" : "secure",
encryptionDisabled ? "unencrypted" : "encrypted");
HQUIC stream = NULL;
status = this->api->StreamOpen(handle,
QUIC_STREAM_OPEN_FLAG_NONE, networkStreamCallback, this, &stream); QUIC_STREAM_OPEN_FLAG_NONE, networkStreamCallback, this, &stream);
if (QUIC_FAILED(status)) if (QUIC_FAILED(status))
{ {
@@ -3585,15 +3606,16 @@ bool networkConnectionCreate(NetworkConnection ** result,
goto fail; goto fail;
} }
this->port = params->port; this->port = params->port;
this->knownHosts = params->knownHosts; this->allowUnencrypted = params->allowUnencrypted;
this->trustPrompt = params->trustPrompt; this->knownHosts = params->knownHosts;
this->trustCancel = params->trustCancel; this->trustPrompt = params->trustPrompt;
this->packet = params->packet; this->trustCancel = params->trustCancel;
this->state = params->state; this->packet = params->packet;
this->sendReady = params->sendReady; this->state = params->state;
this->datagramLost = params->datagramLost; this->sendReady = params->sendReady;
this->opaque = params->opaque; this->datagramLost = params->datagramLost;
this->opaque = params->opaque;
this->connectEvent = lgCreateEvent(false, 0); this->connectEvent = lgCreateEvent(false, 0);
this->closeEvent = lgCreateEvent(false, 0); this->closeEvent = lgCreateEvent(false, 0);
@@ -3863,6 +3885,26 @@ LG_TransportStatus networkConnectionConnect(NetworkConnection * this,
return LG_TRANSPORT_ERROR; return LG_TRANSPORT_ERROR;
} }
if (this->allowUnencrypted)
{
const BOOLEAN disableEncryption = TRUE;
status = this->api->SetParam(this->connection,
QUIC_PARAM_CONN_DISABLE_1RTT_ENCRYPTION,
sizeof(disableEncryption), &disableEncryption);
if (QUIC_FAILED(status))
{
DEBUG_ERROR("Failed to allow unencrypted 1-RTT payloads for %s: "
"0x%08x", this->endpoint, (unsigned)status);
this->api->ConnectionClose(this->connection);
this->connection = NULL;
LG_LOCK(this->lock);
this->connecting = false;
this->connectStatus = LG_TRANSPORT_ERROR;
LG_UNLOCK(this->lock);
return LG_TRANSPORT_ERROR;
}
}
status = this->api->ConnectionStart(this->connection, this->configuration, status = this->api->ConnectionStart(this->connection, this->configuration,
QUIC_ADDRESS_FAMILY_UNSPEC, this->address, this->port); QUIC_ADDRESS_FAMILY_UNSPEC, this->address, this->port);
if (QUIC_FAILED(status)) if (QUIC_FAILED(status))

1
client/transports/Network/connection.h
View File

@@ -59,6 +59,7 @@ typedef struct NetworkConnectionParams
const char * address; const char * address;
uint16_t port; uint16_t port;
const char * password; const char * password;
bool allowUnencrypted;
NetworkKnownHosts * knownHosts; NetworkKnownHosts * knownHosts;
NetworkTrustPromptFn trustPrompt; NetworkTrustPromptFn trustPrompt;
NetworkTrustCancelFn trustCancel; NetworkTrustCancelFn trustCancel;

34
client/transports/Network/network.c
View File

@@ -246,6 +246,13 @@ static void networkSetup(void)
.sensitive = true, .sensitive = true,
.value.x_string = NULL, .value.x_string = NULL,
}, },
{
.module = "network",
.name = "allowUnencrypted",
.description = "Allow unencrypted 1-RTT network payloads",
.type = OPTION_TYPE_BOOL,
.value.x_bool = false,
},
{ {
.module = "network", .module = "network",
.name = "forgetCertificate", .name = "forgetCertificate",
@@ -555,20 +562,21 @@ static bool networkCreate(LG_Transport ** result)
const NetworkConnectionParams params = const NetworkConnectionParams params =
{ {
.address = address, .address = address,
.port = port, .port = port,
.password = option_get_string("network", "password"), .password = option_get_string("network", "password"),
.knownHosts = &this->knownHosts, .allowUnencrypted = option_get_bool("network", "allowUnencrypted"),
.trustPrompt = networkTrustPrompt, .knownHosts = &this->knownHosts,
.trustCancel = networkCancelTrustPrompt, .trustPrompt = networkTrustPrompt,
.packet = networkPacket, .trustCancel = networkCancelTrustPrompt,
.state = networkConnectionState, .packet = networkPacket,
.sendReady = networkSendReady, .state = networkConnectionState,
.datagramLost = networkDatagramLost, .sendReady = networkSendReady,
.capabilities = NETWORK_CAPABILITIES, .datagramLost = networkDatagramLost,
.capabilityCount = sizeof(NETWORK_CAPABILITIES) / .capabilities = NETWORK_CAPABILITIES,
.capabilityCount = sizeof(NETWORK_CAPABILITIES) /
sizeof(NETWORK_CAPABILITIES[0]), sizeof(NETWORK_CAPABILITIES[0]),
.opaque = this, .opaque = this,
}; };
if (!networkConnectionCreate(&this->connection, &params)) if (!networkConnectionCreate(&this->connection, &params))
{ {

4
cmake/MsQuic.Static.targets
View File

@@ -13,7 +13,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(LGMsQuicSourceDir)src\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(LGMsQuicSourceDir)src\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>QUIC_BUILD_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>QUIC_BUILD_STATIC;QUIC_API_ENABLE_INSECURE_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>$(LGMsQuicStaticLibrary);$(LGMsQuicCoreLibrary);$(LGMsQuicPlatformLibrary);ws2_32.lib;schannel.lib;secur32.lib;OneCore.lib;wbemuuid.lib;winmm.lib;ntdll.lib;bcrypt.lib;ncrypt.lib;crypt32.lib;iphlpapi.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>$(LGMsQuicStaticLibrary);$(LGMsQuicCoreLibrary);$(LGMsQuicPlatformLibrary);ws2_32.lib;schannel.lib;secur32.lib;OneCore.lib;wbemuuid.lib;winmm.lib;ntdll.lib;bcrypt.lib;ncrypt.lib;crypt32.lib;iphlpapi.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -34,7 +34,7 @@
<!-- NormalizeDirectory adds a trailing slash. The dot prevents that slash <!-- NormalizeDirectory adds a trailing slash. The dot prevents that slash
from escaping the closing quote in the command line. --> from escaping the closing quote in the command line. -->
<Exec <Exec
Command="cmake -S &quot;$(LGMsQuicSourceDir).&quot; -B &quot;$(LGMsQuicBuildDir).&quot; -G &quot;Visual Studio 17 2022&quot; -A &quot;$(LGMsQuicArchitecture)&quot; -T v143 -DCMAKE_SYSTEM_VERSION=&quot;$(WindowsTargetPlatformVersion)&quot; -DQUIC_BUILD_SHARED=OFF -DQUIC_BUILD_TOOLS=OFF -DQUIC_BUILD_TEST=OFF -DQUIC_BUILD_PERF=OFF -DQUIC_TLS_LIB=schannel -DQUIC_ENABLE_LOGGING=OFF -DQUIC_STATIC_LINK_CRT=OFF -DQUIC_STATIC_LINK_PARTIAL_CRT=OFF -DQUIC_SOURCE_LINK=OFF -DQUIC_PDBALTPATH=OFF -DQUIC_EMBED_GIT_HASH=OFF -DCMAKE_PROJECT_INCLUDE=&quot;$(MSBuildThisFileDirectory)MsQuic.cmake&quot; -DLG_MSQUIC_DISABLE_CODE_ANALYSIS=ON" /> Command="cmake -S &quot;$(LGMsQuicSourceDir).&quot; -B &quot;$(LGMsQuicBuildDir).&quot; -G &quot;Visual Studio 17 2022&quot; -A &quot;$(LGMsQuicArchitecture)&quot; -T v143 -DCMAKE_SYSTEM_VERSION=&quot;$(WindowsTargetPlatformVersion)&quot; -DQUIC_BUILD_SHARED=OFF -DQUIC_BUILD_TOOLS=OFF -DQUIC_BUILD_TEST=OFF -DQUIC_BUILD_PERF=OFF -DQUIC_TLS_LIB=schannel -DQUIC_ENABLE_LOGGING=OFF -DQUIC_STATIC_LINK_CRT=OFF -DQUIC_STATIC_LINK_PARTIAL_CRT=OFF -DQUIC_SOURCE_LINK=OFF -DQUIC_PDBALTPATH=OFF -DQUIC_EMBED_GIT_HASH=OFF -DCMAKE_PROJECT_INCLUDE=&quot;$(MSBuildThisFileDirectory)MsQuic.cmake&quot; -DLG_MSQUIC_DISABLE_CODE_ANALYSIS=ON -DLG_MSQUIC_ENABLE_INSECURE_FEATURES=ON" />
</Target> </Target>
<Target <Target
Name="BuildLGMsQuic" Name="BuildLGMsQuic"

7
cmake/MsQuic.cmake
View File

@@ -1,5 +1,9 @@
include(ExternalProject) include(ExternalProject)
if(LG_MSQUIC_ENABLE_INSECURE_FEATURES)
add_compile_definitions(QUIC_API_ENABLE_INSECURE_FEATURES=1)
endif()
# MsQuic's static archive flattener must be able to see this imported target # MsQuic's static archive flattener must be able to see this imported target
# from outside the directory where FindOpenSSL is invoked. # from outside the directory where FindOpenSSL is invoked.
if(LG_MSQUIC_OPENSSL_CRYPTO_LIBRARY AND NOT TARGET OpenSSL::Crypto) if(LG_MSQUIC_OPENSSL_CRYPTO_LIBRARY AND NOT TARGET OpenSSL::Crypto)
@@ -125,6 +129,7 @@ function(lg_add_static_msquic)
"-DQUIC_SOURCE_LINK=OFF" "-DQUIC_SOURCE_LINK=OFF"
"-DQUIC_PDBALTPATH=OFF" "-DQUIC_PDBALTPATH=OFF"
"-DQUIC_EMBED_GIT_HASH=OFF" "-DQUIC_EMBED_GIT_HASH=OFF"
"-DLG_MSQUIC_ENABLE_INSECURE_FEATURES=ON"
) )
if(NOT EXISTS "${LG_MSQUIC_SOURCE_DIR}/CMakeLists.txt") if(NOT EXISTS "${LG_MSQUIC_SOURCE_DIR}/CMakeLists.txt")
@@ -495,7 +500,7 @@ function(lg_add_static_msquic)
IMPORTED_LOCATION_RELEASE "${LG_MSQUIC_RELEASE_LIBRARY}" IMPORTED_LOCATION_RELEASE "${LG_MSQUIC_RELEASE_LIBRARY}"
IMPORTED_LOCATION_RELWITHDEBINFO "${LG_MSQUIC_RELEASE_LIBRARY}" IMPORTED_LOCATION_RELWITHDEBINFO "${LG_MSQUIC_RELEASE_LIBRARY}"
IMPORTED_LOCATION_MINSIZEREL "${LG_MSQUIC_RELEASE_LIBRARY}" IMPORTED_LOCATION_MINSIZEREL "${LG_MSQUIC_RELEASE_LIBRARY}"
INTERFACE_COMPILE_DEFINITIONS QUIC_BUILD_STATIC INTERFACE_COMPILE_DEFINITIONS "QUIC_BUILD_STATIC;QUIC_API_ENABLE_INSECURE_FEATURES=1"
INTERFACE_INCLUDE_DIRECTORIES "${LG_MSQUIC_SOURCE_DIR}/src/inc" INTERFACE_INCLUDE_DIRECTORIES "${LG_MSQUIC_SOURCE_DIR}/src/inc"
INTERFACE_LINK_LIBRARIES "${LG_MSQUIC_LINK_LIBRARIES}" INTERFACE_LINK_LIBRARIES "${LG_MSQUIC_LINK_LIBRARIES}"
) )

46
idd/LGIdd/transport/network/CNetworkServer.cpp
View File

@@ -5695,10 +5695,26 @@ retry:
ResetEvent(owner.drainedEvent); ResetEvent(owner.drainedEvent);
} }
owner.api->SetCallbackHandler(event->NEW_CONNECTION.Connection, QUIC_STATUS status = QUIC_STATUS_SUCCESS;
reinterpret_cast<void *>(ConnectionCallback), connection); if (owner.settings.allowUnencrypted)
const QUIC_STATUS status = owner.api->ConnectionSetConfiguration( {
event->NEW_CONNECTION.Connection, owner.configuration); const BOOLEAN disableEncryption = TRUE;
status = owner.api->SetParam(event->NEW_CONNECTION.Connection,
QUIC_PARAM_CONN_DISABLE_1RTT_ENCRYPTION,
sizeof(disableEncryption), &disableEncryption);
if (QUIC_FAILED(status))
DEBUG_ERROR("Failed to allow unencrypted 1-RTT payloads for "
"network client %u: 0x%x", connection->client,
static_cast<unsigned>(status));
}
if (QUIC_SUCCEEDED(status))
{
owner.api->SetCallbackHandler(event->NEW_CONNECTION.Connection,
reinterpret_cast<void *>(ConnectionCallback), connection);
status = owner.api->ConnectionSetConfiguration(
event->NEW_CONNECTION.Connection, owner.configuration);
}
if (QUIC_FAILED(status)) if (QUIC_FAILED(status))
{ {
{ {
@@ -5723,8 +5739,28 @@ retry:
switch (event->Type) switch (event->Type)
{ {
case QUIC_CONNECTION_EVENT_CONNECTED: case QUIC_CONNECTION_EVENT_CONNECTED:
DEBUG_INFO("Network client %u connected", connection.client); {
BOOLEAN encryptionDisabled = FALSE;
uint32_t encryptionDisabledLength = sizeof(encryptionDisabled);
const QUIC_STATUS status = owner.api->GetParam(handle,
QUIC_PARAM_CONN_DISABLE_1RTT_ENCRYPTION,
&encryptionDisabledLength, &encryptionDisabled);
if (QUIC_FAILED(status))
{
DEBUG_ERROR("Failed to query 1-RTT encryption for network "
"client %u: 0x%x", connection.client,
static_cast<unsigned>(status));
owner.Shutdown(connection, NETWORK_ERROR_PROTOCOL);
return QUIC_STATUS_SUCCESS;
}
DEBUG_INFO("Network client %u connected in %s mode "
"(%s 1-RTT payloads)",
connection.client,
encryptionDisabled ? "insecure" : "secure",
encryptionDisabled ? "unencrypted" : "encrypted");
return QUIC_STATUS_SUCCESS; return QUIC_STATUS_SUCCESS;
}
case QUIC_CONNECTION_EVENT_PEER_STREAM_STARTED: case QUIC_CONNECTION_EVENT_PEER_STREAM_STARTED:
{ {

38
idd/LGIdd/transport/network/NetworkSettings.cpp
View File

@@ -29,13 +29,14 @@ namespace
{ {
enum Field : unsigned enum Field : unsigned
{ {
FIELD_BIND = 1U << 0, FIELD_BIND = 1U << 0,
FIELD_PORT = 1U << 1, FIELD_PORT = 1U << 1,
FIELD_MAX_CLIENTS = 1U << 2, FIELD_MAX_CLIENTS = 1U << 2,
FIELD_AUTH = 1U << 3, FIELD_AUTH = 1U << 3,
FIELD_PASSWORD = 1U << 4, FIELD_PASSWORD = 1U << 4,
FIELD_VIDEO_CHROMA = 1U << 5, FIELD_VIDEO_CHROMA = 1U << 5,
FIELD_VIDEO_BITRATE = 1U << 6, FIELD_VIDEO_BITRATE = 1U << 6,
FIELD_ALLOW_UNENCRYPTED = 1U << 7,
}; };
std::wstring Trim(const std::wstring& value) std::wstring Trim(const std::wstring& value)
@@ -93,6 +94,23 @@ namespace
return true; return true;
} }
bool ParseBoolean(const std::wstring& value, bool& result)
{
if (Equal(value, L"true") || Equal(value, L"yes") ||
Equal(value, L"1"))
{
result = true;
return true;
}
if (Equal(value, L"false") || Equal(value, L"no") ||
Equal(value, L"0"))
{
result = false;
return true;
}
return false;
}
bool SetField(const std::wstring& key, const std::wstring& rawValue, bool SetField(const std::wstring& key, const std::wstring& rawValue,
NetworkSettings& settings, unsigned& fields, NetworkSettings& settings, unsigned& fields,
std::wstring * error) std::wstring * error)
@@ -139,6 +157,12 @@ namespace
return Fail(error, L"invalid password"); return Fail(error, L"invalid password");
settings.password = value; settings.password = value;
} }
else if (Equal(key, L"allowUnencrypted"))
{
field = FIELD_ALLOW_UNENCRYPTED;
if (!ParseBoolean(value, settings.allowUnencrypted))
return Fail(error, L"invalid allowUnencrypted value");
}
else if (Equal(key, L"videoChroma")) else if (Equal(key, L"videoChroma"))
{ {
field = FIELD_VIDEO_CHROMA; field = FIELD_VIDEO_CHROMA;

12
idd/LGIdd/transport/network/NetworkSettings.h
View File

@@ -40,6 +40,7 @@ struct NetworkSettings
uint16_t maxClients = NETWORK_DEFAULT_MAX_CLIENTS; uint16_t maxClients = NETWORK_DEFAULT_MAX_CLIENTS;
LGNetAuthMode auth = LG_NET_AUTH_MODE_DEFAULT; LGNetAuthMode auth = LG_NET_AUTH_MODE_DEFAULT;
std::wstring password; std::wstring password;
bool allowUnencrypted = false;
uint32_t videoBitrateMbps = uint32_t videoBitrateMbps =
NETWORK_DEFAULT_VIDEO_BITRATE_MBPS; NETWORK_DEFAULT_VIDEO_BITRATE_MBPS;
LGNetVideoChromaSubsampling videoChroma = LGNetVideoChromaSubsampling videoChroma =
@@ -47,10 +48,11 @@ struct NetworkSettings
}; };
// Settings use a semicolon-separated key=value list. Supported keys are // Settings use a semicolon-separated key=value list. Supported keys are
// bind, port, maxClients, auth, password, videoBitrateMbps, and videoChroma. // bind, port, maxClients, auth, password, allowUnencrypted, videoBitrateMbps,
// videoBitrateMbps uses decimal Mbit/s and defaults to 200. videoChroma accepts // and videoChroma. allowUnencrypted accepts true, false, yes, no, 1, or 0 and
// 420 or 444 and defaults to 444. Password authentication requires a non-empty // defaults to false. videoBitrateMbps uses decimal Mbit/s and defaults to 200.
// password. The default address requests a dual-stack wildcard listener from // videoChroma accepts 420 or 444 and defaults to 444. Password authentication
// the eventual QUIC provider. // requires a non-empty password. The default address requests a dual-stack
// wildcard listener from the eventual QUIC provider.
bool ParseNetworkSettings(const std::wstring& source, bool ParseNetworkSettings(const std::wstring& source,
NetworkSettings& settings, std::wstring * error = nullptr); NetworkSettings& settings, std::wstring * error = nullptr);