Fix log4j init with SecurityManager - #2568
Merged
Merged
Conversation
7 tasks
SylvainJuge
commented
Apr 1, 2022
felixbarny
approved these changes
Apr 1, 2022
SylvainJuge
commented
Apr 1, 2022
Comment on lines
-57
to
+64
| return anchor == null ? LogManager.getContext() : getContext(StackLocatorUtil.getCallerClass(anchor)); | ||
| // the logger context is defined by the class that calls LoggerFactory | ||
| final Class<?> factoryCaller = StackLocatorUtil.getCallerClass(LOGGER_FACTORY); | ||
| if (factoryCaller == null) { | ||
| return LogManager.getContext(); | ||
| } | ||
| return getContext(factoryCaller); |
Member
Author
There was a problem hiding this comment.
@eyalkoren I do need your review on this as I'm not 100% sure it's the right way to fix it.
Without this, the added anonymous class makes loggingLevelChangeTest test fail.
SylvainJuge
marked this pull request as ready for review
April 1, 2022 15:16
|
/test |
pugnascotia
approved these changes
Apr 1, 2022
eyalkoren
approved these changes
Apr 3, 2022
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
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.
What does this PR do?
Relates to #2550
Simply wraps the logger init in a
doPrivilegedblock to get the proper permissions when a Security Manager is present.Moving the
doPrivilegedwrapping down to thegetLoggerorgetContextmethods inLog4jFactoryBridgedoes not work as expected and we get other permission errors with ES, so we keep it in the caller side.Checklist