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/06/20 15:51:29 UTC
[airavata] 01/02: AIRAVATA-2835 Removes ResourceType from Sharing
methods
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 1e1b084a1cb464f3c2c80c81a2e47714401ecc79
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jun 20 11:48:10 2018 -0400
AIRAVATA-2835 Removes ResourceType from Sharing methods
---
.../api/server/handler/AiravataServerHandler.java | 25 +++++++++++-----------
.../airavata-apis/airavata_api.thrift | 12 +++++------
2 files changed, 18 insertions(+), 19 deletions(-)
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 4117ef7..131fa14 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
@@ -4992,12 +4992,11 @@ public class AiravataServerHandler implements Airavata.Iface {
*
* @param authzToken
* @param resourceId
- * @param resourceType
* @param userPermissionList
*/
@Override
@SecurityCheck
- public boolean shareResourceWithUsers(AuthzToken authzToken, String resourceId, ResourceType resourceType,
+ public boolean shareResourceWithUsers(AuthzToken authzToken, String resourceId,
Map<String, ResourcePermissionType> userPermissionList) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
// TODO: first verify that authenticating user is OWNER of the resource
@@ -5021,7 +5020,7 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClientPool.returnResource(sharingClient);
return true;
} catch (Exception e) {
- String msg = "Error in sharing resource with users. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ String msg = "Error in sharing resource with users. Resource ID : " + resourceId;
logger.error(msg, e);
AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
exception.setMessage(msg + " More info : " + e.getMessage());
@@ -5033,7 +5032,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public boolean shareResourceWithGroups(AuthzToken authzToken, String resourceId, ResourceType resourceType,
+ public boolean shareResourceWithGroups(AuthzToken authzToken, String resourceId,
Map<String, ResourcePermissionType> groupPermissionList)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
// TODO: first verify that authenticating user is OWNER of the resource
@@ -5057,7 +5056,7 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClientPool.returnResource(sharingClient);
return true;
} catch (Exception e) {
- String msg = "Error in sharing resource with groups. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ String msg = "Error in sharing resource with groups. Resource ID : " + resourceId;
logger.error(msg, e);
AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
exception.setMessage(msg + " More info : " + e.getMessage());
@@ -5069,7 +5068,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public boolean revokeSharingOfResourceFromUsers(AuthzToken authzToken, String resourceId, ResourceType resourceType,
+ public boolean revokeSharingOfResourceFromUsers(AuthzToken authzToken, String resourceId,
Map<String, ResourcePermissionType> userPermissionList) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
// TODO: first verify that authenticating user is OWNER of the resource
RegistryService.Client regClient = registryClientPool.getResource();
@@ -5092,7 +5091,7 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClientPool.returnResource(sharingClient);
return true;
} catch (Exception e) {
- String msg = "Error in revoking access to resource from users. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ String msg = "Error in revoking access to resource from users. Resource ID : " + resourceId;
logger.error(msg, e);
AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
exception.setMessage(msg + " More info : " + e.getMessage());
@@ -5104,7 +5103,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public boolean revokeSharingOfResourceFromGroups(AuthzToken authzToken, String resourceId, ResourceType resourceType,
+ public boolean revokeSharingOfResourceFromGroups(AuthzToken authzToken, String resourceId,
Map<String, ResourcePermissionType> groupPermissionList)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
// TODO: first verify that authenticating user is OWNER of the resource
@@ -5138,7 +5137,7 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClientPool.returnResource(sharingClient);
return true;
} catch (Exception e) {
- String msg = "Error in revoking access to resource from groups. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ String msg = "Error in revoking access to resource from groups. Resource ID : " + resourceId;
logger.error(msg, e);
AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
exception.setMessage(msg + " More info : " + e.getMessage());
@@ -5150,7 +5149,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public List<String> getAllAccessibleUsers(AuthzToken authzToken, String resourceId, ResourceType resourceType, ResourcePermissionType permissionType) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public List<String> getAllAccessibleUsers(AuthzToken authzToken, String resourceId, ResourcePermissionType permissionType) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
RegistryService.Client regClient = registryClientPool.getResource();
SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
try {
@@ -5178,7 +5177,7 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClientPool.returnResource(sharingClient);
return new ArrayList<>(accessibleUsers);
} catch (Exception e) {
- String msg = "Error in getting all accessible users for resource. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ String msg = "Error in getting all accessible users for resource. Resource ID : " + resourceId;
logger.error(msg, e);
AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
exception.setMessage(msg + " More info : " + e.getMessage());
@@ -5190,7 +5189,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public List<String> getAllAccessibleGroups(AuthzToken authzToken, String resourceId, ResourceType resourceType, ResourcePermissionType permissionType) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public List<String> getAllAccessibleGroups(AuthzToken authzToken, String resourceId, ResourcePermissionType permissionType) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
RegistryService.Client regClient = registryClientPool.getResource();
SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
try {
@@ -5209,7 +5208,7 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClientPool.returnResource(sharingClient);
return new ArrayList<>(accessibleGroups);
} catch (Exception e) {
- String msg = "Error in getting all accessible groups for resource. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ String msg = "Error in getting all accessible groups for resource. Resource ID : " + resourceId;
logger.error(msg, e);
AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
exception.setMessage(msg + " More info : " + e.getMessage());
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 3d91145..de4b90e 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -3503,42 +3503,42 @@ service Airavata {
/**
* Group Manager and Data Sharing Related API methods
**/
- bool shareResourceWithUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ bool shareResourceWithUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId,
4: map<string, group_manager_model.ResourcePermissionType> userPermissionList)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool shareResourceWithGroups(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ bool shareResourceWithGroups(1: required security_model.AuthzToken authzToken, 2: required string resourceId,
4: map<string, group_manager_model.ResourcePermissionType> groupPermissionList)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool revokeSharingOfResourceFromUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ bool revokeSharingOfResourceFromUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId,
4: map<string, group_manager_model.ResourcePermissionType> userPermissionList)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool revokeSharingOfResourceFromGroups(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ bool revokeSharingOfResourceFromGroups(1: required security_model.AuthzToken authzToken, 2: required string resourceId,
4: map<string, group_manager_model.ResourcePermissionType> groupPermissionList)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- list<string> getAllAccessibleUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ list<string> getAllAccessibleUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId,
4: required group_manager_model.ResourcePermissionType permissionType)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- list<string> getAllAccessibleGroups(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ list<string> getAllAccessibleGroups(1: required security_model.AuthzToken authzToken, 2: required string resourceId,
4: required group_manager_model.ResourcePermissionType permissionType)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,