From cbd43d2db68b74db8e3b642cb6f9d1b81f518c99 Mon Sep 17 00:00:00 2001 From: Patrick Doyle <810052+prdoyle@users.noreply.github.com> Date: Thu, 20 Mar 2025 17:02:57 -0400 Subject: [PATCH] Use ALL-UNNAMED for the unnamed module in warnings (#125317) * Use ALL-UNNAMED for the unnamed module in warnings * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine --- .../runtime/policy/PolicyManager.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java index 2aed7e001d762..8d715788a4288 100644 --- a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java +++ b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java @@ -277,7 +277,7 @@ private void neverEntitled(Class callerClass, Supplier operationDescr Strings.format( "component [%s], module [%s], class [%s], operation [%s]", entitlements.componentName(), - requestingClass.getModule().getName(), + getModuleName(requestingClass), requestingClass, operationDescription.get() ), @@ -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) ), @@ -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 ), @@ -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) ), @@ -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) ) @@ -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 ) @@ -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 ), @@ -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 + '}';