Skip to content

Commit 81658d8

Browse files
committed
Added FreeBSD support to Entitlement module
1 parent 7b9f904 commit 81658d8

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static char separatorChar() {
181181

182182
private static final Logger logger = LogManager.getLogger(FileAccessTree.class);
183183
private static final String FILE_SEPARATOR = getDefaultFileSystem().getSeparator();
184-
static final FileAccessTreeComparison DEFAULT_COMPARISON = Platform.LINUX.isCurrent()
184+
static final FileAccessTreeComparison DEFAULT_COMPARISON = (Platform.LINUX.isCurrent() || Platform.FREEBSD.isCurrent())
185185
? new CaseSensitiveComparison(separatorChar())
186186
: new CaseInsensitiveComparison(separatorChar());
187187

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
public enum Platform {
1313
LINUX,
1414
MACOS,
15-
WINDOWS;
15+
WINDOWS,
16+
FREEBSD;
1617

1718
private static final Platform current = findCurrent();
1819

@@ -24,6 +25,8 @@ private static Platform findCurrent() {
2425
return MACOS;
2526
} else if (os.startsWith("Windows")) {
2627
return WINDOWS;
28+
} else if (os.startsWith("FreeBSD")) {
29+
return FREEBSD;
2730
} else {
2831
throw new AssertionError("Unsupported platform [" + os + "]");
2932
}

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlement.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,10 @@ private static Platform parsePlatform(String platform) {
172172
return Platform.MACOS;
173173
} else if (platform.equals("windows")) {
174174
return Platform.WINDOWS;
175+
} else if (platform.equals("freebsd")) {
176+
return Platform.FREEBSD;
175177
} else {
176-
throw new PolicyValidationException("invalid platform: " + platform + ", valid values: [linux, macos, windows]");
178+
throw new PolicyValidationException("invalid platform: " + platform + ", valid values: [linux, macos, windows, freebsd]");
177179
}
178180
}
179181

0 commit comments

Comments
 (0)