Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed reading json config with new data structure

This commit is contained in:
Robert von Burg 2019-04-16 11:42:44 +02:00
parent 79ad9d3423
commit 546c9b44bd
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
li.strolch.privilege/src/main/java/li/strolch/privilege/handler/JsonConfigLdapPrivilegeHandler.java
View File

@ -21,7 +21,7 @@ import li.strolch.utils.dbc.DBC;
public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler { public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
private Locale defaultLocale; private Locale defaultLocale;
private JsonObject configJ; private JsonObject ldapGroupConfigs;
private Set<String> ldapGroupNames; private Set<String> ldapGroupNames;
private String realm; private String realm;
private HashMap<String, String> userLdapGroupOverrides; private HashMap<String, String> userLdapGroupOverrides;
@ -50,24 +50,26 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
.getAbsolutePath()); .getAbsolutePath());
// parse the configuration file // parse the configuration file
JsonObject configJ;
try (FileReader reader = new FileReader(configFile)) { try (FileReader reader = new FileReader(configFile)) {
this.configJ = new JsonParser().parse(reader).getAsJsonObject(); configJ = new JsonParser().parse(reader).getAsJsonObject();
} catch (Exception e) { } catch (Exception e) {
throw new IllegalStateException("Failed to read config file " + configFile.getAbsolutePath(), e); throw new IllegalStateException("Failed to read config file " + configFile.getAbsolutePath(), e);
} }
// validate the configuration // validate the configuration
if (!this.configJ.has("ldapGroupConfigs") || !this.configJ.get("ldapGroupConfigs").isJsonObject()) if (!configJ.has("ldapGroupConfigs") || !configJ.get("ldapGroupConfigs").isJsonObject())
throw new IllegalStateException("JSON config is missing ldapGroupConfigs element!"); throw new IllegalStateException("JSON config is missing ldapGroupConfigs element!");
this.ldapGroupNames = this.configJ.keySet(); this.ldapGroupConfigs = configJ.get("ldapGroupConfigs").getAsJsonObject();
this.ldapGroupNames = ldapGroupConfigs.keySet();
if (this.ldapGroupNames.isEmpty()) if (this.ldapGroupNames.isEmpty())
throw new IllegalStateException( throw new IllegalStateException(
"No LDAP group names are defined in config file " + configFile.getAbsolutePath()); "No LDAP group names are defined in config file " + configFile.getAbsolutePath());
// validate the configuration // validate the configuration
for (String name : this.ldapGroupNames) { for (String name : this.ldapGroupNames) {
JsonObject config = this.configJ.get(name).getAsJsonObject(); JsonObject config = ldapGroupConfigs.get(name).getAsJsonObject();
if (!config.has(LOCATION) || !config.get(LOCATION).isJsonArray() if (!config.has(LOCATION) || !config.get(LOCATION).isJsonArray()
|| config.get(LOCATION).getAsJsonArray().size() == 0) || config.get(LOCATION).getAsJsonArray().size() == 0)
throw new IllegalStateException("LDAP Group " + name throw new IllegalStateException("LDAP Group " + name
@ -79,8 +81,8 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
} }
this.userLdapGroupOverrides = new HashMap<>(); this.userLdapGroupOverrides = new HashMap<>();
if (this.configJ.has("userLdapGroupOverrides")) { if (configJ.has("userLdapGroupOverrides")) {
JsonObject userLdapGroupOverrides = this.configJ.get("userLdapGroupOverrides").getAsJsonObject(); JsonObject userLdapGroupOverrides = configJ.get("userLdapGroupOverrides").getAsJsonObject();
for (String username : userLdapGroupOverrides.keySet()) { for (String username : userLdapGroupOverrides.keySet()) {
String group = userLdapGroupOverrides.get(username).getAsString(); String group = userLdapGroupOverrides.get(username).getAsString();
logger.info("Registered LDAP group override for user " + username + " to group " + group); logger.info("Registered LDAP group override for user " + username + " to group " + group);
@ -140,7 +142,7 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
Set<String> strolchRoles = new HashSet<>(); Set<String> strolchRoles = new HashSet<>();
for (String relevantLdapGroup : ldapGroups) { for (String relevantLdapGroup : ldapGroups) {
JsonObject mappingJ = this.configJ.get(relevantLdapGroup).getAsJsonObject(); JsonObject mappingJ = this.ldapGroupConfigs.get(relevantLdapGroup).getAsJsonObject();
mappingJ.get(ROLES).getAsJsonArray().forEach(e -> strolchRoles.add(e.getAsString())); mappingJ.get(ROLES).getAsJsonArray().forEach(e -> strolchRoles.add(e.getAsString()));
} }
@ -155,7 +157,7 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
Set<String> locations = new HashSet<>(); Set<String> locations = new HashSet<>();
for (String ldapGroup : ldapGroups) { for (String ldapGroup : ldapGroups) {
JsonObject mappingJ = this.configJ.get(ldapGroup).getAsJsonObject(); JsonObject mappingJ = this.ldapGroupConfigs.get(ldapGroup).getAsJsonObject();
mappingJ.get(LOCATION).getAsJsonArray().forEach(e -> locations.add(e.getAsString())); mappingJ.get(LOCATION).getAsJsonArray().forEach(e -> locations.add(e.getAsString()));
JsonElement defaultLocationJ = mappingJ.get(DEFAULT_LOCATION); JsonElement defaultLocationJ = mappingJ.get(DEFAULT_LOCATION);
if (defaultLocationJ != null && !defaultLocationJ.isJsonNull()) { if (defaultLocationJ != null && !defaultLocationJ.isJsonNull()) {