etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

StaticRoleBasedAPIAccessChecker: Fix acl cfg processing error messages 

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2013-01-11 16:47:02 -08:00
parent 83e7214b02
commit 4c80684b1f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
View File

@ -43,9 +43,8 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIC
protected StaticRoleBasedAPIAccessChecker() {
super();
for (RoleType roleType: RoleType.values()) {
for (RoleType roleType: RoleType.values())
s_roleBasedApisMap.put(roleType, new HashSet<String>());
}
}
@Override
@ -71,16 +70,14 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIC
List<PluggableService> services = locator.getAllPluggableServices();
services.add((PluggableService) ComponentLocator.getComponent(ManagementServer.Name));
Map<String, String> configPropertiesMap = new HashMap<String, String>();
for (PluggableService service : services) {
configPropertiesMap.putAll(service.getProperties());
processConfigFiles(service.getProperties(), service.getClass().toString());
s_logger.info("Processed role based acl for: " + service.toString());
}
processConfigFiles(configPropertiesMap);
return true;
}
private void processConfigFiles(Map<String, String> configMap) {
private void processConfigFiles(Map<String, String> configMap, String service) {
for (Map.Entry<String, String> entry: configMap.entrySet()) {
String apiName = entry.getKey();
String roleMask = entry.getValue();
@ -91,7 +88,8 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIC
s_roleBasedApisMap.get(roleType).add(apiName);
}
} catch (NumberFormatException nfe) {
s_logger.info("Malformed commands.properties permissions value, for entry: " + entry.toString());
s_logger.info("Malformed getProperties() value for service: " + service
+ " for entry: " + entry.toString());
}
}
}