You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2021/09/02 23:23:42 UTC
[airavata-mft] branch develop updated: Temporary fix fox deligate
auth in ssh secret retrieval
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
The following commit(s) were added to refs/heads/develop by this push:
new a63b31d Temporary fix fox deligate auth in ssh secret retrieval
a63b31d is described below
commit a63b31d3c2214ee7fc9c82aa4f3edb2382ba34dc
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Thu Sep 2 19:23:35 2021 -0400
Temporary fix fox deligate auth in ssh secret retrieval
---
.../server/backend/custos/CustosSecretBackend.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/custos/CustosSecretBackend.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/custos/CustosSecretBackend.java
index ec5911d..c71ef77 100644
--- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/custos/CustosSecretBackend.java
+++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/custos/CustosSecretBackend.java
@@ -263,7 +263,7 @@ public class CustosSecretBackend implements SecretBackend {
case DELEGATEAUTH:
DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
- CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+ CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("TENANT_ID"),
request.getSecretId());
Map<String, String> secretValues = credentialMap.getCredentialMapMap();
S3Secret s3Secret = S3Secret.newBuilder()
@@ -322,7 +322,7 @@ public class CustosSecretBackend implements SecretBackend {
case DELEGATEAUTH:
DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
- CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+ CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("TENANT_ID"),
request.getSecretId());
Map<String, String> secretValues = credentialMap.getCredentialMapMap();
BoxSecret boxSecret = BoxSecret.newBuilder()
@@ -385,7 +385,7 @@ public class CustosSecretBackend implements SecretBackend {
case DELEGATEAUTH:
DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
- CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+ CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("TENANT_ID"),
request.getSecretId());
Map<String, String> secretValues = credentialMap.getCredentialMapMap();
AzureSecret azureSecret = AzureSecret.newBuilder()
@@ -447,7 +447,7 @@ public class CustosSecretBackend implements SecretBackend {
case DELEGATEAUTH:
DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
- CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+ CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("TENANT_ID"),
request.getSecretId());
Map<String, String> secretValues = credentialMap.getCredentialMapMap();
GCSSecret gcsSecret = GCSSecret.newBuilder()
@@ -509,7 +509,7 @@ public class CustosSecretBackend implements SecretBackend {
case DELEGATEAUTH:
DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
- CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+ CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("TENANT_ID"),
request.getSecretId());
Map<String, String> secretValues = credentialMap.getCredentialMapMap();
DropboxSecret dropboxSecret = DropboxSecret.newBuilder()
@@ -572,9 +572,10 @@ public class CustosSecretBackend implements SecretBackend {
break;
case DELEGATEAUTH:
DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
+ // TODO validate delegate auth token
ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
PasswordCredential passwordCredential = csClient
- .getPasswordCredential(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+ .getPasswordCredential(delegateAuth.getPropertiesMap().get("TENANT_ID"),
request.getSecretId());
FTPSecret ftpSecret = FTPSecret.newBuilder()
.setSecretId(request.getSecretId())
@@ -603,10 +604,8 @@ public class CustosSecretBackend implements SecretBackend {
private ResourceSecretManagementClient getTenantResourceSecretManagementClient(DelegateAuth delegateAuth) throws IOException {
- String adminCustosId = delegateAuth.getClientId();
- String adminCustosSecret = delegateAuth.getClientSecret();
CustosClientProvider custosClientProvider = custosClientsFactory
- .getCustosClientProvider(adminCustosId, adminCustosSecret);
+ .getCustosClientProvider(custosId, custosSecret);
return custosClientProvider
.getResourceSecretManagementClient();
}