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/09/28 14:44:24 UTC
[1/2] airavata git commit: AIRAVATA-2500 Add new methods to API
security
Repository: airavata
Updated Branches:
refs/heads/develop db2a68268 -> 430001c28
AIRAVATA-2500 Add new methods to API security
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/de6faa34
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/de6faa34
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/de6faa34
Branch: refs/heads/develop
Commit: de6faa346057a5f4461a59e4b79773ad0f210c8c
Parents: 50d7bb6
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Sep 28 10:42:30 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Sep 28 10:42:30 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/de6faa34/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 419acb0..903141c 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
@@ -65,6 +65,9 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager {
"|/airavata/generateAndRegisterSSHKeys|/airavata/getAllCredentialSummaryForUsersInGateway" +
"|/airavata/deleteSSHPubKey";
private final static String SHARING_RESOURCE_METHODS = "/airavata/shareResourceWithUsers|/airavata/revokeSharingOfResourceFromUsers|/airavata/getAllAccessibleUsers";
+ private final static String SSH_ACCOUNT_PROVISIONER_METHODS =
+ "/airavata/getSSHAccountProvisioners|/airavata/doesUserHaveSSHAccount|/airavata" +
+ "/setupUserComputeResourcePreferencesForSSH";
public KeyCloakSecurityManager() throws AiravataSecurityException {
rolePermissionConfig.put("admin", "/airavata/.*");
@@ -94,7 +97,7 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager {
"|/airavata/getParentDataProduct|/airavata/getChildDataProducts|/airavata/getAllAccessibleUsers" +
"|/airavata/getExperimentByAdmin|/airavata/cloneExperimentByAdmin" +
"|" + USER_RESOURCE_PROFILE_USER_METHODS + "|/airavata/getAllUserResourceProfiles" +
- "|" + SHARING_RESOURCE_METHODS + "|/airavata/getGateway");
+ "|" + SHARING_RESOURCE_METHODS + "|/airavata/getGateway|" + SSH_ACCOUNT_PROVISIONER_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|" +
@@ -110,7 +113,7 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager {
"/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 + "|" +
- SHARING_RESOURCE_METHODS);
+ SHARING_RESOURCE_METHODS + "|" + SSH_ACCOUNT_PROVISIONER_METHODS);
initializeSecurityInfra();
}
[2/2] airavata git commit: Merge branch 'AIRAVATA-2500' into develop
Posted by ma...@apache.org.
Merge branch 'AIRAVATA-2500' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/430001c2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/430001c2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/430001c2
Branch: refs/heads/develop
Commit: 430001c28415fe60376f2975f9ef4a6b0d4e6619
Parents: db2a682 de6faa3
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Sep 28 10:43:24 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Sep 28 10:44:08 2017 -0400
----------------------------------------------------------------------
.../airavata/service/security/KeyCloakSecurityManager.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------