grpc-uds: update to 0.3.18

.github/workflows/CI.yml

@@ -13,21 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
           components: rustfmt
 
-      - name: cargo fmt --check
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - run: cargo fmt --all --check
 
   test:
     name: Test
@@ -43,38 +36,26 @@ jobs:
           - stable
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Install Rust (${{ matrix.rust }})
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          override: true
 
       - name: Install libssl-dev
         run: sudo apt-get update && sudo apt-get install libssl-dev
       - name: Build without unstable flag
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
+        run: cargo build
 
       - name: Check with unstable flag
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --features unstable
+        run: cargo check --features unstable
 
       - name: Run lib tests and doc tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
+        run: cargo test
 
       - name: Run integration tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: -p h2-tests
+        run: cargo test -p h2-tests
 
       - name: Run h2spec
         run: ./ci/h2spec.sh
@@ -83,3 +64,26 @@ jobs:
       - name: Check minimal versions
         run: cargo clean; cargo update -Zminimal-versions; cargo check
         if: matrix.rust == 'nightly'
+
+  msrv:
+    name: Check MSRV
+    needs: [style]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Get MSRV from package metadata
+        id: metadata
+        run: |
+          cargo metadata --no-deps --format-version 1 |
+              jq -r '"msrv=" + (.packages[] | select(.name == "h2")).rust_version' >> $GITHUB_OUTPUT
+
+      - name: Install Rust (${{ steps.metadata.outputs.msrv }})
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ steps.metadata.outputs.msrv }}
+
+      - run: cargo check

CHANGELOG.md

