-
Notifications
You must be signed in to change notification settings - Fork 25.6k
[Entitlements] Instrumentation of NIO file channels #122816
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
59411c8
Instrumentation of NIO file channels
ldematte 920caea
Adjustments + IT tests
ldematte ef7c288
Checkstyle
ldematte 0a32b4d
Server needs data write for translog
ldematte 4155d7d
Revert change to muted tests
ldematte 71442d0
More server entitlements
ldematte b5837f5
Merge remote-tracking branch 'upstream/main' into entitlements/nio-ch…
ldematte File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
87 changes: 87 additions & 0 deletions
87
...t-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/NioChannelsActions.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.entitlement.qa.test; | ||
|
|
||
| import org.elasticsearch.common.util.concurrent.EsExecutors; | ||
| import org.elasticsearch.core.SuppressForbidden; | ||
| import org.elasticsearch.entitlement.qa.entitled.EntitledActions; | ||
|
|
||
| import java.io.FileDescriptor; | ||
| import java.io.IOException; | ||
| import java.nio.channels.AsynchronousFileChannel; | ||
| import java.nio.channels.FileChannel; | ||
| import java.nio.file.StandardOpenOption; | ||
| import java.util.Set; | ||
|
|
||
| import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.ALWAYS_DENIED; | ||
| import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.PLUGINS; | ||
|
|
||
| class NioChannelsActions { | ||
|
|
||
| @EntitlementTest(expectedAccess = ALWAYS_DENIED) | ||
| static void createFileChannel() throws IOException { | ||
| new DummyImplementations.DummyFileChannel().close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void fileChannelOpenForWrite() throws IOException { | ||
| FileChannel.open(FileCheckActions.readWriteFile(), StandardOpenOption.WRITE).close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void fileChannelOpenForRead() throws IOException { | ||
| FileChannel.open(FileCheckActions.readFile()).close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void fileChannelOpenForWriteWithOptions() throws IOException { | ||
| FileChannel.open(FileCheckActions.readWriteFile(), Set.of(StandardOpenOption.WRITE)).close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void fileChannelOpenForReadWithOptions() throws IOException { | ||
| FileChannel.open(FileCheckActions.readFile(), Set.of(StandardOpenOption.READ)).close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = ALWAYS_DENIED) | ||
| static void createAsynchronousFileChannel() throws IOException { | ||
| new DummyImplementations.DummyAsynchronousFileChannel().close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void asynchronousFileChannelOpenForWrite() throws IOException { | ||
| var file = EntitledActions.createTempFileForWrite(); | ||
| AsynchronousFileChannel.open(file, StandardOpenOption.WRITE).close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void asynchronousFileChannelOpenForRead() throws IOException { | ||
| var file = EntitledActions.createTempFileForRead(); | ||
| AsynchronousFileChannel.open(file).close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void asynchronousFileChannelOpenForWriteWithOptions() throws IOException { | ||
| var file = EntitledActions.createTempFileForWrite(); | ||
| AsynchronousFileChannel.open(file, Set.of(StandardOpenOption.WRITE), EsExecutors.DIRECT_EXECUTOR_SERVICE).close(); | ||
| } | ||
|
|
||
| @EntitlementTest(expectedAccess = PLUGINS) | ||
| static void asynchronousFileChannelOpenForReadWithOptions() throws IOException { | ||
| var file = EntitledActions.createTempFileForRead(); | ||
| AsynchronousFileChannel.open(file, Set.of(StandardOpenOption.READ), EsExecutors.DIRECT_EXECUTOR_SERVICE).close(); | ||
| } | ||
|
|
||
| @SuppressForbidden(reason = "specifically testing jdk.nio.Channels") | ||
| @EntitlementTest(expectedAccess = ALWAYS_DENIED) | ||
| static void channelsReadWriteSelectableChannel() throws IOException { | ||
| jdk.nio.Channels.readWriteSelectableChannel(new FileDescriptor(), new DummyImplementations.DummySelectableChannelCloser()).close(); | ||
| } | ||
| } |
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wondering, that's a lot of code to just testcloseand it's not directly obvious what this is used for. Maybe add a comment or is it simpler in the end to create a channel via the entitled plugin?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait, makes sense, I misread the test... we reject subclassing 👍