Skip to content

Allow custom command role ACL files on classpath in Static Role API Checker #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ProjectMoon wants to merge 1 commit into from
Closed

Allow custom command role ACL files on classpath in Static Role API Checker #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@

<bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker" >
<property name="services" value="#{apiCommandsRegistry.registered}" />
<property name="commandPropertyFiles">
<set>
<value>commands.properties</value>
</set>
</property>
</bean>

</beans>
13 changes: 12 additions & 1 deletion .../acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIC

protected static final Logger s_logger = Logger.getLogger(StaticRoleBasedAPIAccessChecker.class);

Set<String> commandPropertyFiles = new HashSet<String>();
Set<String> commandsPropertiesOverrides = new HashSet<String>();
Map<RoleType, Set<String>> commandsPropertiesRoleBasedApisMap = new HashMap<RoleType, Set<String>>();
Map<RoleType, Set<String>> annotationRoleBasedApisMap = new HashMap<RoleType, Set<String>>();
Expand Down Expand Up @@ -84,7 +85,9 @@ public boolean checkAccess(User user, String commandName) throws PermissionDenie
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
super.configure(name, params);

processMapping(PropertiesUtil.processConfigFile(new String[] {"commands.properties"}));
for (String commandPropertyFile : commandPropertyFiles) {
processMapping(PropertiesUtil.processConfigFile(new String[] { commandPropertyFile }));
}
return true;
}

Expand Down Expand Up @@ -129,4 +132,12 @@ public void setServices(List<PluggableService> services) {
this._services = services;
}

public Set<String> getCommandPropertyFiles() {
return commandPropertyFiles;
}

public void setCommandPropertyFiles(Set<String> commandPropertyFiles) {
this.commandPropertyFiles = commandPropertyFiles;
}

}