Implement detached signal sender

.all-contributorsrc

@@ -175,6 +175,150 @@
  "contributions": [
  "code"
  ]
+ },
+ {
+ "login": "Nurrl",
+ "name": "Maya the bee",
+ "avatar_url": "https://avatars.githubusercontent.com/u/15341887?v=4",
+ "profile": "https://github.com/Nurrl",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "mmirate",
+ "name": "Milo Mirate",
+ "avatar_url": "https://avatars.githubusercontent.com/u/992859?v=4",
+ "profile": "https://github.com/mmirate",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "george-hopkins",
+ "name": "George Hopkins",
+ "avatar_url": "https://avatars.githubusercontent.com/u/552590?v=4",
+ "profile": "https://github.com/george-hopkins",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "akeamc",
+ "name": "Åke Amcoff",
+ "avatar_url": "https://avatars.githubusercontent.com/u/17624114?v=4",
+ "profile": "https://amcoff.net/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "bho01",
+ "name": "Brendon Ho",
+ "avatar_url": "https://avatars.githubusercontent.com/u/12106620?v=4",
+ "profile": "http://brendonho.com",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "samuela",
+ "name": "Samuel Ainsworth",
+ "avatar_url": "https://avatars.githubusercontent.com/u/226872?v=4",
+ "profile": "http://samlikes.pizza/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "sherlock-holo",
+ "name": "Sherlock Holo",
+ "avatar_url": "https://avatars.githubusercontent.com/u/10096425?v=4",
+ "profile": "https://github.com/Sherlock-Holo",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "ricott1",
+ "name": "Alessandro Ricottone",
+ "avatar_url": "https://avatars.githubusercontent.com/u/16502243?v=4",
+ "profile": "https://github.com/ricott1",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "T0b1-iOS",
+ "name": "T0b1-iOS",
+ "avatar_url": "https://avatars.githubusercontent.com/u/15174814?v=4",
+ "profile": "https://github.com/T0b1-iOS",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "shoaibmerchant",
+ "name": "Shoaib Merchant",
+ "avatar_url": "https://avatars.githubusercontent.com/u/4598631?v=4",
+ "profile": "https://mecha.so",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "gleason-m",
+ "name": "Michael Gleason",
+ "avatar_url": "https://avatars.githubusercontent.com/u/86493344?v=4",
+ "profile": "https://github.com/gleason-m",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "elegaanz",
+ "name": "Ana Gelez",
+ "avatar_url": "https://avatars.githubusercontent.com/u/16254623?v=4",
+ "profile": "https://ana.gelez.xyz",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "tomknig",
+ "name": "Tom König",
+ "avatar_url": "https://avatars.githubusercontent.com/u/3586316?v=4",
+ "profile": "https://github.com/tomknig",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Barre",
+ "name": "Pierre Barre",
+ "avatar_url": "https://avatars.githubusercontent.com/u/45085843?v=4",
+ "profile": "https://www.legaltile.com/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "spoutn1k",
+ "name": "Jean-Baptiste Skutnik",
+ "avatar_url": "https://avatars.githubusercontent.com/u/22240065?v=4",
+ "profile": "http://skutnik.page",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "packetsource",
+ "name": "Adam Chappell",
+ "avatar_url": "https://avatars.githubusercontent.com/u/6276475?v=4",
+ "profile": "http://blog.packetsource.net/",
+ "contributions": [
+ "code"
+ ]
  }
  ],
  "contributorsPerLine": 7,

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: eugeny
+open_collective: tabby
+ko_fi: eugeny

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
  push:
- branches: [ master ]
+ branches: [ main ]
  pull_request:
- branches: [ master ]
+ branches: [ main ]
 
 env:
  CARGO_TERM_COLOR: always
@@ -27,6 +27,18 @@ jobs:
  with:
  package: russh
 
+ Formatting:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Install rustfmt
+ run: rustup component add rustfmt
+
+ - name: rustfmt
+ run: cargo fmt --check
+
  Clippy:
  runs-on: ubuntu-latest
 

Cargo.toml

