Google Git
Sign in
fuchsia / third_party / pkg / sftp / refs/tags/1.5.0
tag3d6a2f61be8d64eccb82b0cb75f422cef704e94a
taggerJohn Eikenberry <jae@zhar.net>Thu Mar 15 13:55:17 2018 -0700
object49488377fa2f14143ba3067cf7555f60f6c7b550 
bugfix and small feature release

Fixes #234: fix client deadlock on server death during writes

Feature: Added ability to set MaxPacket size for the clients to values
outside those accepted by Openssh's SFTP server. To support servers with
differing capacities.
commit49488377fa2f14143ba3067cf7555f60f6c7b550[log] [tgz]
authorJohn Eikenberry <jae@zhar.net>Thu Mar 15 13:46:20 2018 -0700
committerJohn Eikenberry <jae@zhar.net>Thu Mar 15 13:53:30 2018 -0700
tree9d6896bac944b9e3ab3528e1fb9454ee97aef066
parent68e5d2f242e627cec28649e9a5e6c6e93b9655fd [diff]
fix client deadlock on server death during writes

Fixes #234

Similar to #181 (which was about read methods), the client deadlocks on
server drop on write methods (Write/ReadFrom). This is another case of
broadcastErr() and dispatchRequest() deadlocking.

The fix is to bump up the channel used to communicate about inflight
packets to maxConcurrentRequests+1 (+1 is new). It seems that it can
have the full set of packets going and hit the error (triggering
broadcastErr) yet it still tries to call dispatchRequest again. More
details in that ticket.

I'm also bumping up the chan buffer in the read methods to keep them
consistent. I can't reproduce the problem, but it looks like it should
have it. So it might just be a much harder race to trigger.

This also includes 2 tests which reprocuded the issue for ReadFrom and
Write.
2 files changed
tree: 9d6896bac944b9e3ab3528e1fb9454ee97aef066
  1. examples/
  2. server_standalone/
  3. .gitignore
  4. .travis.yml
  5. attrs.go
  6. attrs_stubs.go
  7. attrs_test.go
  8. attrs_unix.go
  9. client.go
  10. client_integration_darwin_test.go
  11. client_integration_linux_test.go
  12. client_integration_test.go
  13. client_test.go
  14. conn.go
  15. CONTRIBUTORS
  16. debug.go
  17. example_test.go
  18. LICENSE
  19. match.go
  20. other_test.go
  21. packet-manager.go
  22. packet-manager_test.go
  23. packet-typing.go
  24. packet.go
  25. packet_test.go
  26. README.md
  27. release.go
  28. request-attrs.go
  29. request-attrs_test.go
  30. request-errors.go
  31. request-example.go
  32. request-interfaces.go
  33. request-readme.md
  34. request-server.go
  35. request-server_test.go
  36. request-unix.go
  37. request.go
  38. request_test.go
  39. request_windows.go
  40. server.go
  41. server_integration_test.go
  42. server_statvfs_darwin.go
  43. server_statvfs_impl.go
  44. server_statvfs_linux.go
  45. server_statvfs_stubs.go
  46. server_stubs.go
  47. server_test.go
  48. server_unix.go
  49. sftp.go
README.md

sftp

The sftp package provides support for file system operations on remote ssh servers using the SFTP subsystem. It also implements an SFTP server for serving files from the filesystem.

UNIX Build Status GoDoc

usage and examples

See godoc.org/github.com/pkg/sftp for examples and usage.

The basic operation of the package mirrors the facilities of the os package.

The Walker interface for directory traversal is heavily inspired by Keith Rarick's fs package.

roadmap

  • There is way too much duplication in the Client methods. If there was an unmarshal(interface{}) method this would reduce a heap of the duplication.

contributing

We welcome pull requests, bug fixes and issue reports.

Before proposing a large change, first please discuss your change by raising an issue.

For API/code bugs, please include a small, self contained code example to reproduce the issue. For pull requests, remember test coverage.

We try to handle issues and pull requests with a 0 open philosophy. That means we will try to address the submission as soon as possible and will work toward a resolution. If progress can no longer be made (eg. unreproducible bug) or stops (eg. unresponsive submitter), we will close the bug.

Thanks.