Skip to content

PR to set SNI during boost lib websocket next_layer() SSL handshake process happen during launch of app tunneling. #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2023
Merged

PR to set SNI during boost lib websocket next_layer() SSL handshake process happen during launch of app tunneling. #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ca4727
with Private VPN, it is important that SNI are supplied for SSL hands…
jaiswal-sumit Sep 14, 2023
6b3912e
Add host Param in function discription
jaiswal-sumit Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/TcpAdapterProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,8 +885,8 @@ namespace aws { namespace iot { namespace securedtunneling {
{
BOOST_LOG_SEV(log, debug) << "SSL host verification is off";
}
//next ssl handshake
tac.wss->async_ssl_handshake(boost::asio::ssl::stream_base::client, [=, &tac](boost::system::error_code const &ec)
//next ssl handshake and providing host string
tac.wss->async_ssl_handshake(boost::asio::ssl::stream_base::client, tac.adapter_config.proxy_host.c_str(), [=, &tac](boost::system::error_code const &ec)
{
if (ec)
{
Expand Down Expand Up @@ -2266,4 +2266,4 @@ namespace aws { namespace iot { namespace securedtunneling {
return false;
}
}
}}}
}}}
22 changes: 21 additions & 1 deletion src/WebSocketStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,35 @@ namespace aws {
}
}

void WebSocketStream::async_ssl_handshake(const ssl::stream_base::handshake_type &type,
void WebSocketStream::async_ssl_handshake(const ssl::stream_base::handshake_type &type, const std::string &host,
const BoostCallbackFunc &handler) {
if (localproxyConfig.is_web_proxy_using_tls) {
BOOST_LOG_SEV(*log, trace) << "Calling next_layer().async_handshake with type: "
<< WEB_PROXY_WITH_TLS_TYPE_NAME;
// Set SNI Hostname (many hosts need this to handshake successfully)
if(!SSL_set_tlsext_host_name(boost::get<unique_ptr<WEB_PROXY_WITH_TLS_TYPE>>(wss)->next_layer().native_handle(), host.c_str()))
{
BOOST_LOG_SEV(*log, trace) << "SSL next_layer() failed to set SNI";
}
else
{
BOOST_LOG_SEV(*log, trace) << "SSL next_layer() SNI is set : "
<< host;
}
return boost::get<unique_ptr<WEB_PROXY_WITH_TLS_TYPE>>(wss)->next_layer().async_handshake(type, handler);
} else {
BOOST_LOG_SEV(*log, trace) << "Calling next_layer().async_handshake with type: "
<< WEB_PROXY_NO_TLS_TYPE_NAME;
// Set SNI Hostname (many hosts need this to handshake successfully)
if(!SSL_set_tlsext_host_name(boost::get<unique_ptr<WEB_PROXY_NO_TLS_TYPE>>(wss)->next_layer().native_handle(), host.c_str()))
{
BOOST_LOG_SEV(*log, trace) << "SSL next_layer() failed to set SNI";
}
else
{
BOOST_LOG_SEV(*log, trace) << "SSL next_layer() SNI is set : "
<< host;
}
return boost::get<unique_ptr<WEB_PROXY_NO_TLS_TYPE>>(wss)->next_layer().async_handshake(type, handler);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/WebSocketStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,11 @@ namespace aws {
/**
* Performs the SSL handshake between the localproxy and the proxy server asynchronously.
* @param type The handshake type
* @param host the host subdoman and domain
* @param handler the callback handler when the async operation is complete.
*/
void
async_ssl_handshake(const ssl::stream_base::handshake_type &type, const BoostCallbackFunc &handler);
async_ssl_handshake(const ssl::stream_base::handshake_type &type, const std::string &host, const BoostCallbackFunc &handler);
#endif

/**
Expand Down