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 2018/11/20 16:51:07 UTC

[airavata] branch develop updated (a781ee2 -> 3589953)

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from a781ee2  AIRAVATA-2863 Don't update group's cardinality
     new 174cafc  Allowing calls to getApplicationDeploymentsForAppModuleAndGroupResourceProfile
     new 3589953  Fixing typo

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/airavata/api/server/handler/AiravataServerHandler.java  | 2 +-
 .../org/apache/airavata/service/security/KeyCloakSecurityManager.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


[airavata] 02/02: Fixing typo

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 3589953b13a9b73aeeb2c70da198a4ab010ef585
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Nov 20 11:50:45 2018 -0500

    Fixing typo
---
 .../org/apache/airavata/api/server/handler/AiravataServerHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 9d34c20..bf619a9 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -5119,7 +5119,7 @@ public class AiravataServerHandler implements Airavata.Iface {
                     throw new Exception("Not allowed to remove Admins group's WRITE access.");
                 }
                 if (groupPermissionList.containsKey(gatewayGroups.getReadOnlyAdminsGroupId())
-                        && groupPermissionList.get(gatewayGroups.getAdminsGroupId()).equals(ResourcePermissionType.READ)) {
+                        && groupPermissionList.get(gatewayGroups.getReadOnlyAdminsGroupId()).equals(ResourcePermissionType.READ)) {
                     throw new Exception("Not allowed to remove Read Only Admins group's READ access.");
                 }
             }


[airavata] 01/02: Allowing calls to getApplicationDeploymentsForAppModuleAndGroupResourceProfile

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 174cafce69718640c8865eaa955fb2c30936b254
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Nov 20 11:49:55 2018 -0500

    Allowing calls to getApplicationDeploymentsForAppModuleAndGroupResourceProfile
    
    getApplicationDeploymentsForAppModuleAndGroupResourceProfile is
    protected by sharing registry authorization so it's okay to allow anyone
    to call it.
---
 .../org/apache/airavata/service/security/KeyCloakSecurityManager.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 50145ec..7fc22b5 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
@@ -109,7 +109,8 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager {
     // These methods are protected by sharing registry authorization
     private final static String APPLICATION_DEPLOYMENT_METHODS =
             "/airavata/registerApplicationDeployment|/airavata/getApplicationDeployment|/airavata/updateApplicationDeployment" +
-                    "|/airavata/deleteApplicationDeployment|/airavata/getAllApplicationDeployments|/airavata/getAccessibleApplicationDeployments";
+                    "|/airavata/deleteApplicationDeployment|/airavata/getAllApplicationDeployments|/airavata/getAccessibleApplicationDeployments" +
+                    "|/airavata/getApplicationDeploymentsForAppModuleAndGroupResourceProfile";
     private final static String APPLICATION_MODULE_METHODS = "/airavata/getAccessibleAppModules";
     private final static String CREDENTIAL_TOKEN_METHODS = "/airavata/getCredentialSummary|/airavata/getAllCredentialSummaries|/airavata/generateAndRegisterSSHKeys|/airavata/registerPwdCredential|/airavata/deleteSSHPubKey|/airavata/deletePWDCredential";
     // Misc. other methods needed for group based authorization