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.

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

Jump to bottom

Issue #8973 - Rework KeyStoreScanner handling for symlink related changes #9014

Merged
merged 9 commits into from
Dec 7, 2022
Merged

Issue #8973 - Rework KeyStoreScanner handling for symlink related changes #9014

merged 9 commits into from
Dec 7, 2022

Conversation

joakime
Copy link
Contributor

@joakime joakime commented Dec 6, 2022

@joakime
Issue #8973 - Rework KeyStoreScanner handling for symlink related cha…
9047d11 
…nges

+ Removed changes from #8786 and #8787
+ More test cases

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime added the Bug For general bugs on Jetty side label Dec 6, 2022
@joakime joakime self-assigned this Dec 6, 2022
@joakime
Issue #8973 - Improving documentation in Tests
4e33c16 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime mentioned this pull request Dec 6, 2022
Closed
@lachlan-roberts
Copy link
Contributor

@joakime you need to update the jetty-ssl-context-reload.xml and ssl-reload.mod files as well.

@joakime
Issue #8973 - revert jetty.sslContext.reload.followLinks boolean
242eeec 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime
Copy link
Contributor Author

joakime commented Dec 7, 2022

@lachlan-roberts done, please re-review

joakime and others added 5 commits December 7, 2022 02:55
@joakime
Issue #8973 - improving comment
f8cfb65 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime
Issue #8973 - Scanner should follow its own linkOptions setting
ad03e45 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime
Issue #8973 - Cleanup KeyStoreScannerTest
3f2152e 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime
Issue #8973 - Comment change
17eefda 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@lachlan-roberts
remove bad documentation in module-ssl-reload.adoc
7130963 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts
Copy link
Contributor

@joakime I made a commit to remove some bad documentation about the followLinks setting from module-ssl-reload.adoc.

lachlan-roberts
lachlan-roberts approved these changes Dec 7, 2022
View reviewed changes
Copy link
Contributor

@lachlan-roberts lachlan-roberts left a comment

Choose a reason for hiding this comment

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

I can't think of an example where it would be necessary to resolve the symlinks in the KeyStoreScanner, so I think removing followLinks setting is ok.

jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java Show resolved Hide resolved
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java Show resolved Hide resolved
@joakime joakime merged commit 7e1de8b into jetty-10.0.x Dec 7, 2022
@joakime joakime deleted the fix/jetty-10.0.x/keystore-scanner-doubly-symlinked branch December 7, 2022 15:24
@joakime joakime mentioned this pull request Dec 7, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lachlan-roberts lachlan-roberts lachlan-roberts approved these changes

@sbordet sbordet Awaiting requested review from sbordet

Assignees

@joakime joakime

Labels
Bug For general bugs on Jetty side
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Does ssl-reload monitor keystore when it is a symlink?
2 participants
@joakime @lachlan-roberts