Skip to content
This repository was archived by the owner on Oct 14, 2021. It is now read-only.

Fix put in folder #56

Merged
merged 1 commit into from
Apr 21, 2021
Merged

Fix put in folder #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions dotnet/dotnetframework/GeneXusSftp/Sftp/SftpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@ public override bool Put(String localPath, String remoteDir)
this.error.setError("SF005", "The channel is invalid, reconect");
return false;
}
if (remoteDir.Length > 1)
{
if (remoteDir.StartsWith("\\") || remoteDir.StartsWith("/"))
{
remoteDir = remoteDir.Substring(1, remoteDir.Length - 1);
}
}

FileStream stream = null;
try
Expand All @@ -147,34 +154,41 @@ public override bool Put(String localPath, String remoteDir)
string dirRemote = this.channel.WorkingDirectory;

try
{
{
control = this.channel.WorkingDirectory.Contains("/");

}catch(Exception e)
{
}
catch (Exception e)
{
this.error.setError("SF018", e.Message);
return false;
}
}
if (control)
{
remoteDir = $"/{remoteDir.Replace(@"\", "/")}";
rDir = SecurityUtils.compareStrings(dirRemote, "/") ? dirRemote : dirRemote + "/";
//rDir += this.channel.WorkingDirectory + remoteDir + "/" + GetFileNamne(localPath);
rDir = SecurityUtils.compareStrings(remoteDir, "/") ? remoteDir : remoteDir + "/";
}
else
{
rDir = SecurityUtils.compareStrings(dirRemote, "\\") ? dirRemote : dirRemote + "\\";
// rDir = this.channel.WorkingDirectory + remoteDir + "\\" + GetFileNamne(localPath);
rDir = SecurityUtils.compareStrings(remoteDir, "\\") ? remoteDir : remoteDir + "\\";
}
rDir += GetFileNamne(localPath);
if (rDir.Length > 1)
{
if (rDir.StartsWith("\\") || rDir.StartsWith("/"))
{
rDir = rDir.Substring(1, rDir.Length - 1);
}
}

try
{
this.channel.UploadFile(stream, rDir, true, null);
}
catch (Exception e)
{
if(SecurityUtils.compareStrings(remoteDir, "/") || SecurityUtils.compareStrings(remoteDir, "\\"))
{
if (SecurityUtils.compareStrings(remoteDir, "/") || SecurityUtils.compareStrings(remoteDir, "\\") || SecurityUtils.compareStrings(remoteDir, "//"))
{
try
{
this.channel.UploadFile(stream, GetFileNamne(localPath), true, null);
Expand All @@ -184,9 +198,9 @@ public override bool Put(String localPath, String remoteDir)
this.error.setError("SF012", s.Message);
return false;
}
}
else
{
}
else
{
this.error.setError("SF013", e.Message);
return false;
}
Expand Down