mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-18 16:17:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

testing for changes: 3.0.0 not storing extended values (2.0.7 does),

Browse Source 
update state not always working, Pi3 systemd not starting,
habridge.config created readable by everyone
This commit is contained in:
Admin
2016-08-31 16:31:51 -05:00
parent c61e623e23
commit 0e4319ea1d
4 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/bwssystems/HABridge/BridgeSettings.java
View File

@@ -9,6 +9,14 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.nio.file.attribute.AclEntry;
import java.nio.file.attribute.AclEntryPermission;
import java.nio.file.attribute.AclEntryType;
import java.nio.file.attribute.AclFileAttributeView;
import java.nio.file.attribute.UserPrincipal;
import java.nio.file.attribute.UserPrincipalLookupService;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Enumeration;
import org.apache.http.conn.util.InetAddressUtils;
@@ -178,14 +186,15 @@ public class BridgeSettings extends BackupHandler {
private void _loadConfig(Path aPath) {
String jsonContent = configReader(aPath);
if(jsonContent == null)
return;
try {
theBridgeSettings = new Gson().fromJson(jsonContent, BridgeSettingsDescriptor.class);
theBridgeSettings = new Gson().fromJson(jsonContent, BridgeSettingsDescriptor.class);
} catch (Exception e) {
log.warn("Issue loading values from file: " + aPath.toUri().toString() + ", Gson convert failed.");
theBridgeSettings = new BridgeSettingsDescriptor();
theBridgeSettings.setConfigfile(aPath.toString());
}
}
public void save(BridgeSettingsDescriptor newBridgeSettings) {
@@ -219,6 +228,19 @@ public class BridgeSettings extends BackupHandler {
Files.move(filePath, target);
}
Files.write(filePath, content.getBytes(), StandardOpenOption.CREATE);
// set attributes to be for user only
UserPrincipalLookupService upls = filePath.getFileSystem().getUserPrincipalLookupService();
UserPrincipal user = upls.lookupPrincipalByName(System.getProperty("user.name"));
AclEntry.Builder builder = AclEntry.newBuilder();
builder.setPermissions( EnumSet.of(AclEntryPermission.READ_DATA, AclEntryPermission.EXECUTE,
AclEntryPermission.READ_ACL, AclEntryPermission.READ_ATTRIBUTES, AclEntryPermission.READ_NAMED_ATTRS,
AclEntryPermission.WRITE_ACL, AclEntryPermission.DELETE
));
builder.setPrincipal(user);
builder.setType(AclEntryType.ALLOW);
AclFileAttributeView aclAttr = Files.getFileAttributeView(filePath, AclFileAttributeView.class);
aclAttr.setAcl(Collections.singletonList(builder.build()));
if(target != null)
Files.delete(target);
} catch (IOException e) {
@@ -233,7 +255,6 @@ public class BridgeSettings extends BackupHandler {
return null;
}
try {
content = new String(Files.readAllBytes(filePath));
} catch (IOException e) {