airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata git commit: AIRAVATA-2500 Add new methods to API security
Date Thu, 28 Sep 2017 14:43:06 GMT
Repository: airavata
Updated Branches:
  refs/heads/AIRAVATA-2500 50d7bb6a5 -> de6faa346


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/AIRAVATA-2500
Commit: de6faa346057a5f4461a59e4b79773ad0f210c8c
Parents: 50d7bb6
Author: Marcus Christie <machristie@apache.org>
Authored: Thu Sep 28 10:42:30 2017 -0400
Committer: Marcus Christie <machristie@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();
     }


Mime
View raw message