Skip to content

Commit fbc505f

Browse files
committed
Use empty component path list instead of null
1 parent d08d6d2 commit fbc505f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/FilesEntitlementsValidation.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.nio.file.Path;
1919
import java.util.HashSet;
20+
import java.util.List;
2021
import java.util.Map;
2122
import java.util.Set;
2223

@@ -44,7 +45,7 @@ static void validate(Map<String, Policy> pluginPolicies, PathLookup pathLookup)
4445
.map(x -> ((FilesEntitlement) x))
4546
.findFirst();
4647
if (filesEntitlement.isPresent()) {
47-
var fileAccessTree = FileAccessTree.withoutExclusivePaths(filesEntitlement.get(), pathLookup, null);
48+
var fileAccessTree = FileAccessTree.withoutExclusivePaths(filesEntitlement.get(), pathLookup, List.of());
4849
validateReadFilesEntitlements(pluginPolicy.getKey(), scope.moduleName(), fileAccessTree, readAccessForbidden);
4950
validateWriteFilesEntitlements(pluginPolicy.getKey(), scope.moduleName(), fileAccessTree, writeAccessForbidden);
5051
}

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,15 +321,16 @@ private ModuleEntitlements computeEntitlements(Class<?> requestingClass) {
321321
);
322322
}
323323
case UNKNOWN -> {
324-
return defaultEntitlements(UNKNOWN.componentName, null, moduleName);
324+
return defaultEntitlements(UNKNOWN.componentName, List.of(), moduleName);
325325
}
326326
default -> {
327327
assert policyScope.kind() == PLUGIN;
328328
var pluginEntitlements = pluginsEntitlements.get(componentName);
329+
Collection<Path> componentPaths = pluginSourcePaths.getOrDefault(componentName, List.of());
329330
if (pluginEntitlements == null) {
330-
return defaultEntitlements(componentName, pluginSourcePaths.get(componentName), moduleName);
331+
return defaultEntitlements(componentName, componentPaths, moduleName);
331332
} else {
332-
return getModuleScopeEntitlements(pluginEntitlements, moduleName, componentName, pluginSourcePaths.get(componentName));
333+
return getModuleScopeEntitlements(pluginEntitlements, moduleName, componentName, componentPaths);
333334
}
334335
}
335336
}

0 commit comments

Comments
 (0)