Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch a128eee00 -> ae0fbcd78
Fixed AIRAVATA-1711 in branch Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ae0fbcd7 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ae0fbcd7 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ae0fbcd7 Branch: refs/heads/airavata-0.15-release-branch Commit: ae0fbcd786e9f5cf63bc3488b5993f3ac4e6a6bd Parents: a128eee Author: raminder <[email protected]> Authored: Thu Jun 4 10:17:59 2015 -0400 Committer: raminder <[email protected]> Committed: Thu Jun 4 10:17:59 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ae0fbcd7/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index b38a170..7ef3a55 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -91,7 +91,7 @@ public class GFACSSHUtils { AppCatalog appCatalog = jobExecutionContext.getAppCatalog(); SSHJobSubmission sshJobSubmission = appCatalog.getComputeResource().getSSHJobSubmission(preferredJobSubmissionInterface.getJobSubmissionInterfaceId()); SecurityProtocol securityProtocol = sshJobSubmission.getSecurityProtocol(); - if (securityProtocol == SecurityProtocol.GSI || securityProtocol == SecurityProtocol.SSH_KEYS) { + if (securityProtocol == SecurityProtocol.GSI || securityProtocol == SecurityProtocol.SSH_KEYS || securityProtocol == SecurityProtocol.USERNAME_PASSWORD) { SSHSecurityContext sshSecurityContext = new SSHSecurityContext(); String credentialStoreToken = jobExecutionContext.getCredentialStoreToken(); // this is set by the framework RequestData requestData = new RequestData(jobExecutionContext.getGatewayID()); @@ -108,7 +108,7 @@ public class GFACSSHUtils { } SSHCredential credentials =((TokenizedSSHAuthInfo)tokenizedSSHAuthInfo).getCredentials();// this is just a call to get and set credentials in to this object,data will be used - if(credentials.getPrivateKey()==null || credentials.getPublicKey()==null){ + if(credentials.getPrivateKey()==null || credentials.getPublicKey()==null || securityProtocol == SecurityProtocol.USERNAME_PASSWORD){ // now we fall back to username password authentication Properties configurationProperties = ServerSettings.getProperties(); tokenizedSSHAuthInfo = new DefaultPasswordAuthenticationInfo(configurationProperties.getProperty(Constants.SSH_PASSWORD));
