[airavata-mft] 01/03: Handling scp secrets with no public key

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git

commit e6492987f6e14f668238a2980efb5c43189d712f
Author: DImuthuUpe <dimuthu.upeks...@gmail.com>
AuthorDate: Wed Jun 28 20:14:05 2023 -0400

    Handling scp secrets with no public key
---
 .../org/apache/airavata/mft/transport/scp/SCPIncomingConnector.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPIncomingConnector.java
 
b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPIncomingConnector.java
index dea4c6e..1157214 100644
--- 
a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPIncomingConnector.java
+++ 
b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPIncomingConnector.java
@@ -58,7 +58,7 @@ public final class SCPIncomingConnector implements 
IncomingStreamingConnector {
                 scpStorage.getHost(),
                 scpStorage.getPort(),
                 scpSecret.getPrivateKey().getBytes(),
-                scpSecret.getPublicKey().getBytes(),
+                scpSecret.getPublicKey().equals("")? null : 
scpSecret.getPublicKey().getBytes(),
                 scpSecret.getPassphrase().equals("")? null : 
scpSecret.getPassphrase().getBytes());
 
         if (session == null) {
@@ -94,7 +94,7 @@ public final class SCPIncomingConnector implements 
IncomingStreamingConnector {
 
         while (true) {
             int c = checkAck(in);
-            if (c != 'C') {
+            if (c != 'C' && c != 'c' ) {
                 break;
             }