Secure the invoker with ssl.#3968
Merged
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #3968 +/- ##
==========================================
- Coverage 85.84% 81.25% -4.59%
==========================================
Files 147 147
Lines 7114 7113 -1
Branches 419 431 +12
==========================================
- Hits 6107 5780 -327
- Misses 1007 1333 +326
Continue to review full report at Codecov.
|
cbickel
added
the
review
Contributor
Author
|
PG2#3514 🔵 |
vvraskin
reviewed
Aug 21, 2018
vvraskin
left a comment
vvraskin
left a comment
Contributor
There was a problem hiding this comment.
Thanks for cleaning up the previous https configuration, neatly done. Just some minor comments
| keyPrefix: "{{ __controller_ssl_keyPrefix }}" | ||
| storeFlavor: PKCS12 | ||
| clientAuth: "{{ controller_client_auth | default('true') }}" | ||
| cert: "controller-openwhisk-server-cert.pem" |
Contributor
There was a problem hiding this comment.
Should we use this var __controller_ssl_keyPrefix for both cert and key variables?
| keyPrefix: "{{ __invoker_ssl_keyPrefix }}" | ||
| storeFlavor: "PKCS12" | ||
| clientAuth: "{{ invoker_client_auth | default('true') }}" | ||
| cert: "invoker-openwhisk-server-cert.pem" |
Contributor
There was a problem hiding this comment.
the same as above, __invoker_ssl_keyPrefix
| val ts: KeyStore = getCertStore(truststorePassword, httpsConfig.truststoreFlavor, httpsConfig.keystorePath) | ||
| val trustManagerFactory: TrustManagerFactory = TrustManagerFactory.getInstance(keyFactoryType) | ||
| trustManagerFactory.init(ts) | ||
| trustManagerFactory.init(keyStore) |
Contributor
There was a problem hiding this comment.
As discussed in person, should we add a comment saying that we use keystore as a truststore here or leave truststore configurable from the outside?
| * Starts an HTTPS route handler on given port and registers a shutdown hook. | ||
| */ | ||
| def startHttpsService(route: Route, port: Int, config: WhiskConfig)(implicit actorSystem: ActorSystem, | ||
| def startHttpsService(route: Route, port: Int, config: HttpsConfig)(implicit actorSystem: ActorSystem, |
Contributor
There was a problem hiding this comment.
This method is pretty similar to startHttpService, should we perhaps merge them to something like:
def startHttpService(route: Route, port: Int, config: Option[HttpsConfig] = None)(
implicit actorSystem: ActorSystem,
materializer: ActorMaterializer): Unit = {
implicit val executionContext = actorSystem.dispatcher
val context = config.map(c => Https.connectionContext(c)).getOrElse(Http().defaultServerHttpContext)
Http().bindAndHandle(route, "0.0.0.0", port, connectionContext = context)
}
3d492ca to
008153e
Compare
cbickel
force-pushed
the
ssl
branch
2 times, most recently
from
f257c0c to
7b37df3
Compare
BillZong
pushed a commit
to BillZong/openwhisk
that referenced
this pull request
Nov 18, 2019
* Secure the invoker with ssl. * Tidy up controller ssl. * Review.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR adds SSL to the invoker to secure the ping-endpoint. In addition it tidies up some controller-ssl-settings.
Related issue and scope
My changes affect the following components
Types of changes
Checklist: