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 479b292 Removing special characters in SCP paths
479b292 is described below
commit 479b292a9bcd73bb76e6991bfa69ba09738cdc45
Author: Dimuthu Wannipurage
AuthorDate: Fri Feb 11 14:57:55 2022 -0500
Removing special characters in SCP paths
---
.../mft/transport/scp/SCPIncomingConnector.java| 8 +-
.../mft/transport/scp/SCPOutgoingConnector.java| 8 +-
.../airavata/mft/transport/scp/SCPReceiver.java| 284 -
.../airavata/mft/transport/scp/SCPSender.java | 279
4 files changed, 12 insertions(+), 567 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 7856a3a..9cbb590 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
@@ -92,6 +92,10 @@ public final class SCPIncomingConnector implements
IncomingConnector {
}
}
+private String escapeSpecialChars(String path) {
+return path.replace(" ", "\\ ");
+}
+
@Override
public InputStream fetchInputStream() throws Exception {
String resourcePath = null;
@@ -105,7 +109,7 @@ public final class SCPIncomingConnector implements
IncomingConnector {
throw new Exception("Resource was not set in resource with id
" + resource.getResourceId());
}
-return fetchInputStreamJCraft(resourcePath);
+return fetchInputStreamJCraft(escapeSpecialChars(resourcePath));
}
@Override
@@ -126,7 +130,7 @@ public final class SCPIncomingConnector implements
IncomingConnector {
throw new Exception("Resource was not set in resource with id
" + resource.getResourceId());
}
-return fetchInputStreamJCraft(resourcePath);
+return fetchInputStreamJCraft(escapeSpecialChars(resourcePath));
}
private InputStream fetchInputStreamJCraft(String resourcePath) throws
Exception{
diff --git
a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPOutgoingConnector.java
b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPOutgoingConnector.java
index 4df4649..980019b 100644
---
a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPOutgoingConnector.java
+++
b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPOutgoingConnector.java
@@ -95,6 +95,10 @@ public final class SCPOutgoingConnector implements
OutgoingConnector {
}
}
+private String escapeSpecialChars(String path) {
+return path.replace(" ", "\\ ");
+}
+
@Override
public OutputStream fetchOutputStream() throws Exception {
String resourcePath = null;
@@ -108,7 +112,7 @@ public final class SCPOutgoingConnector implements
OutgoingConnector {
throw new Exception("Resource was not set in resource with id
" + resource.getResourceId());
}
-return fetchOutputStreamJCraft(resourcePath,
cc.getMetadata().getResourceSize());
+return fetchOutputStreamJCraft(escapeSpecialChars(resourcePath),
cc.getMetadata().getResourceSize());
}
@Override
@@ -128,7 +132,7 @@ public final class SCPOutgoingConnector implements
OutgoingConnector {
throw new Exception("Resource was not set in resource with id
" + resource.getResourceId());
}
-return fetchOutputStreamJCraft(resourcePath,
cc.getMetadata().getResourceSize());
+return fetchOutputStreamJCraft(escapeSpecialChars(resourcePath),
cc.getMetadata().getResourceSize());
}
public OutputStream fetchOutputStreamJCraft(String resourcePath, long
fileSize) throws Exception {
diff --git
a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPReceiver.java
b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPReceiver.java
deleted file mode 100644
index b70aa34..000
---
a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPReceiver.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the
