Skip to content

Patch server identity certificate lifetime management. #181

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 1 commit into from
May 2, 2016
Merged

Patch server identity certificate lifetime management. #181

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion include/bitcoin/server/worker.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,12 @@ class BCS_API request_worker

czmqpp::context context_;
czmqpp::socket socket_;
czmqpp::authenticator authenticate_;
czmqpp::certificate certificate_;

// These are not authenticated.
czmqpp::socket wakeup_socket_;
czmqpp::socket heartbeat_socket_;
czmqpp::authenticator authenticate_;

send_worker sender_;
command_map handlers_;
Expand Down
18 changes: 12 additions & 6 deletions src/worker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,21 @@ bool request_worker::enable_crypto(const settings_type& config)
client_certs = config.server.client_certificates_path.string();

authenticate_.configure_curve("*", client_certs);
czmqpp::certificate cert(config.server.certificate_file.string());
if (cert.valid())
auto cert_path = config.server.certificate_file.string();

if (!cert_path.empty())
{
cert.apply(socket_);
socket_.set_curve_server(zmq_curve_enabled);
return true;
// TODO: create a czmqpp::reset(path) override to hide this.
// Create a new certificate and transfer ownership to the member.
certificate_.reset(zcert_load(cert_path.c_str()));

if (!certificate_.valid())
return false;
}

return false;
certificate_.apply(socket_);
socket_.set_curve_server(zmq_curve_enabled);
return true;
}

bool request_worker::create_new_socket(const settings_type& config)
Expand Down