Enable security manager for active directory tests #112411
Open
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
When active directory tests switched to using test rules for manager docker fixtures, the security manager was disabled. This commit re-enables the security manager, and isolates the docker setup/start to not run under security manager.
rjernst
added
>test
elasticsearchmachine
added
Team:Core/Infra
|
Pinging @elastic/es-security (Team:Security) |
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
rjernst
commented
Aug 31, 2024
| * | ||
| * @return A closeable object which restores the test security manager | ||
| */ | ||
| @SuppressWarnings("removal") | ||
| public static Closeable disableTestSecurityManager() { | ||
| var caller = Thread.currentThread().getStackTrace()[2]; | ||
| if (ESTestCase.class.getName().equals(caller.getClassName()) == false) { | ||
| throw new SecurityException("Cannot disable test SecurityManager directly. Use @NoSecurityManager to disable on a test suite"); |
There was a problem hiding this comment.
Note for core/infra: I've relaxed this requirement to enable broader use of disabling security manager for parts of testing. The most important thing is to ensure security manager is not disabled and forgotten. We already return a releasable object, and additional validation ensures we haven't forgotten to re-enable security manager between tests.
ldematte
approved these changes
Sep 2, 2024
thecoop
reviewed
Sep 2, 2024
| * Temporarily dsiables security manager for a test. | ||
| * | ||
| * <p> This method is only callable by {@link org.elasticsearch.test.ESTestCase}. | ||
| * Temporarily disables security manager for a test. | ||
| * | ||
| * @return A closeable object which restores the test security manager | ||
| */ | ||
| @SuppressWarnings("removal") | ||
| public static Closeable disableTestSecurityManager() { |
There was a problem hiding this comment.
We could change this to return Releaseable so we don't need to catch IOException in the methods below?
mark-vieira
approved these changes
Sep 3, 2024
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.
When active directory tests switched to using test rules for manager docker fixtures, the security manager was disabled. This commit re-enables the security manager, and isolates the docker setup/start to not run under security manager.