@@ -277,7 +277,7 @@ private void neverEntitled(Class<?> callerClass, Supplier<String> operationDescr
277
277
Strings .format (
278
278
"component [%s], module [%s], class [%s], operation [%s]" ,
279
279
entitlements .componentName (),
280
- requestingClass . getModule (). getName ( ),
280
+ getModuleName ( requestingClass ),
281
281
requestingClass ,
282
282
operationDescription .get ()
283
283
),
@@ -395,7 +395,7 @@ public void checkFileRead(Class<?> callerClass, Path path, boolean followLinks)
395
395
Strings .format (
396
396
"component [%s], module [%s], class [%s], entitlement [file], operation [read], path [%s]" ,
397
397
entitlements .componentName (),
398
- requestingClass . getModule (). getName ( ),
398
+ getModuleName ( requestingClass ),
399
399
requestingClass ,
400
400
realPath == null ? path : Strings .format ("%s -> %s" , path , realPath )
401
401
),
@@ -425,7 +425,7 @@ public void checkFileWrite(Class<?> callerClass, Path path) {
425
425
Strings .format (
426
426
"component [%s], module [%s], class [%s], entitlement [file], operation [write], path [%s]" ,
427
427
entitlements .componentName (),
428
- requestingClass . getModule (). getName ( ),
428
+ getModuleName ( requestingClass ),
429
429
requestingClass ,
430
430
path
431
431
),
@@ -514,7 +514,7 @@ private void checkFlagEntitlement(
514
514
Strings .format (
515
515
"component [%s], module [%s], class [%s], entitlement [%s]" ,
516
516
classEntitlements .componentName (),
517
- requestingClass . getModule (). getName ( ),
517
+ getModuleName ( requestingClass ),
518
518
requestingClass ,
519
519
PolicyParser .getEntitlementTypeName (entitlementClass )
520
520
),
@@ -527,7 +527,7 @@ private void checkFlagEntitlement(
527
527
() -> Strings .format (
528
528
"Entitled: component [%s], module [%s], class [%s], entitlement [%s]" ,
529
529
classEntitlements .componentName (),
530
- requestingClass . getModule (). getName ( ),
530
+ getModuleName ( requestingClass ),
531
531
requestingClass ,
532
532
PolicyParser .getEntitlementTypeName (entitlementClass )
533
533
)
@@ -547,7 +547,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
547
547
() -> Strings .format (
548
548
"Entitled: component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]" ,
549
549
entitlements .componentName (),
550
- requestingClass . getModule (). getName ( ),
550
+ getModuleName ( requestingClass ),
551
551
requestingClass ,
552
552
property
553
553
)
@@ -558,7 +558,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
558
558
Strings .format (
559
559
"component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]" ,
560
560
entitlements .componentName (),
561
- requestingClass . getModule (). getName ( ),
561
+ getModuleName ( requestingClass ),
562
562
requestingClass ,
563
563
property
564
564
),
@@ -740,6 +740,14 @@ private static boolean isTriviallyAllowed(Class<?> requestingClass) {
740
740
return false ;
741
741
}
742
742
743
+ /**
744
+ * @return the {@code requestingClass}'s module name as it would appear in an entitlement policy file
745
+ */
746
+ private static String getModuleName (Class <?> requestingClass ) {
747
+ String name = requestingClass .getModule ().getName ();
748
+ return (name == null ) ? ALL_UNNAMED : name ;
749
+ }
750
+
743
751
@ Override
744
752
public String toString () {
745
753
return "PolicyManager{" + "serverEntitlements=" + serverEntitlements + ", pluginsEntitlements=" + pluginsEntitlements + '}' ;
0 commit comments