scp: remove -d flag

mus65 · mus65 · commit 9d342a59174e · 2025-12-22T17:31:55.000+01:00
diff --git a/src/Renci.SshNet/ScpClient.cs b/src/Renci.SshNet/ScpClient.cs
@@ -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();
                 }
@@ -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();
                 }
@@ -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();
                 }
diff --git a/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs b/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
@@ -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());
@@ -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]
diff --git a/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs b/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
@@ -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());
@@ -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]
diff --git a/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs b/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
@@ -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())
@@ -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]
diff --git a/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs b/test/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
@@ -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());
@@ -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]

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,8 @@ public void Upload(Stream source, string path)`
`258`	`258`	`channel.Closed += (sender, e) => input.Dispose();`
`259`	`259`	`channel.Open();`
`260`	`260`
`261`		`- // Pass only the directory part of the path to the server, and use the (hidden) -d option to signal`
`262`		`- // that we expect the target to be a directory.`
`263`		`- if (!channel.SendExecRequest(string.Format("scp -t -d {0}", _remotePathTransformation.Transform(posixPath.Directory))))`
	`261`	`+ // Pass only the directory part of the path to the server.`
	`262`	`+ if (!channel.SendExecRequest(string.Format("scp -t {0}", _remotePathTransformation.Transform(posixPath.Directory))))`
`264`	`263`	`{`
`265`	`264`	`throw SecureExecutionRequestRejectedException();`
`266`	`265`	`}`
`@@ -301,9 +300,8 @@ public void Upload(FileInfo fileInfo, string path)`
`301`	`300`	`channel.Closed += (sender, e) => input.Dispose();`
`302`	`301`	`channel.Open();`
`303`	`302`
`304`		`- // Pass only the directory part of the path to the server, and use the (hidden) -d option to signal`
`305`		`- // that we expect the target to be a directory.`
`306`		`- if (!channel.SendExecRequest($"scp -t -d {_remotePathTransformation.Transform(posixPath.Directory)}"))`
	`303`	`+ // Pass only the directory part of the path to the server.`
	`304`	`+ if (!channel.SendExecRequest($"scp -t {_remotePathTransformation.Transform(posixPath.Directory)}"))`
`307`	`305`	`{`
`308`	`306`	`throw SecureExecutionRequestRejectedException();`
`309`	`307`	`}`
`@@ -350,9 +348,8 @@ public void Upload(DirectoryInfo directoryInfo, string path)`
`350`	`348`	`// start copy with the following options:`
`351`	`349`	`// -p preserve modification and access times`
`352`	`350`	`// -r copy directories recursively`
`353`		`- // -d expect path to be a directory`
`354`	`351`	`// -t copy to remote`
`355`		`- if (!channel.SendExecRequest($"scp -r -p -d -t {_remotePathTransformation.Transform(path)}"))`
	`352`	`+ if (!channel.SendExecRequest($"scp -r -p -t {_remotePathTransformation.Transform(path)}"))`
`356`	`353`	`{`
`357`	`354`	`throw SecureExecutionRequestRejectedException();`
`358`	`355`	`}`