Skip to content

Use ALL-UNNAMED for the unnamed module in warnings #125317

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
merged 5 commits into from
Mar 20, 2025
Merged

Use ALL-UNNAMED for the unnamed module in warnings #125317

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fecd138
Use ALL-UNNAMED for the unnamed module in warnings
prdoyle Mar 20, 2025
fdaa08a
[CI] Auto commit changes from spotless
Mar 20, 2025
3fbcf32
Merge branch 'main' into all-unnamed
prdoyle Mar 20, 2025
60aabd9
Merge branch 'main' into all-unnamed
prdoyle Mar 20, 2025
2f658ac
Merge branch 'main' into all-unnamed
prdoyle Mar 20, 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
22 changes: 15 additions & 7 deletions ...entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ private void neverEntitled(Class<?> callerClass, Supplier<String> operationDescr
Strings.format(
"component [%s], module [%s], class [%s], operation [%s]",
entitlements.componentName(),
requestingClass.getModule().getName(),
getModuleName(requestingClass),
requestingClass,
operationDescription.get()
),
Expand Down Expand Up @@ -395,7 +395,7 @@ public void checkFileRead(Class<?> callerClass, Path path, boolean followLinks)
Strings.format(
"component [%s], module [%s], class [%s], entitlement [file], operation [read], path [%s]",
entitlements.componentName(),
requestingClass.getModule().getName(),
getModuleName(requestingClass),
requestingClass,
realPath == null ? path : Strings.format("%s -> %s", path, realPath)
),
Expand Down Expand Up @@ -425,7 +425,7 @@ public void checkFileWrite(Class<?> callerClass, Path path) {
Strings.format(
"component [%s], module [%s], class [%s], entitlement [file], operation [write], path [%s]",
entitlements.componentName(),
requestingClass.getModule().getName(),
getModuleName(requestingClass),
requestingClass,
path
),
Expand Down Expand Up @@ -514,7 +514,7 @@ private void checkFlagEntitlement(
Strings.format(
"component [%s], module [%s], class [%s], entitlement [%s]",
classEntitlements.componentName(),
requestingClass.getModule().getName(),
getModuleName(requestingClass),
requestingClass,
PolicyParser.getEntitlementTypeName(entitlementClass)
),
Expand All @@ -527,7 +527,7 @@ private void checkFlagEntitlement(
() -> Strings.format(
"Entitled: component [%s], module [%s], class [%s], entitlement [%s]",
classEntitlements.componentName(),
requestingClass.getModule().getName(),
getModuleName(requestingClass),
requestingClass,
PolicyParser.getEntitlementTypeName(entitlementClass)
)
Expand All @@ -547,7 +547,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
() -> Strings.format(
"Entitled: component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]",
entitlements.componentName(),
requestingClass.getModule().getName(),
getModuleName(requestingClass),
requestingClass,
property
)
Expand All @@ -558,7 +558,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
Strings.format(
"component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]",
entitlements.componentName(),
requestingClass.getModule().getName(),
getModuleName(requestingClass),
requestingClass,
property
),
Expand Down Expand Up @@ -740,6 +740,14 @@ private static boolean isTriviallyAllowed(Class<?> requestingClass) {
return false;
}

/**
* @return the {@code requestingClass}'s module name as it would appear in an entitlement policy file
*/
private static String getModuleName(Class<?> requestingClass) {
String name = requestingClass.getModule().getName();
return (name == null) ? ALL_UNNAMED : name;
}

@Override
public String toString() {
return "PolicyManager{" + "serverEntitlements=" + serverEntitlements + ", pluginsEntitlements=" + pluginsEntitlements + '}';
Expand Down