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

Added hex color codes, added swith to utilize groups/rooms. updated exec

Browse Source 
to use new path parsing. Revert back to Spark 2.3 due to issues.
This commit is contained in:
Admin
2017-12-11 16:40:59 -06:00
parent 00dbea6dac
commit 4c86e42776
10 changed files with 112 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/bwssystems/HABridge/BridgeSecurity.java
View File

@@ -238,6 +238,31 @@ public class BridgeSecurity {
return null;
}
public String findWhitelistUserByDeviceType(String aDeviceType) {
String validUser = null;
boolean found = false;
WhitelistEntry anEntry = null;
if (aDeviceType != null) {
if (securityDescriptor.getWhitelist() != null) {
Set<String> theUserIds = securityDescriptor.getWhitelist().keySet();
Iterator<String> userIterator = theUserIds.iterator();
while (!found && userIterator.hasNext()) {
validUser = userIterator.next();
anEntry = securityDescriptor.getWhitelist().get(validUser);
if (anEntry.getName().equals(aDeviceType)) {
found = true;
log.debug("findWhitelistUserByDeviceType: found a user <" + validUser + "> for device type <" + aDeviceType + ">");
}
}
}
}
if(!found)
validUser = null;
return validUser;
}
private void newWhitelistUser(String aUser, String userDescription) {
if (securityDescriptor.getWhitelist() == null) {
securityDescriptor.setWhitelist(new HashMap<>());
@@ -250,8 +275,14 @@ public class BridgeSecurity {
}
public String createWhitelistUser(String userDescription) {
String aUser = getNewUserID();
newWhitelistUser(aUser, userDescription);
String aUser = null;
String theEntry = findWhitelistUserByDeviceType(userDescription);
if(theEntry == null) {
aUser = getNewUserID();
newWhitelistUser(aUser, userDescription);
} else {
aUser = theEntry;
}
return aUser;
}