@@ -1,3 +1,67 @@
+# 0.3.18 (April 17, 2023)
+
+* Fix panic because of opposite check in `is_remote_local()`.
+
+# 0.3.17 (April 13, 2023)
+
+* Add `Error::is_library()` method to check if the originated inside `h2`.
+* Add `max_pending_accept_reset_streams(usize)` option to client and server
+  builders.
+* Fix theoretical memory growth when receiving too many HEADERS and then
+  RST_STREAM frames faster than an application can accept them off the queue.
+  (CVE-2023-26964)
+
+# 0.3.16 (February 27, 2023)
+
+* Set `Protocol` extension on requests when received Extended CONNECT requests.
+* Remove `B: Unpin + 'static` bound requiremented of bufs
+* Fix releasing of frames when stream is finished, reducing memory usage.
+* Fix panic when trying to send data and connection window is available, but stream window is not.
+* Fix spurious wakeups when stream capacity is not available.
+
+# 0.3.15 (October 21, 2022)
+
+* Remove `B: Buf` bound on `SendStream`'s parameter
+* add accessor for `StreamId` u32
+
+# 0.3.14 (August 16, 2022)
+
+* Add `Error::is_reset` function.
+* Bump MSRV to Rust 1.56.
+* Return `RST_STREAM(NO_ERROR)` when the server early responds.
+
+# 0.3.13 (March 31, 2022)
+
+* Update private internal `tokio-util` dependency.
+
+# 0.3.12 (March 9, 2022)
+
+* Avoid time operations that can panic (#599)
+* Bump MSRV to Rust 1.49 (#606)
+* Fix header decoding error when a header name is contained at a continuation
+  header boundary (#589)
+* Remove I/O type names from handshake `tracing` spans (#608)
+
+# 0.3.11 (January 26, 2022)
+
+* Make `SendStream::poll_capacity` never return `Ok(Some(0))` (#596)
+* Fix panic when receiving already reset push promise (#597)
+
+# 0.3.10 (January 6, 2022)
+
+* Add `Error::is_go_away()` and `Error::is_remote()` methods.
+* Fix panic if receiving malformed PUSH_PROMISE with stream ID of 0.
+
+# 0.3.9 (December 9, 2021)
+
+* Fix hang related to new `max_send_buffer_size`.
+
+# 0.3.8 (December 8, 2021)
+
+* Add "extended CONNECT support". Adds `h2::ext::Protocol`, which is used for request and response extensions to connect new protocols over an HTTP/2 stream.
+* Add `max_send_buffer_size` options to client and server builders, and a default of ~400MB. This acts like a high-water mark for the `poll_capacity()` method.
+* Fix panic if receiving malformed HEADERS with stream ID of 0.
+
 # 0.3.7 (October 22, 2021)
 
 * Fix panic if server sends a malformed frame on a stream client was about to open.

Cargo.toml

@@ -5,20 +5,21 @@ name = "h2"
 #   - html_root_url.
 # - Update CHANGELOG.md.
 # - Create git tag
-version = "0.3.7"
+version = "0.3.18"
 license = "MIT"
 authors = [
   "Carl Lerche <[email protected]>",
   "Sean McArthur <[email protected]>",
 ]
-description = "An HTTP/2.0 client and server"
+description = "An HTTP/2 client and server"
 documentation = "https://docs.rs/h2"
 repository = "https://github.com/hyperium/h2"
 readme = "README.md"
 keywords = ["http", "async", "non-blocking"]
 categories = ["asynchronous", "web-programming", "network-programming"]
 exclude = ["fixtures/**", "ci/**"]
 edition = "2018"
+rust-version = "1.56"
 
 [features]
 # Enables `futures::Stream` implementations for various types.
@@ -43,7 +44,7 @@ members = [
 futures-core = { version = "0.3", default-features = false }
 futures-sink = { version = "0.3", default-features = false }
 futures-util = { version = "0.3", default-features = false }
-tokio-util = { version = "0.6", features = ["codec"] }
+tokio-util = { version = "0.7.1", features = ["codec"] }
 tokio = { version = "1", features = ["io-util"] }
 bytes = "1"
 http = "0.2"
@@ -55,22 +56,20 @@ indexmap = { version = "1.5.2", features = ["std"] }
 [dev-dependencies]
 
 # Fuzzing
-quickcheck = { version = "0.4.1", default-features = false }
-rand = "0.3.15"
+quickcheck = { version = "1.0.3", default-features = false }
+rand = "0.8.4"
 
 # HPACK fixtures
-hex = "0.2.0"
-walkdir = "1.0.0"
+hex = "0.4.3"
+walkdir = "2.3.2"
 serde = "1.0.0"
 serde_json = "1.0.0"
 
 # Examples
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "net"] }
-env_logger = { version = "0.5.3", default-features = false }
-rustls = "0.19"
-tokio-rustls = "0.22"
-webpki = "0.21"
-webpki-roots = "0.21"
+env_logger = { version = "0.9", default-features = false }
+tokio-rustls = "0.23.2"
+webpki-roots = "0.22.2"
 
 [package.metadata.docs.rs]
 features = ["stream"]

README.md

@@ -1,6 +1,6 @@
 # H2
 
-A Tokio aware, HTTP/2.0 client & server implementation for Rust.
+A Tokio aware, HTTP/2 client & server implementation for Rust.
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![Crates.io](https://img.shields.io/crates/v/h2.svg)](https://crates.io/crates/h2)
@@ -12,21 +12,21 @@ More information about this crate can be found in the [crate documentation][dox]
 
 ## Features
 
-* Client and server HTTP/2.0 implementation.
-* Implements the full HTTP/2.0 specification.
+* Client and server HTTP/2 implementation.
+* Implements the full HTTP/2 specification.
 * Passes [h2spec](https://github.com/summerwind/h2spec).
 * Focus on performance and correctness.
 * Built on [Tokio](https://tokio.rs).
 
 ## Non goals
 
-This crate is intended to only be an implementation of the HTTP/2.0
+This crate is intended to only be an implementation of the HTTP/2
 specification. It does not handle:
 
 * Managing TCP connections
 * HTTP 1.0 upgrade
 * TLS
-* Any feature not described by the HTTP/2.0 specification.
+* Any feature not described by the HTTP/2 specification.
 
 This crate is now used by [hyper](https://github.com/hyperium/hyper), which will provide all of these features.
 
@@ -55,7 +55,7 @@ fn main() {
 
 **How does h2 compare to [solicit] or [rust-http2]?**
 
-The h2 library has implemented more of the details of the HTTP/2.0 specification
+The h2 library has implemented more of the details of the HTTP/2 specification
 than any other Rust library. It also passes the [h2spec] set of tests. The h2
 library is rapidly approaching "production ready" quality.
 

examples/akamai.rs

@@ -3,9 +3,9 @@ use http::{Method, Request};
 use tokio::net::TcpStream;
 use tokio_rustls::TlsConnector;
 
-use rustls::Session;
-use webpki::DNSNameRef;
+use tokio_rustls::rustls::{OwnedTrustAnchor, RootCertStore, ServerName};
 
+use std::convert::TryFrom;
 use std::error::Error;
 use std::net::ToSocketAddrs;
 
@@ -16,9 +16,19 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
     let _ = env_logger::try_init();
 
     let tls_client_config = std::sync::Arc::new({
-        let mut c = rustls::ClientConfig::new();
-        c.root_store
-            .add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
+        let mut root_store = RootCertStore::empty();
+        root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
+            OwnedTrustAnchor::from_subject_spki_name_constraints(
+                ta.subject,
+                ta.spki,
+                ta.name_constraints,
+            )
+        }));
+
+        let mut c = tokio_rustls::rustls::ClientConfig::builder()
+            .with_safe_defaults()
+            .with_root_certificates(root_store)
+            .with_no_client_auth();
         c.alpn_protocols.push(ALPN_H2.as_bytes().to_owned());
         c
     });
@@ -33,17 +43,14 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
     println!("ADDR: {:?}", addr);
 
     let tcp = TcpStream::connect(&addr).await?;
-    let dns_name = DNSNameRef::try_from_ascii_str("http2.akamai.com").unwrap();
+    let dns_name = ServerName::try_from("http2.akamai.com").unwrap();
     let connector = TlsConnector::from(tls_client_config);
     let res = connector.connect(dns_name, tcp).await;
     let tls = res.unwrap();
     {
         let (_, session) = tls.get_ref();
-        let negotiated_protocol = session.get_alpn_protocol();
-        assert_eq!(
-            Some(ALPN_H2.as_bytes()),
-            negotiated_protocol.as_ref().map(|x| &**x)
-        );
+        let negotiated_protocol = session.alpn_protocol();
+        assert_eq!(Some(ALPN_H2.as_bytes()), negotiated_protocol);
     }
 
     println!("Starting client handshake");

fuzz/Cargo.toml

@@ -13,12 +13,10 @@ cargo-fuzz = true
 arbitrary = { version = "1",  features = ["derive"] }
 libfuzzer-sys = { version = "0.4.0", features = ["arbitrary-derive"] }
 tokio = { version = "1", features = [ "full" ] }
-bytes = "0.5.2"
 h2 = { path = "../", features = [ "unstable" ] }
 h2-support = { path = "../tests/h2-support" }
 futures = { version = "0.3", default-features = false, features = ["std"] }
 http = "0.2"
-env_logger = { version = "0.5.3", default-features = false }
 
 # Prevent this from interfering with workspaces
 [workspace]