Fixes #5689 - Jetty ssl keystorePath doesn't work with absolute path. #5867
Conversation
This file contains 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
Introduced new properties jetty.sslContext.keyStoreAbsolutePath
and jetty.sslContext.trustStoreAbsolutePath to default to
${jetty.base}/etc/keystore.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
gregw
requested changes
Jan 11, 2021
Comment on lines
+25
to
+31
| <Set name="TrustStorePath"> | ||
| <Property name="jetty.sslContext.trustStoreAbsolutePath"> | ||
| <Default> | ||
| <Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="etc/keystore"/> | ||
| </Default> | ||
| </Property> | ||
| </Set> |
There was a problem hiding this comment.
Rather than introduce a new property to resolve the absolute vs relative issue, might it not be better to introduce a static helper method:
Suggested change
| <Set name="TrustStorePath"> | |
| <Property name="jetty.sslContext.trustStoreAbsolutePath"> | |
| <Default> | |
| <Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="etc/keystore"/> | |
| </Default> | |
| </Property> | |
| </Set> | |
| <Set name="TrustStorePath"> | |
| <Call class="org.eclipse.jetty.xml.XmlConfiguration" name="addPaths"> | |
| <Arg><Property name="jetty.base" default="." /></Arg> | |
| <Arg><Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="etc/keystore"/></Arg> | |
| </Call> | |
| </Set> |
Perhaps even URIUtil.addPaths can be used? Hmmm but then I guess we get caught up in portability issues and working out if C:some\path is relative or not.
gregw
approved these changes
Jan 11, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Introduced new properties jetty.sslContext.keyStoreAbsolutePath
and jetty.sslContext.trustStoreAbsolutePath to default to
${jetty.base}/etc/keystore.
Signed-off-by: Simone Bordet simone.bordet@gmail.com