Skip to content

[Entitlements] Fix "No SecurityManager when entitlements are enabled" #119742

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

Merged
ldematte merged 2 commits into from
Jan 8, 2025
Merged

[Entitlements] Fix "No SecurityManager when entitlements are enabled" #119742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15bbcda
Missing test still using SM even when disabled
ldematte Jan 8, 2025
a5f05b4
Revert SystemJvmOptions change - set the SM as allowed for Hadoop
ldematte Jan 8, 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 ...ibution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private static Stream<String> maybeWorkaroundG1Bug() {

@UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
private static Stream<String> maybeAllowSecurityManager(boolean useEntitlements) {
if (useEntitlements == false && RuntimeVersionFeature.isSecurityManagerAvailable()) {
if (RuntimeVersionFeature.isSecurityManagerAvailable()) {
// Will become conditional on useEntitlements once entitlements can run without SM
Copy link
Copy Markdown
Contributor

@prdoyle prdoyle Jan 8, 2025

Choose a reason for hiding this comment

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

Heh, a prescient comment here.

Copy link
Copy Markdown
Contributor Author

@ldematte ldematte Jan 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Ehehe! I can remove/reword the comment :)
EDIT: it actually still make sense!

return Stream.of("-Djava.security.manager=allow");
}
Expand Down
3 changes: 2 additions & 1 deletion ...ample-spi-extension/src/main/java/org/elasticsearch/example/ExampleSecurityExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
public class ExampleSecurityExtension implements SecurityExtension {

static {
if (RuntimeVersionFeature.isSecurityManagerAvailable()) {
final boolean useEntitlements = Boolean.parseBoolean(System.getProperty("es.entitlements.enabled"));
if (useEntitlements == false && RuntimeVersionFeature.isSecurityManagerAvailable()) {
Copy link
Copy Markdown
Contributor

@prdoyle prdoyle Jan 8, 2025

Choose a reason for hiding this comment

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

Why do we check for entitlements here?

Copy link
Copy Markdown
Contributor Author

@ldematte ldematte Jan 8, 2025

Choose a reason for hiding this comment

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

If we don't, and run with test-entitlement/ with entitlement enabled, there will be no Security Manager -- will be null and throw an exception.

// check that the extension's policy works.
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
System.getSecurityManager().checkPropertyAccess("myproperty");
Expand Down