demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix exec transformation service whitelisting (#14884)

Browse Source 
Reported on the german openHAB forum.

Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2023-04-26 21:52:00 +02:00 committed by GitHub
parent d7b94b6bd3
commit dba7fcc697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java
View File

@ -41,12 +41,14 @@ public class ExecTransformationWhitelistWatchService implements WatchService.Wat
private final Logger logger = LoggerFactory.getLogger(ExecTransformationWhitelistWatchService.class); private final Logger logger = LoggerFactory.getLogger(ExecTransformationWhitelistWatchService.class);
private final Set<String> commandWhitelist = new HashSet<>(); private final Set<String> commandWhitelist = new HashSet<>();
private final WatchService watchService; private final WatchService watchService;
private final Path watchFile;
@Activate @Activate
public ExecTransformationWhitelistWatchService( public ExecTransformationWhitelistWatchService(
final @Reference(target = WatchService.CONFIG_WATCHER_FILTER) WatchService watchService) { final @Reference(target = WatchService.CONFIG_WATCHER_FILTER) WatchService watchService) {
this.watchService = watchService; this.watchService = watchService;
watchService.registerListener(this, COMMAND_WHITELIST_FILE); this.watchFile = watchService.getWatchPath().resolve(COMMAND_WHITELIST_FILE);
watchService.registerListener(this, COMMAND_WHITELIST_FILE, false);
// read initial content // read initial content
processWatchEvent(WatchService.Kind.CREATE, COMMAND_WHITELIST_FILE); processWatchEvent(WatchService.Kind.CREATE, COMMAND_WHITELIST_FILE);
@ -59,9 +61,9 @@ public class ExecTransformationWhitelistWatchService implements WatchService.Wat
@Override @Override
public void processWatchEvent(WatchService.Kind kind, Path path) { public void processWatchEvent(WatchService.Kind kind, Path path) {
if (path.endsWith(COMMAND_WHITELIST_FILE)) { commandWhitelist.clear();
commandWhitelist.clear(); if (kind != WatchService.Kind.DELETE) {
try (Stream<String> lines = Files.lines(path)) { try (Stream<String> lines = Files.lines(watchFile)) {
lines.filter(line -> !line.trim().startsWith("#")).forEach(commandWhitelist::add); lines.filter(line -> !line.trim().startsWith("#")).forEach(commandWhitelist::add);
logger.debug("Updated command whitelist: {}", commandWhitelist); logger.debug("Updated command whitelist: {}", commandWhitelist);
} catch (IOException e) { } catch (IOException e) {