Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions docs/changelog/131680.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 131680
summary: Grant server module read/write entitlements for deprecated path setting "path.shared_data"
area: Infra/Core
type: bug
issues: []
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public static BootstrapArgs bootstrapArgs() {
* @param scopeResolver a functor to map a Java Class to the component and module it belongs to.
* @param settingResolver a functor to resolve a setting name pattern for one or more Elasticsearch settings.
* @param dataDirs data directories for Elasticsearch
* @param sharedDataDir shared data directory for Elasticsearch (deprecated)
* @param sharedRepoDirs shared repository directories for Elasticsearch
* @param configDir the config directory for Elasticsearch
* @param libDir the lib directory for Elasticsearch
Expand All @@ -86,6 +87,7 @@ public static void bootstrap(
Function<Class<?>, PolicyManager.PolicyScope> scopeResolver,
Function<String, Stream<String>> settingResolver,
Path[] dataDirs,
Path sharedDataDir,
Path[] sharedRepoDirs,
Path configDir,
Path libDir,
Expand All @@ -109,6 +111,7 @@ public static void bootstrap(
getUserHome(),
configDir,
dataDirs,
sharedDataDir,
sharedRepoDirs,
libDir,
modulesDir,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import static org.elasticsearch.entitlement.runtime.policy.PathLookup.BaseDir.LOGS;
import static org.elasticsearch.entitlement.runtime.policy.PathLookup.BaseDir.MODULES;
import static org.elasticsearch.entitlement.runtime.policy.PathLookup.BaseDir.PLUGINS;
import static org.elasticsearch.entitlement.runtime.policy.PathLookup.BaseDir.SHARED_DATA;
import static org.elasticsearch.entitlement.runtime.policy.PathLookup.BaseDir.SHARED_REPO;
import static org.elasticsearch.entitlement.runtime.policy.Platform.LINUX;
import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.Mode.READ;
Expand All @@ -57,6 +58,7 @@ private static List<Scope> createServerEntitlements(Path pidFile) {
FilesEntitlement.FileData.ofBaseDirPath(LOGS, READ_WRITE),
FilesEntitlement.FileData.ofBaseDirPath(LIB, READ),
FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE),
FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE),
FilesEntitlement.FileData.ofBaseDirPath(SHARED_REPO, READ_WRITE),
// exclusive settings file
FilesEntitlement.FileData.ofRelativePath(Path.of("operator/settings.json"), CONFIG, READ_WRITE).withExclusive(true),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ enum BaseDir {
USER_HOME,
CONFIG,
DATA,
SHARED_DATA,
SHARED_REPO,
LIB,
MODULES,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public record PathLookupImpl(
Path homeDir,
Path configDir,
Path[] dataDirs,
Path sharedDataDir,
Path[] sharedRepoDirs,
Path libDir,
Path modulesDir,
Expand Down Expand Up @@ -56,6 +57,7 @@ public Stream<Path> getBaseDirPaths(BaseDir baseDir) {
return switch (baseDir) {
case USER_HOME -> Stream.of(homeDir);
case DATA -> Arrays.stream(dataDirs);
case SHARED_DATA -> Stream.ofNullable(sharedDataDir);
case SHARED_REPO -> Arrays.stream(sharedRepoDirs);
case CONFIG -> Stream.of(configDir);
case LIB -> Stream.of(libDir);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public static void beforeClass() {
testBaseDir.resolve("user/home"),
TEST_CONFIG_DIR,
new Path[] { testBaseDir.resolve("data1"), testBaseDir.resolve("data2") },
Path.of("/shareddata"),
new Path[] { testBaseDir.resolve("shared1"), testBaseDir.resolve("shared2") },
TEST_LIBS_DIR,
testBaseDir.resolve("modules"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ private static Path path(String s) {
Path.of("/home"),
Path.of("/config"),
new Path[] { Path.of("/data1"), Path.of("/data2") },
Path.of("/shareddata"),
new Path[] { Path.of("/shared1"), Path.of("/shared2") },
Path.of("/lib"),
Path.of("/modules"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public static void beforeClass() {
baseDir.resolve("/user/home"),
baseDir.resolve("/config"),
new Path[] { baseDir.resolve("/data1/"), baseDir.resolve("/data2") },
Path.of("/shareddata"),
new Path[] { baseDir.resolve("/shared1"), baseDir.resolve("/shared2") },
baseDir.resolve("/lib"),
baseDir.resolve("/modules"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public static void setupRoot() {
Path.of("/home"),
Path.of("/config"),
new Path[] { Path.of("/data1"), Path.of("/data2") },
Path.of("/shareddata"),
new Path[] { Path.of("/shared1"), Path.of("/shared2") },
Path.of("/lib"),
Path.of("/modules"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ private static void initPhase2(Bootstrap bootstrap) throws IOException {
scopeResolver::resolveClassToScope,
nodeEnv.settings()::getValues,
nodeEnv.dataDirs(),
nodeEnv.sharedDataDir(),
nodeEnv.repoDirs(),
nodeEnv.configDir(),
nodeEnv.libDir(),
Expand Down