@@ -1,8 +1,26 @@
 [workspace]
-members = [ "russh-keys", "russh", "russh-config", "cryptovec"]
+members = ["russh-keys", "russh", "russh-config", "cryptovec", "pageant"]
 
 [patch.crates-io]
 russh = { path = "russh" }
 russh-keys = { path = "russh-keys" }
 russh-cryptovec = { path = "cryptovec" }
 russh-config = { path = "russh-config" }
+
+[workspace.dependencies]
+aes = "0.8"
+async-trait = "0.1"
+byteorder = "1.4"
+digest = "0.10"
+futures = "0.3"
+hmac = "0.12"
+log = "0.4"
+openssl = { version = "0.10" }
+rand = "0.8"
+sha1 = { version = "0.10", features = ["oid"] }
+sha2 = { version = "0.10", features = ["oid"] }
+ssh-encoding = "0.2"
+ssh-key = { version = "0.6", features = ["ed25519", "rsa", "encryption"] }
+thiserror = "1.0"
+tokio = { version = "1.17.0" }
+tokio-stream = { version = "0.1", features = ["net", "sync"] }

README.md

@@ -1,10 +1,13 @@
 # Russh
+
 [![Rust](https://github.com/warp-tech/russh/actions/workflows/rust.yml/badge.svg)](https://github.com/warp-tech/russh/actions/workflows/rust.yml) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-19-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-35-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Low-level Tokio SSH2 client and server implementation.
 
+Examples: [simple client](russh/examples/client_exec_simple.rs), [interactive PTY client](russh/examples/client_exec_interactive.rs), [server](russh/examples/echoserver.rs), [SFTP client](russh/examples/sftp_client.rs), [SFTP server](russh/examples/sftp_server.rs).
+
 This is a fork of [Thrussh](https://nest.pijul.com/pijul/thrussh) by Pierre-Étienne Meunier.
 
 > ✨ = added in Russh
@@ -14,33 +17,52 @@ This is a fork of [Thrussh](https://nest.pijul.com/pijul/thrussh) by Pierre-Éti
 * `direct-tcpip` (local port forwarding)
 * `forward-tcpip` (remote port forwarding) ✨
 * `direct-streamlocal` (local UNIX socket forwarding, client only) ✨
+* `forward-streamlocal` (remote UNIX socket forwarding) ✨
 * Ciphers:
  * `[email protected]`
  * `[email protected]` ✨
  * `aes256-ctr` ✨
  * `aes192-ctr` ✨
  * `aes128-ctr` ✨
+ * `aes256-cbc` ✨
+ * `aes192-cbc` ✨
+ * `aes128-cbc` ✨
+ * `3des-cbc` ✨
 * Key exchanges:
  * `[email protected]`
  * `diffie-hellman-group1-sha1` ✨
  * `diffie-hellman-group14-sha1` ✨
  * `diffie-hellman-group14-sha256` ✨
+ * `diffie-hellman-group16-sha512` ✨
+ * `ecdh-sha2-nistp256` ✨
+ * `ecdh-sha2-nistp384` ✨
+ * `ecdh-sha2-nistp521` ✨
 * MACs:
  * `hmac-sha1` ✨
  * `hmac-sha2-256` ✨
  * `hmac-sha2-512` ✨
  * `[email protected]` ✨
  * `[email protected]` ✨
  * `[email protected]` ✨
-* Host keys:
+* Host keys and public key auth:
  * `ssh-ed25519`
  * `rsa-sha2-256`
  * `rsa-sha2-512`
  * `ssh-rsa` ✨
+ * `ecdsa-sha2-nistp256` ✨
+ * `ecdsa-sha2-nistp384` ✨
+ * `ecdsa-sha2-nistp521` ✨
+* Authentication methods:
+ * `password`
+ * `publickey`
+ * `keyboard-interactive`
+ * `none`
+ * OpenSSH certificates (client only ✨)
 * Dependency updates
 * OpenSSH keepalive request handling ✨
 * OpenSSH agent forwarding channels ✨
 * OpenSSH `server-sig-algs` extension ✨
+* `openssl` dependency is optional ✨
 
 ## Safety
 
@@ -60,7 +82,7 @@ This is a fork of [Thrussh](https://nest.pijul.com/pijul/thrussh) by Pierre-Éti
 
 ## Ecosystem
 
-* [russh-sftp](https://crates.io/crates/russh-sftp) - server-side SFTP subsystem support for `russh` - see `russh/examples/sftp_server.rs`.
+* [russh-sftp](https://crates.io/crates/russh-sftp) - server-side and client-side SFTP subsystem support for `russh` - see `russh/examples/sftp_server.rs` or `russh/examples/sftp_client.rs`.
 * [async-ssh2-tokio](https://crates.io/crates/async-ssh2-tokio) - simple high-level API for running commands over SSH.
 
 ## Contributors ✨
@@ -96,6 +118,26 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
  <td align="center" valign="top" width="14.28%"><a href="https://gotlou.srht.site"><img src="https://avatars.githubusercontent.com/u/23006870?v=4?s=100" width="100px;" alt="Saksham Mittal"/><br /><sub><b>Saksham Mittal</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=gotlougit" title="Code">💻</a></td>
  <td align="center" valign="top" width="14.28%"><a href="http://canoncollision.com"><img src="https://avatars.githubusercontent.com/u/5120858?v=4?s=100" width="100px;" alt="Lucas Kent"/><br /><sub><b>Lucas Kent</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=rukai" title="Code">💻</a></td>
  <td align="center" valign="top" width="14.28%"><a href="https://github.com/RDruon"><img src="https://avatars.githubusercontent.com/u/64585623?v=4?s=100" width="100px;" alt="Raphael Druon"/><br /><sub><b>Raphael Druon</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=RDruon" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/Nurrl"><img src="https://avatars.githubusercontent.com/u/15341887?v=4?s=100" width="100px;" alt="Maya the bee"/><br /><sub><b>Maya the bee</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=Nurrl" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/mmirate"><img src="https://avatars.githubusercontent.com/u/992859?v=4?s=100" width="100px;" alt="Milo Mirate"/><br /><sub><b>Milo Mirate</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=mmirate" title="Code">💻</a></td>
+ </tr>
+ <tr>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/george-hopkins"><img src="https://avatars.githubusercontent.com/u/552590?v=4?s=100" width="100px;" alt="George Hopkins"/><br /><sub><b>George Hopkins</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=george-hopkins" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://amcoff.net/"><img src="https://avatars.githubusercontent.com/u/17624114?v=4?s=100" width="100px;" alt="Åke Amcoff"/><br /><sub><b>Åke Amcoff</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=akeamc" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="http://brendonho.com"><img src="https://avatars.githubusercontent.com/u/12106620?v=4?s=100" width="100px;" alt="Brendon Ho"/><br /><sub><b>Brendon Ho</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=bho01" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="http://samlikes.pizza/"><img src="https://avatars.githubusercontent.com/u/226872?v=4?s=100" width="100px;" alt="Samuel Ainsworth"/><br /><sub><b>Samuel Ainsworth</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=samuela" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/Sherlock-Holo"><img src="https://avatars.githubusercontent.com/u/10096425?v=4?s=100" width="100px;" alt="Sherlock Holo"/><br /><sub><b>Sherlock Holo</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=sherlock-holo" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/ricott1"><img src="https://avatars.githubusercontent.com/u/16502243?v=4?s=100" width="100px;" alt="Alessandro Ricottone"/><br /><sub><b>Alessandro Ricottone</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=ricott1" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/T0b1-iOS"><img src="https://avatars.githubusercontent.com/u/15174814?v=4?s=100" width="100px;" alt="T0b1-iOS"/><br /><sub><b>T0b1-iOS</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=T0b1-iOS" title="Code">💻</a></td>
+ </tr>
+ <tr>
+ <td align="center" valign="top" width="14.28%"><a href="https://mecha.so"><img src="https://avatars.githubusercontent.com/u/4598631?v=4?s=100" width="100px;" alt="Shoaib Merchant"/><br /><sub><b>Shoaib Merchant</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=shoaibmerchant" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/gleason-m"><img src="https://avatars.githubusercontent.com/u/86493344?v=4?s=100" width="100px;" alt="Michael Gleason"/><br /><sub><b>Michael Gleason</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=gleason-m" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://ana.gelez.xyz"><img src="https://avatars.githubusercontent.com/u/16254623?v=4?s=100" width="100px;" alt="Ana Gelez"/><br /><sub><b>Ana Gelez</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=elegaanz" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/tomknig"><img src="https://avatars.githubusercontent.com/u/3586316?v=4?s=100" width="100px;" alt="Tom König"/><br /><sub><b>Tom König</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=tomknig" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="https://www.legaltile.com/"><img src="https://avatars.githubusercontent.com/u/45085843?v=4?s=100" width="100px;" alt="Pierre Barre"/><br /><sub><b>Pierre Barre</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=Barre" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="http://skutnik.page"><img src="https://avatars.githubusercontent.com/u/22240065?v=4?s=100" width="100px;" alt="Jean-Baptiste Skutnik"/><br /><sub><b>Jean-Baptiste Skutnik</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=spoutn1k" title="Code">💻</a></td>
+ <td align="center" valign="top" width="14.28%"><a href="http://blog.packetsource.net/"><img src="https://avatars.githubusercontent.com/u/6276475?v=4?s=100" width="100px;" alt="Adam Chappell"/><br /><sub><b>Adam Chappell</b></sub></a><br /><a href="https://github.com/warp-tech/russh/commits?author=packetsource" title="Code">💻</a></td>
  </tr>
  </tbody>
 </table>

cryptovec/Cargo.toml

@@ -7,8 +7,11 @@ include = ["Cargo.toml", "src/lib.rs"]
 license = "Apache-2.0"
 name = "russh-cryptovec"
 repository = "https://github.com/warp-tech/russh"
-version = "0.7.0"
+version = "0.7.3"
+rust-version = "1.60"
 
 [dependencies]
 libc = "0.2"
+
+[target.'cfg(target_os = "windows")'.dependencies]
 winapi = {version = "0.3", features = ["basetsd", "minwindef", "memoryapi"]}

cryptovec/src/lib.rs

@@ -248,7 +248,15 @@ impl CryptoVec {
  let next_capacity = size.next_power_of_two();
  let old_ptr = self.p;
  let next_layout = std::alloc::Layout::from_size_align_unchecked(next_capacity, 1);
- self.p = std::alloc::alloc_zeroed(next_layout);
+ let new_ptr = std::alloc::alloc_zeroed(next_layout);
+ if new_ptr.is_null() {
+ #[allow(clippy::panic)]
+ {
+ panic!("Realloc failed, pointer = {:?} {:?}", self, size)
+ }
+ }
+
+ self.p = new_ptr;
  mlock(self.p, next_capacity);
 
  if self.capacity > 0 {
@@ -261,15 +269,8 @@ impl CryptoVec {
  std::alloc::dealloc(old_ptr, layout);
  }
 
- if self.p.is_null() {
- #[allow(clippy::panic)]
- {
- panic!("Realloc failed, pointer = {:?} {:?}", self, size)
- }
- } else {
- self.capacity = next_capacity;
- self.size = size;
- }
+ self.capacity = next_capacity;
+ self.size = size;
  }
  }
  }
@@ -429,3 +430,23 @@ impl Drop for CryptoVec {
  }
  }
 }
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ // If `resize` is called with a size that is too large to be allocated, it
+ // should panic, and not segfault or fail silently.
+ #[test]
+ fn large_resize_panics() {
+ let result = std::panic::catch_unwind(|| {
+ let mut vec = CryptoVec::new();
+ // Write something into the vector, so that there is something to
+ // copy when reallocating, to test all code paths.
+ vec.push(42);
+
+ vec.resize(1_000_000_000_000)
+ });
+ assert!(result.is_err());
+ }
+}