Age | Commit message (Collapse) | Author |
|
|
|
In earlier iterations I accidentally removed Send from Session and then
later restored it in an unsafe way. This commit restructures the
bindings so that each of the objects holds a reference to the
appropriate thing to keep everything alive safely, without awkward
lifetimes to deal with.
The key to this is that the underlying Session is tracked by an
Arc<Mutex<>>, with the related objects ensuring that they lock this
before they call into the underlying API.
In order to make this work, I've had to adjust the API around iterating
both known hosts and agent identities: previously these would iterate
over internal references but with this shift there isn't a reasonable
way to make that safe. The strategy is instead to return a copy of the
host/identity data and then later look up the associated raw pointer
when needed. The purist in me feels that the copy feels slightly
wasteful, but the realist justifies this with the observation that the
cardinality of both known hosts and identities is typically small enough
that the cost of this is in the noise compared to actually doing the
crypto+network ops.
I've removed a couple of error code related helpers from some of
the objects: those were really internal APIs and were redundant
with methods exported by the Error type anyway.
Fixes: https://github.com/alexcrichton/ssh2-rs/issues/154
Refs: https://github.com/alexcrichton/ssh2-rs/issues/137
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This commit exposes the `shutdown` method of `Sft` and `close` method of
`File` to free resources. Previously this was done synchronously and
therefor not usable in async wrappers.
Whith the methods exposed they can be polled until success. If
successful a flag is set to notify the destructor that no resources
need to be freed anymore.
However, if resources were not cleaned up by calling `close` or
`shutdown` the destructor will clean up synchronously.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Closes: https://github.com/alexcrichton/ssh2-rs/issues/141
|
|
|
|
Closes: https://github.com/alexcrichton/ssh2-rs/issues/145
|
|
|
|
Refs: https://github.com/alexcrichton/ssh2-rs/issues/137
|
|
I think this was overlooked in c95e6ea1e74f82f1a889302978e37a7baf4073cf
|
|
Refs: https://github.com/alexcrichton/ssh2-rs/issues/137
|
|
|
|
This fixes the CI build with nightly, as we have deny(warnings)
enabled.
|
|
Previously, this function could return None even if passed an error
result. This could happen in situations where no error had been
recorded against the session object, but where libssh2 had returned
an error condition anyway.
It was also possible for the prior implementation to return the
wrong information in a similar situation: if an error had been
recorded against the session, that error would be returned rather
than the current error code.
This commit tidies up the implementation of this function by
always returning an `Error` object that corresponds to the
provided `rc` parameter. If the last error message recorded
against the `Session` has a matching error value then that
error message will be used, otherwise we'll synthesize one
just from the error code.
|
|
Add a function to configure how extended data streams are
to be handled. This allows for merging stderr to stdout, or
discarding it.
|
|
There's not a lot we can do about it.
|
|
This avoids the potential for UB if the callback panics; Rust
doesn't specify what happens if a panic unwinds back into
C code.
|
|
|
|
The recent move to take ownership of TcpStream exposed an issue with
the `handshake` method: if the stream is non-blocking then it may
take several attempts to handshake, but only the first one is able
to transfer ownership.
My initial thought was just to make the TcpStream a required parameter
to `new`, but we have some tests that work with known hosts and the
ssh agent that don't require a tcpstream.
I'm going to review those and see if there is a cleaner overall
solution, but that will likely require more substantial API changes.
For now, the simplest change is to add a separate `set_tcp_stream`
function to make the stream ownership transfer explicit and distinct
from the handshake.
Refs: https://github.com/alexcrichton/ssh2-rs/issues/17
|
|
This makes it safer to accidentally return more than the requested
number of responses from the prompt callback.
Refs: https://github.com/alexcrichton/ssh2-rs/issues/65
|
|
Refs: https://github.com/alexcrichton/ssh2-rs/issues/65
|
|
* Adopt scp_recv2 instead, which uses compatible 64-bit stat types
* Mark scp_recv as deprecated
* small version bump
Fixes https://github.com/alexcrichton/ssh2-rs/issues/109
Refs https://github.com/alexcrichton/ssh2-rs/pull/117
Co-authored-by: Joyce Babu <joyce@ennexa.com>
|
|
I'm hitting a kex protocol error when talking from windows->ubuntu 19
and that wasn't getting reported as an error on the client side
because the `rc` function only emits an error if one has been recorded
against the session object, despite being reported via the parameter.
I think it's worth revisiting this more broadly, but for now, let's
report this error in the handshake case.
|
|
At the start of feb 2019 the tests started to fail on macos on Travis. No
changes were made to the repo, so the problem must be environmental.
It turns out that the server was emitting stderr output, and since the
tests were not consuming stderr, this made `channel.eof()` always
return false.
The resolution is to drain both stdout and stderr in the tests before
making assertions with `channel.eof()`.
I've also updated the doc comment on `channel.eof()` to reflect this,
as it is a bit of a sharp edge.
|
|
|
|
When the channel is set to non-blocking mode, take care to map the
underlying ssh2 error code to the WouldBlock error kind so that
embedding applications can correctly handle that situation.
|
|
`cargo test --all` (which only appears safe to run in the CI
environment) doesn't get as far as `cargo test --doc` so I overlooked
these.
|
|
This is an alternative take on addressing this issue:
Refs: https://github.com/alexcrichton/ssh2-rs/pull/104
|
|
I'd gradually removed the usage of it while I was hacking through
with my lifetime changes. I suppose it could be added back
but I confess that I removed it because I found it confusing
and it didn't look like it would fit on my first pass through
the code.
|
|
|
|
|
|
Instead the internal session is kept alive via Rc
Refs: https://github.com/alexcrichton/ssh2-rs/issues/53
|
|
Refs: https://github.com/alexcrichton/ssh2-rs/issues/17
|
|
Refs: https://github.com/alexcrichton/ssh2-rs/issues/96
This is a breaking change, so bump the package version
|