Skip to content

Commit

Permalink
In secure mode, don't append the port to the Host header
Browse files Browse the repository at this point in the history 
because both calc_cn_host in cpprestsdk/Release/src/http/client/http_client_asio.cpp
and winhttp_client::send_request in cpprestsdk/Release/src/http/client/http_client_winhttp.cpp
compare the entire Host header value with the certificate Common Name
which causes an SSL handshake error

Co-authored-by: Simon Lo <[email protected]>
  • Loading branch information
@garethsb @lo-simon
garethsb and lo-simon committed Feb 23, 2024
1 parent 638d40a commit cbb6d0f
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 8 deletions.
14 changes: 12 additions & 2 deletions Development/nmos/client_utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,24 @@ namespace nmos
{
// unstash the host name for the Host header
// cf. nmos::details::resolve_service
std::unique_ptr<web::http::client::http_client> client(new web::http::client::http_client(web::uri_builder(base_uri).set_user_info({}).to_uri(), client_config));
// don't bother clearing user_info since http_client makes no use of it
// see https://github.com/microsoft/cpprestsdk/issues/3
std::unique_ptr<web::http::client::http_client> client(new web::http::client::http_client(base_uri, client_config));
if (!base_uri.user_info().empty())
{
auto host = base_uri.user_info();
if (base_uri.port() > 0)

// hmm, in secure mode, don't append the port to the Host header
// because both calc_cn_host in cpprestsdk/Release/src/http/client/http_client_asio.cpp
// and winhttp_client::send_request in cpprestsdk/Release/src/http/client/http_client_winhttp.cpp
// compare the entire Host header value with the certificate Common Name
// which causes an SSL handshake error
// see https://github.com/microsoft/cpprestsdk/issues/1790
if (base_uri.port() > 0 && !web::is_secure_uri_scheme(base_uri.scheme()))
{
host.append(U(":")).append(utility::conversions::details::to_string_t(base_uri.port()));
}

client->add_handler([host](web::http::http_request request, std::shared_ptr<web::http::http_pipeline_stage> next_stage) -> pplx::task<web::http::http_response>
{
request.headers().add(web::http::header_names::host, host);
Expand Down
4 changes: 2 additions & 2 deletions Development/nmos/node_behaviour.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ namespace nmos

self_id = id_type.first;

slog::log<slog::severities::info>(gate, SLOG_FLF) << "Registering nmos-cpp node with the Registration API at: " << registration_client->base_uri().host() << ":" << registration_client->base_uri().port();
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Registering nmos-cpp node with the Registration API at: " << registration_client->base_uri().to_string();

auto token = cancellation_source.get_token();
request = details::request_registration(*registration_client, events.at(0), gate, token).then([&](pplx::task<void> finally)
Expand Down Expand Up @@ -908,7 +908,7 @@ namespace nmos
// "The first interaction with a new Registration API [after a server side or connectivity issue]
// should be a heartbeat to confirm whether whether the Node is still present in the registry"

slog::log<slog::severities::info>(gate, SLOG_FLF) << "Attempting registration heartbeats with the Registration API at: " << registration_client->base_uri().host() << ":" << registration_client->base_uri().port();
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Attempting registration heartbeats with the Registration API at: " << registration_client->base_uri().to_string();

node_registered = false;

Expand Down
9 changes: 8 additions & 1 deletion Development/nmos/node_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "nmos/channelmapping_activation.h"
#include "nmos/events_api.h"
#include "nmos/events_ws_api.h"
#include "nmos/is04_versions.h"
#include "nmos/logging_api.h"
#include "nmos/manifest_api.h"
#include "nmos/model.h"
Expand All @@ -25,7 +26,13 @@ namespace nmos
{
// Log the API addresses we'll be using

slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp node with its primary Node API at: " << nmos::get_host(node_model.settings) << ":" << nmos::fields::node_port(node_model.settings);
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp node with its primary Node API at: "
<< web::uri_builder()
.set_scheme(nmos::http_scheme(node_model.settings))
.set_host(nmos::get_host(node_model.settings))
.set_port(nmos::fields::node_port(node_model.settings))
.set_path(U("/x-nmos/node/") + nmos::make_api_version(*nmos::is04_versions::from_settings(node_model.settings).rbegin()))
.to_string();

nmos::server node_server{ node_model };

Expand Down
24 changes: 21 additions & 3 deletions Development/nmos/registry_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,27 @@ namespace nmos
{
// Log the API addresses we'll be using

slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp registry with its primary Node API at: " << nmos::get_host(registry_model.settings) << ":" << nmos::fields::node_port(registry_model.settings);
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp registry with its primary Registration API at: " << nmos::get_host(registry_model.settings) << ":" << nmos::fields::registration_port(registry_model.settings);
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp registry with its primary Query API at: " << nmos::get_host(registry_model.settings) << ":" << nmos::fields::query_port(registry_model.settings);
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp registry with its primary Node API at: "
<< web::uri_builder()
.set_scheme(nmos::http_scheme(registry_model.settings))
.set_host(nmos::get_host(registry_model.settings))
.set_port(nmos::fields::node_port(registry_model.settings))
.set_path(U("/x-nmos/node/") + nmos::make_api_version(*nmos::is04_versions::from_settings(registry_model.settings).rbegin()))
.to_string();
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp registry with its primary Registration API at: "
<< web::uri_builder()
.set_scheme(nmos::http_scheme(registry_model.settings))
.set_host(nmos::get_host(registry_model.settings))
.set_port(nmos::fields::registration_port(registry_model.settings))
.set_path(U("/x-nmos/registration/") + nmos::make_api_version(*nmos::is04_versions::from_settings(registry_model.settings).rbegin()))
.to_string();
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Configuring nmos-cpp registry with its primary Query API at: "
<< web::uri_builder()
.set_scheme(nmos::http_scheme(registry_model.settings))
.set_host(nmos::get_host(registry_model.settings))
.set_port(nmos::fields::query_port(registry_model.settings))
.set_path(U("/x-nmos/query/") + nmos::make_api_version(*nmos::is04_versions::from_settings(registry_model.settings).rbegin()))
.to_string();

nmos::server registry_server{ registry_model };

Expand Down

0 comments on commit cbb6d0f

Please sign in to comment.