You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/06/30 18:24:30 UTC
airavata git commit: AIRAVATA-2419 Add sharing resource methods to
permissions
Repository: airavata
Updated Branches:
refs/heads/develop 94508b62b -> 2a00dd267
AIRAVATA-2419 Add sharing resource methods to permissions
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2a00dd26
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2a00dd26
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2a00dd26
Branch: refs/heads/develop
Commit: 2a00dd2677fd5c0b26f33c3cb4527949e40a777b
Parents: 94508b6
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jun 30 14:23:23 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jun 30 14:24:21 2017 -0400
----------------------------------------------------------------------
.../airavata/service/security/KeyCloakSecurityManager.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2a00dd26/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java
----------------------------------------------------------------------
diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java b/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java
index 97d55c6..960dd6f 100644
--- a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java
+++ b/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java
@@ -62,6 +62,7 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager {
"|/airavata/getAllUserComputeResourcePreferences|/airavata/getAllUserStoragePreferences" +
"|/airavata/updateUserComputeResourcePreference|/airavata/updateUserStoragePreference" +
"|/airavata/deleteUserComputeResourcePreference|/airavata/deleteUserStoragePreference";
+ private final static String SHARING_RESOURCE_METHODS = "/airavata/shareResourceWithUsers|/airavata/revokeSharingOfResourceFromUsers|/airavata/getAllAccessibleUsers";
public KeyCloakSecurityManager() throws AiravataSecurityException {
rolePermissionConfig.put("admin", "/airavata/.*");
@@ -90,7 +91,8 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager {
"|/airavata/isWorkflowExistWithName|/airavata/registerDataProduct|/airavata/getDataProduct|/airavata/registerReplicaLocation" +
"|/airavata/getParentDataProduct|/airavata/getChildDataProducts|/airavata/getAllAccessibleUsers" +
"|/airavata/getExperimentByAdmin|/airavata/cloneExperimentByAdmin" +
- "|" + USER_RESOURCE_PROFILE_USER_METHODS + "|/airavata/getAllUserResourceProfiles");
+ "|" + USER_RESOURCE_PROFILE_USER_METHODS + "|/airavata/getAllUserResourceProfiles" +
+ "|" + SHARING_RESOURCE_METHODS);
rolePermissionConfig.put("gateway-user", "/airavata/getAPIVersion|/airavata/getNotification|/airavata/getAllNotifications|" +
"/airavata/createProject|/airavata/updateProject|/airavata/getProject|/airavata/deleteProject|/airavata/getUserProjects|" +
"/airavata/searchProjectsByProjectName|/airavata/searchProjectsByProjectDesc|/airavata/searchExperimentsByName|" +
@@ -105,7 +107,8 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager {
"/airavata/getAvailableAppInterfaceComputeResources|/airavata/getComputeResource|/airavata/getAllComputeResourceNames|" +
"/airavata/getWorkflow|/airavata/getWorkflowTemplateId|/airavata/isWorkflowExistWithName|/airavata/registerDataProduct|" +
"/airavata/getDataProduct|/airavata/registerReplicaLocation|/airavata/getParentDataProduct|/airavata/getChildDataProducts|" +
- "/airavata/getAllAccessibleUsers|/airavata/getAllApplicationDeployments|" + USER_RESOURCE_PROFILE_USER_METHODS);
+ "/airavata/getAllAccessibleUsers|/airavata/getAllApplicationDeployments|" + USER_RESOURCE_PROFILE_USER_METHODS + "|" +
+ SHARING_RESOURCE_METHODS);
initializeSecurityInfra();
}