Skip to content
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.

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

SSL support #291

Merged
merged 1 commit into from Apr 5, 2013
Merged

SSL support #291

merged 1 commit into from Apr 5, 2013

Conversation

Vagabond
Copy link
Contributor

@Vagabond Vagabond commented Apr 2, 2013

No description provided.

MySSL = proplists:get_value(ssl_enabled, TheirCaps, false),
TheirSSL = proplists:get_value(ssl_enabled, MyCaps, false),
case {MySSL, TheirSSL} of
{true, false} -> lager:info("FAILED TO USE SSL A"),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lager:info weren't really meant to make it into a PR as they were.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I forgot to do a cleanup commit.

@bookshelfdave
Copy link

There are several lager:info/lager:error calls that I was using during dev. These need to be cleaned up.

lager:info("Peer requested SSL but we don't support it"),
{error, no_ssl};
{true, true} ->
lager:info("Agreed to use SSL"),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if the info could read: Agreed to use SSL from foo to bar. (source/sink)

@bookshelfdave
Copy link

replication2_ssl + replication2 tests pass.

@Vagabond
Copy link
Contributor Author

Vagabond commented Apr 5, 2013

How does this look?

@bookshelfdave
Copy link

output looks good:

"A" and "B" agreed to use SSL

replication2 + replication2_ssl pass again.
+1

This is a port of the SSL implementation from Riak's MDC implementation.
The app.config arguments are the same, only now they're under riak_core.

SSL is negotiated right after capabilities are exchanged, so minimal
information is sent 'in the clear'. If one side requests SSL and the
other side does not have it enabled, SSL is not allowed to connect.
Vagabond added a commit that referenced this pull request Apr 5, 2013
@Vagabond Vagabond merged commit 3d868fe into master Apr 5, 2013
@Vagabond Vagabond deleted the dip_ssl branch April 5, 2013 15:25
buddhisthead added a commit that referenced this pull request Apr 21, 2013
Add the riak_kv_yessir_backend.erl storage manager for simulation purposes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants