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

api: Fix APIAccessChecker and StaticRoleBasedAPIAccessChecker 

- Add getCmd api interface in APIAccessChecker adapter to get cmd properties
- Add mechanism in StaticRoleBasedAPIAccessChecker to get config properties
- Add public interface to get the cmd properties for the adapter impl

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-11 14:10:36 -08:00
parent f4892fbb84
commit 6ce68b93cc
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/com/cloud/acl/APIAccessChecker.java
View File

@ -16,6 +16,8 @@
// under the License.
package com.cloud.acl;
import java.util.Properties;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.user.Account;
import com.cloud.user.User;
@ -25,6 +27,8 @@ import com.cloud.utils.component.Adapter;
* APIAccessChecker checks the ownership and access control to API requests
*/
public interface APIAccessChecker extends Adapter {
boolean canAccessAPI(User user, String apiCommandName) throws PermissionDeniedException;
// Interface for checking access to an API for a user
boolean canAccessAPI(User user, String apiCommandName) throws PermissionDeniedException;
// Interface for getting API Cmd properties
Properties getApiCommands();
}

14
server/src/com/cloud/acl/StaticRoleBasedAPIAccessChecker.java
View File

@ -61,6 +61,7 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
private static List<String> s_resourceDomainAdminCommands = null;
private static List<String> s_allCommands = null;
private static List<String> s_pluggableServiceCommands = null;
private Properties _apiCommands = null;
protected @Inject AccountManager _accountMgr;
@ -90,6 +91,11 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
return commandExists;
}
@Override
public Properties getApiCommands() {
return _apiCommands;
}
private static boolean isCommandAvailableForAccount(short accountType, String commandName) {
boolean isCommandAvailable = false;
switch (accountType) {
@ -140,6 +146,9 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
private void processConfigFiles(String[] apiConfig, boolean pluggableServicesConfig) {
try {
if (_apiCommands == null)
_apiCommands = new Properties();
Properties preProcessedCommands = new Properties();
if (apiConfig != null) {
for (String configFile : apiConfig) {
@ -161,7 +170,7 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
for (Object key : preProcessedCommands.keySet()) {
String preProcessedCommand = preProcessedCommands.getProperty((String) key);
String[] commandParts = preProcessedCommand.split(";");
_apiCommands.setProperty(key.toString(), commandParts[0]);
if (pluggableServicesConfig) {
s_pluggableServiceCommands.add(commandParts[0]);
@ -196,8 +205,7 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
} catch (FileNotFoundException fnfex) {
s_logger.error("Unable to find properties file", fnfex);
} catch (IOException ioex) {
s_logger.error("Exception loading properties file", ioex);
s_logger.error("IO Exception loading properties file", ioex);
}
}
}