3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-16 12:16:33 +08:00
Code Issues Projects Releases Wiki Activity

Use socket options to select security mechanism

Browse Source
This commit is contained in:
Martin Hurton 2013-05-17 15:49:26 +02:00
parent fbcbb06b46
commit 182a224bb0
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plain_mechanism.cpp
View File

@ -121,11 +121,10 @@ bool zmq::plain_mechanism_t::is_handshake_complete () const
int zmq::plain_mechanism_t::hello_command (msg_t *msg_) const
{
// TODO: fetch these from options
const std::string username = "username";
const std::string password = "password";
const std::string username = options.plain_username;
zmq_assert (username.length () < 256);
const std::string password = options.plain_password;
zmq_assert (password.length () < 256);
const size_t command_size = 8 + 1 + username.length () +
@ -145,8 +144,6 @@ int zmq::plain_mechanism_t::hello_command (msg_t *msg_) const
memcpy (ptr, password.c_str (), password.length ());
ptr += password.length ();
// TODO: check username and password
return 0;
}
@ -202,6 +199,8 @@ int zmq::plain_mechanism_t::process_hello_command (msg_t *msg_)
return -1;
}
// TODO: Add user authentication
return 0;
}

8
src/stream_engine.cpp
View File

@ -455,7 +455,10 @@ bool zmq::stream_engine_t::handshake ()
else {
outpos [outsize++] = 0; // Minor version number
memset (outpos + outsize, 0, 20);
memcpy (outpos + outsize, "NULL", 4);
if (options.mechanism == ZMQ_NULL)
memcpy (outpos + outsize, "NULL", 4);
else
memcpy (outpos + outsize, "PLAIN", 5);
outsize += 20;
memset (outpos + outsize, 0, 32);
outsize += 32;
@ -529,7 +532,8 @@ bool zmq::stream_engine_t::handshake ()
}
else
if (memcmp (greeting_recv + 12, "PLAIN\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20) == 0) {
mechanism = new (std::nothrow) plain_mechanism_t (options, as_server);
mechanism = new (std::nothrow)
plain_mechanism_t (options, options.plain_server);
alloc_assert (mechanism);
}
else {