Repository: airavata Updated Branches: refs/heads/master 672d13e2b -> c073c6a5d
using uuid as the password - AIRAVATA-1614 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c66cc84d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c66cc84d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c66cc84d Branch: refs/heads/master Commit: c66cc84da3da2bea1932e507dcc33531ce00f393 Parents: 050ea84 Author: Suresh Marru <[email protected]> Authored: Tue Mar 3 15:55:09 2015 -0500 Committer: Suresh Marru <[email protected]> Committed: Tue Mar 3 15:55:09 2015 -0500 ---------------------------------------------------------------------- .../server/CredentialStoreServerHandler.java | 3 ++- .../cs-thrift-description/cs.cpi.service.thrift | 23 +++++++++++++++----- .../cs-thrift-description/csDataModel.thrift | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c66cc84d/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java index 1675781..b5b1ac0 100644 --- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java +++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java @@ -45,6 +45,7 @@ import sun.security.provider.X509Factory; import java.io.ByteArrayInputStream; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import java.util.UUID; public class CredentialStoreServerHandler implements CredentialStoreService.Iface { protected static Logger log = LoggerFactory.getLogger(CredentialStoreServerHandler.class); @@ -80,7 +81,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac // only username and gateway id will be sent by client. String token = TokenGenerator.generateToken(sshCredential.getGatewayId(), null); credential.setToken(token); - credential.setPassphrase(sshCredential.getPassphrase()); + credential.setPassphrase(String.valueOf(UUID.randomUUID())); if (sshCredential.getPrivateKey() != null) { credential.setPrivateKey(sshCredential.getPrivateKey().getBytes()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/c66cc84d/modules/credential-store-service/cs-thrift-description/cs.cpi.service.thrift ---------------------------------------------------------------------- diff --git a/modules/credential-store-service/cs-thrift-description/cs.cpi.service.thrift b/modules/credential-store-service/cs-thrift-description/cs.cpi.service.thrift index b4f078b..c8a31db 100644 --- a/modules/credential-store-service/cs-thrift-description/cs.cpi.service.thrift +++ b/modules/credential-store-service/cs-thrift-description/cs.cpi.service.thrift @@ -38,12 +38,23 @@ service CredentialStoreService { /** * This method is to add SSHCredential which will return the token Id in success **/ - string addSSHCredential (1: required csDataModel.SSHCredential sshCredential) throws (1:credentialStoreErrors.CredentialStoreException csException) ; - string addCertificateCredential (1: required csDataModel.CertificateCredential certificateCredential) throws (1:credentialStoreErrors.CredentialStoreException csException); - string addPasswordCredential (1: required csDataModel.PasswordCredential passwordCredential) throws (1:credentialStoreErrors.CredentialStoreException csException); - csDataModel.SSHCredential getSSHCredential (1: required string tokenId, 2: required string gatewayId) throws (1:credentialStoreErrors.CredentialStoreException csException); - csDataModel.CertificateCredential getCertificateCredential (1: required string tokenId, 2: required string gatewayId) throws (1:credentialStoreErrors.CredentialStoreException csException); - csDataModel.PasswordCredential getPasswordCredential (1: required string tokenId, 2: required string gatewayId) throws (1:credentialStoreErrors.CredentialStoreException csException); + string addSSHCredential (1: required csDataModel.SSHCredential sshCredential) + throws (1:credentialStoreErrors.CredentialStoreException csException); + + string addCertificateCredential (1: required csDataModel.CertificateCredential certificateCredential) + throws (1:credentialStoreErrors.CredentialStoreException csException); + + string addPasswordCredential (1: required csDataModel.PasswordCredential passwordCredential) + throws (1:credentialStoreErrors.CredentialStoreException csException); + + csDataModel.SSHCredential getSSHCredential (1: required string tokenId, 2: required string gatewayId) + throws (1:credentialStoreErrors.CredentialStoreException csException); + + csDataModel.CertificateCredential getCertificateCredential (1: required string tokenId, 2: required string gatewayId) + throws (1:credentialStoreErrors.CredentialStoreException csException); + + csDataModel.PasswordCredential getPasswordCredential (1: required string tokenId, 2: required string gatewayId) + throws (1:credentialStoreErrors.CredentialStoreException csException); http://git-wip-us.apache.org/repos/asf/airavata/blob/c66cc84d/modules/credential-store-service/cs-thrift-description/csDataModel.thrift ---------------------------------------------------------------------- diff --git a/modules/credential-store-service/cs-thrift-description/csDataModel.thrift b/modules/credential-store-service/cs-thrift-description/csDataModel.thrift index efd3dd5..ce4dc46 100644 --- a/modules/credential-store-service/cs-thrift-description/csDataModel.thrift +++ b/modules/credential-store-service/cs-thrift-description/csDataModel.thrift @@ -37,7 +37,7 @@ struct SSHCredential { } struct CommunityUser { - 1: required string gatewayNmae, + 1: required string gatewayName, 2: required string username, 3: required string userEmail }
