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

Add SSL support for the control app #2046

Merged
merged 2 commits into from Oct 21, 2019

Conversation

composerinteralia
Copy link
Contributor

This PR includes two commits, one for the refactor and one for the change. I can open two separate PRs if it is easier to review that way.


Extract class for building SSL context

This commit extracts the MiniSSL::Context creation into its own
MiniSSL::ContextBuilder class along the same lines as in #1989.

This will allow us to reuse this code for adding SSL support to the
control app (issue #2015). Since we will need the MiniSSL require
and check in both places, I moved that into the ContextBuilder class
as well.


Add SSL support for the control app

This starts to address #2015. I think we will need to add SSL support
to the control cli as well.

This commit extracts the `MiniSSL::Context` creation into its own
`MiniSSL::ContextBuilder` class along the same lines as in [puma#1989].

This will allow us to reuse this code for adding SSL support to the
control app (issue [puma#2015]). Since we will need the `MiniSSL` require
and check in both places, I moved that into the `ContextBuilder` class
as well.

[puma#1989]: puma#1989
[puma#2015]: puma#2015
@composerinteralia
Copy link
Contributor Author

Oops, I forgot to add a changelog entry. I will be sure to add that if this change looks OK.

@@ -2,6 +2,7 @@

require 'puma/server'
require 'puma/const'
require 'puma/minissl/context_builder'
Copy link
Member

Choose a reason for hiding this comment

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

Nice call. I'm not gonna review that commit because it looks like a straight copy-paste into the new class.

@nateberkopec
Copy link
Member

Nice! LGTM.

This starts to address [puma#2015]. I think we will need to add SSL support
to the control cli as well.

[puma#2015]: puma#2015
@composerinteralia
Copy link
Contributor Author

Thanks! Changelog entry added.

@nateberkopec nateberkopec merged commit f5ccd03 into puma:master Oct 21, 2019
@composerinteralia composerinteralia deleted the control-ssl branch October 21, 2019 01:56
This was referenced Mar 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants