Skip to content

scp: remove -d flag #1751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mus65 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

scp: remove -d flag #1751

Show file tree
Hide file tree
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
13 changes: 5 additions & 8 deletions src/Renci.SshNet/ScpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,8 @@ public void Upload(Stream source, string path)
channel.Closed += (sender, e) => input.Dispose();
channel.Open();

// Pass only the directory part of the path to the server, and use the (hidden) -d option to signal
// that we expect the target to be a directory.
if (!channel.SendExecRequest(string.Format("scp -t -d {0}", _remotePathTransformation.Transform(posixPath.Directory))))
// Pass only the directory part of the path to the server.
if (!channel.SendExecRequest(string.Format("scp -t {0}", _remotePathTransformation.Transform(posixPath.Directory))))
{
throw SecureExecutionRequestRejectedException();
}
Expand Down Expand Up @@ -301,9 +300,8 @@ public void Upload(FileInfo fileInfo, string path)
channel.Closed += (sender, e) => input.Dispose();
channel.Open();

// Pass only the directory part of the path to the server, and use the (hidden) -d option to signal
// that we expect the target to be a directory.
if (!channel.SendExecRequest($"scp -t -d {_remotePathTransformation.Transform(posixPath.Directory)}"))
// Pass only the directory part of the path to the server.
if (!channel.SendExecRequest($"scp -t {_remotePathTransformation.Transform(posixPath.Directory)}"))
{
throw SecureExecutionRequestRejectedException();
}
Expand Down Expand Up @@ -350,9 +348,8 @@ public void Upload(DirectoryInfo directoryInfo, string path)
// start copy with the following options:
// -p preserve modification and access times
// -r copy directories recursively
// -d expect path to be a directory
// -t copy to remote
if (!channel.SendExecRequest($"scp -r -p -d -t {_remotePathTransformation.Transform(path)}"))
if (!channel.SendExecRequest($"scp -r -p -t {_remotePathTransformation.Transform(path)}"))
{
throw SecureExecutionRequestRejectedException();
}
Expand Down
4 changes: 2 additions & 2 deletions ...et.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected override void SetupMocks()
.Setup(p => p.Transform(_path))
.Returns(_transformedPath);
_channelSessionMock.InSequence(sequence)
.Setup(p => p.SendExecRequest(string.Format("scp -r -p -d -t {0}", _transformedPath)))
.Setup(p => p.SendExecRequest(string.Format("scp -r -p -t {0}", _transformedPath)))
.Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.InSequence(sequence).Setup(p => p.Close());
Expand Down Expand Up @@ -92,7 +92,7 @@ public void UploadShouldHaveThrownSshException()
[TestMethod]
public void SendExecREquestOnChannelSessionShouldBeInvokedOnce()
{
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -r -p -d -t {0}", _transformedPath)), Times.Once);
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -r -p -t {0}", _transformedPath)), Times.Once);
}

[TestMethod]
Expand Down
4 changes: 2 additions & 2 deletions ....SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected override void SetupMocks()
.Setup(p => p.Transform(_remoteDirectory))
.Returns(_transformedPath);
_channelSessionMock.InSequence(sequence)
.Setup(p => p.SendExecRequest(string.Format("scp -t -d {0}", _transformedPath)))
.Setup(p => p.SendExecRequest(string.Format("scp -t {0}", _transformedPath)))
.Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.InSequence(sequence).Setup(p => p.Close());
Expand Down Expand Up @@ -109,7 +109,7 @@ public void UploadShouldHaveThrownSshException()
[TestMethod]
public void SendExecRequestOnChannelSessionShouldBeInvokedOnce()
{
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -t -d {0}", _transformedPath)), Times.Once);
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -t {0}", _transformedPath)), Times.Once);
}

[TestMethod]
Expand Down
4 changes: 2 additions & 2 deletions test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ protected override void SetupMocks()
.Setup(p => p.Transform(_remoteDirectory))
.Returns(_transformedPath);
_ = _channelSessionMock.InSequence(sequence)
.Setup(p => p.SendExecRequest(string.Format("scp -t -d {0}", _transformedPath)))
.Setup(p => p.SendExecRequest(string.Format("scp -t {0}", _transformedPath)))
.Returns(true);
_ = _pipeStreamMock.InSequence(sequence)
.Setup(p => p.ReadByte())
Expand Down Expand Up @@ -133,7 +133,7 @@ protected override void Act()
[TestMethod]
public void SendExecRequestOnChannelSessionShouldBeInvokedOnce()
{
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -t -d {0}", _transformedPath)), Times.Once);
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -t {0}", _transformedPath)), Times.Once);
}

[TestMethod]
Expand Down
4 changes: 2 additions & 2 deletions ...ci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected override void SetupMocks()
.Setup(p => p.Transform(_remoteDirectory))
.Returns(_transformedPath);
_ = _channelSessionMock.InSequence(sequence)
.Setup(p => p.SendExecRequest(string.Format("scp -t -d {0}", _transformedPath)))
.Setup(p => p.SendExecRequest(string.Format("scp -t {0}", _transformedPath)))
.Returns(false);
_ = _channelSessionMock.InSequence(sequence)
.Setup(p => p.Dispose());
Expand Down Expand Up @@ -111,7 +111,7 @@ public void UploadShouldHaveThrownSshException()
[TestMethod]
public void SendExecRequestOnChannelSessionShouldBeInvokedOnce()
{
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -t -d {0}", _transformedPath)), Times.Once);
_channelSessionMock.Verify(p => p.SendExecRequest(string.Format("scp -t {0}", _transformedPath)), Times.Once);
}

[TestMethod]
Expand Down
Loading