Skip to content

[DRAFT] Disable security manager for testing #17623

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

Closed
wants to merge 3 commits into from
Closed

[DRAFT] Disable security manager for testing #17623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b5833b
Disable security manager for testing
cwperks Mar 18, 2025
95a8e92
Allow sm to be null
cwperks Mar 18, 2025
810ac84
Merge branch 'main' into disable-jsm-test
cwperks Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
put("tests.gradle", "true");
put("tests.artifact", project.getName());
put("tests.task", test.getPath());
put("tests.security.manager", "true");
put("tests.security.manager", "false");

Check warning on line 154 in buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java

View check run for this annotation

Codecov / codecov/patch

buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java#L154 

Added line #L154 was not covered by tests
put("jna.nosys", "true");
}
};
Expand Down
4 changes: 3 additions & 1 deletion server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,9 @@ public final BootstrapCheckResult check(BootstrapContext context) {
@SuppressWarnings("removal")
boolean isAllPermissionGranted() {
final SecurityManager sm = System.getSecurityManager();
assert sm != null;
if (sm == null) {
return true;
}
try {
sm.checkPermission(new AllPermission());
} catch (final SecurityException e) {
Expand Down
2 changes: 1 addition & 1 deletion test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public class BootstrapForTesting {
IfConfig.logIfNecessary();

// install security manager if requested
if (systemPropertyAsBoolean("tests.security.manager", true)) {
if (systemPropertyAsBoolean("tests.security.manager", false)) {
try {
// initialize paths the same exact way as bootstrap
Permissions perms = new Permissions();
Expand Down
Loading