Added SFTP file transfer resume support on both PUT and GET.

[brenttyler]

Internally SFTPFileTransfer has a few sanity checks to fall back to full replacement even if the resume flag is set.

SCP file transfers have not been changed to support this at this time.

[hierynomus]

Please also write some tests

[brenttyler]

Please also write some tests

Done!

[hierynomus]

1 comment :)

[hierynomus]

You need to add the .txt file to the ignore list of the license plugin in the build.

[brenttyler]

You need to add the .txt file to the ignore list of the license plugin in the build.

I'm not as familiar with groovy scripting or license checks. I added the license header to the new JUnit test class which was missing and changed the license.excludes list to be the following. Will that work to exclude both of the test resources?

excludes(['**/djb/Curve25519.java', '**/sshj/common/Base64.java', '**/com/hierynomus/sshj/userauth/keyprovider/bcrypt/*.java', '**/test/resources/files/test_file*.txt'])

[brenttyler]

Apparently that last commit created a security/snyk issue but I can't see the details.

[brenttyler]

Just curious what the thoughts on this PR are now and what else I can do to help move it forward?

[hierynomus]

Just curious what the thoughts on this PR are now and what else I can do to help move it forward?

I've been thinking about the API that you've added. I'm not entirely sure I'm comfortable with a plain boolean and the "magic" underneath. I'm thinking more along the lines of having the read/write interfaces expose an offset at where to start writing/reading. That would make the API a bit more versatile and less magic.

[brenttyler]

Just curious what the thoughts on this PR are now and what else I can do to help move it forward?

I've been thinking about the API that you've added. I'm not entirely sure I'm comfortable with a plain boolean and the "magic" underneath. I'm thinking more along the lines of having the read/write interfaces expose an offset at where to start writing/reading. That would make the API a bit more versatile and less magic.

Yeah, I can do that. Probably in my excitement to get it working I put too much of my use case into that but we should leave it up to the users of this API to know what they're asking for. They already have the tooling to discover what's on the destination already - the existence, current length, and last modified timestamp - with which to make informed offset decisions.

I'll work on that but it may be a few days.

[hierynomus]

Just curious what the thoughts on this PR are now and what else I can do to help move it forward?

I've been thinking about the API that you've added. I'm not entirely sure I'm comfortable with a plain boolean and the "magic" underneath. I'm thinking more along the lines of having the read/write interfaces expose an offset at where to start writing/reading. That would make the API a bit more versatile and less magic.

Yeah, I can do that. Probably in my excitement to get it working I put too much of my use case into that but we should leave it up to the users of this API to know what they're asking for. They already have the tooling to discover what's on the destination already - the existence, current length, and last modified timestamp - with which to make informed offset decisions.

I'll work on that but it may be a few days.

I fully understand, and I do get the usecase, but as you also pointed out, all the bits to make it work are there, except for the "starting at a particular offset". Making the API more reusable will actually allow more usecases to be implemented.

[brenttyler]

API changes made, tested, validated, and pushed for approval!

[brenttyler]

Anything else I can do to help finalize this PR? We've been running it in production for a while now with no issues.

[codecov-commenter]

Codecov Report

Merging #775 (f986c55) into master (d7e402c) will increase coverage by 0.51%.
The diff coverage is 67.24%.

@@             Coverage Diff              @@
##             master     #775      +/-   ##
============================================
+ Coverage     64.33%   64.84%   +0.51%     
- Complexity     1460     1481      +21     
============================================
  Files           211      211              
  Lines          8622     8660      +38     
  Branches        809      812       +3     
============================================
+ Hits           5547     5616      +69     
+ Misses         2650     2616      -34     
- Partials        425      428       +3     

Impacted Files	Coverage Δ
...rc/main/java/net/schmizz/sshj/sftp/SFTPClient.java	30.95% <0.00%> (-1.95%)	⬇️
...ava/net/schmizz/sshj/xfer/scp/SCPFileTransfer.java	77.41% <60.00%> (-5.92%)	⬇️
...n/java/net/schmizz/sshj/sftp/SFTPFileTransfer.java	70.37% <83.33%> (+19.69%)	⬆️
...rc/main/java/net/schmizz/sshj/sftp/RemoteFile.java	55.86% <100.00%> (+0.61%)	⬆️
...ain/java/net/schmizz/sshj/xfer/FileSystemFile.java	60.75% <100.00%> (+1.78%)	⬆️
...zz/sshj/connection/channel/ChannelInputStream.java	78.46% <0.00%> (-1.54%)	⬇️
...t/schmizz/sshj/connection/ConnectionException.java	33.33% <0.00%> (ø)
...in/java/net/schmizz/sshj/common/SecurityUtils.java	47.91% <0.00%> (+1.04%)	⬆️
... and 6 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d7e402c...f986c55. Read the comment docs.

[hierynomus]

Thanks for the nudge, I've approved and merged it! 👍

[brenttyler]

Thanks!