You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2015/06/03 22:59:33 UTC
airavata git commit: To fix AIRAVATA-1711.
Repository: airavata
Updated Branches:
refs/heads/master 7c95cf757 -> 4d9ed53e3
To fix AIRAVATA-1711.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4d9ed53e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4d9ed53e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4d9ed53e
Branch: refs/heads/master
Commit: 4d9ed53e3327166578acbe186d810e85f2638907
Parents: 7c95cf757
Author: raminder <ra...@apache.org>
Authored: Wed Jun 3 16:59:20 2015 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Jun 3 16:59:20 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/4d9ed53e/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..359c80f 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));