Skip to content

WSS: use hostname from URL if not specified #4914

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

Open
YunYe-Pu wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −5
Open

WSS: use hostname from URL if not specified #4914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 20 additions & 5 deletions src/wss_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

#include "precompiled.hpp"
#include "wss_engine.hpp"
#ifndef ZMQ_HAVE_WINDOWS
#include <arpa/inet.h>
#endif

static int verify_certificate_callback (gnutls_session_t session)
{
Expand All @@ -24,6 +27,16 @@ static int verify_certificate_callback (gnutls_session_t session)
return 0;
}

static bool is_domain_name(const char* hostname)
{
if (*hostname == '[' || strchr (hostname, ':') != NULL) // IPv6 address
return false;
// Check for IPv4 address with inet_pton
struct in_addr buf;
if (inet_pton(AF_INET, hostname, &buf) == 1)
return false;
return true;
}

zmq::wss_engine_t::wss_engine_t (fd_t fd_,
const options_t &options_,
Expand Down Expand Up @@ -61,13 +74,15 @@ zmq::wss_engine_t::wss_engine_t (fd_t fd_,
rc = gnutls_init (&_tls_session, GNUTLS_CLIENT | GNUTLS_NONBLOCK);
zmq_assert (rc == GNUTLS_E_SUCCESS);

if (!hostname_.empty ())
if (!hostname_.empty ()) {
gnutls_server_name_set (_tls_session, GNUTLS_NAME_DNS,
hostname_.c_str (), hostname_.size ());

gnutls_session_set_ptr (
_tls_session,
hostname_.empty () ? NULL : const_cast<char *> (hostname_.c_str ()));
gnutls_session_set_ptr (_tls_session, const_cast<char*> (hostname_.c_str ()));
} else if (is_domain_name (address_.host ())) {
gnutls_server_name_set (_tls_session, GNUTLS_NAME_DNS,
address_.host (), strlen (address_.host ()));
gnutls_session_set_ptr (_tls_session, const_cast<char*> (address_.host ()));
}

rc = gnutls_credentials_set (_tls_session, GNUTLS_CRD_CERTIFICATE,
_tls_client_cred);
Expand Down
Loading