Webtransport

examples/Cargo.toml

@@ -19,7 +19,7 @@ rustls-native-certs = "0.6"
 structopt = "0.3"
 tokio = { version = "1.6", features = ["full"] }
 tracing = "0.1.10"
-tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "ansi", "env-filter", "time", "tracing-log"] }
+tracing-subscriber = { version = "0.3", default-features = true, features = ["fmt", "ansi", "env-filter", "time", "tracing-log"] }
 
 [[example]]
 name = "client"

examples/generate_certs.sh

@@ -0,0 +1,7 @@
+
+# use mkcert to generate certs for localhost
+mkcert localhost
+
+# convert certs from pem to der
+openssl x509 -outform der -in localhost.pem -out localhost.crt
+openssl rsa -outform der -in localhost-key.pem -out localhost.key

examples/server.rs

@@ -54,15 +54,13 @@ pub struct Certs {
     pub key: PathBuf,
 }
 
-static ALPN: &[u8] = b"h3";
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     tracing_subscriber::fmt()
         .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
         .with_span_events(tracing_subscriber::fmt::format::FmtSpan::FULL)
         .with_writer(std::io::stderr)
-        .with_max_level(tracing::Level::INFO)
+        .with_max_level(tracing::Level::TRACE)
         .init();
 
     // process cli arguments
@@ -97,7 +95,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_single_cert(vec![cert], key)?;
 
     tls_config.max_early_data_size = u32::MAX;
-    tls_config.alpn_protocols = vec![ALPN.into()];
+    let ALPN: Vec<Vec<u8>> = vec!(b"h3".to_vec(), b"h3-32".to_vec(), b"h3-31".to_vec(), b"h3-30".to_vec(), b"h3-29".to_vec());
+    tls_config.alpn_protocols = ALPN;
 
     let server_config = quinn::ServerConfig::with_crypto(Arc::new(tls_config));
     let (endpoint, mut incoming) = quinn::Endpoint::server(server_config, opt.listen)?;

h3/src/connection.rs

@@ -109,6 +109,12 @@ where
         settings
             .insert(SettingId::MAX_HEADER_LIST_SIZE, max_field_section_size)
             .map_err(|e| Code::H3_INTERNAL_ERROR.with_cause(e))?;
+        settings.insert(SettingId::ENABLE_CONNECT_PROTOCOL, 1)
+            .map_err(|e| Code::H3_INTERNAL_ERROR.with_cause(e))?;
+        settings.insert(SettingId::ENABLE_WEBTRANSPORT, 1)
+            .map_err(|e| Code::H3_INTERNAL_ERROR.with_cause(e))?;
+        settings.insert(SettingId::H3_DATAGRAM, 1)
+            .map_err(|e| Code::H3_INTERNAL_ERROR.with_cause(e))?;
 
         if grease {
             //  Grease Settings (https://www.rfc-editor.org/rfc/rfc9114.html#name-defined-settings-parameters)

h3/src/proto/frame.rs

@@ -46,6 +46,7 @@ pub enum Frame<B> {
     PushPromise(PushPromise),
     Goaway(VarInt),
     MaxPushId(PushId),
+    WebTransportStream(WebTransportStream),
     Grease,
 }
 
@@ -80,13 +81,15 @@ impl Frame<PayloadLen> {
         }
 
         let mut payload = buf.take(len as usize);
+        trace!("frame ty: {:?}", ty);
         let frame = match ty {
             FrameType::HEADERS => Ok(Frame::Headers(payload.copy_to_bytes(len as usize))),
             FrameType::SETTINGS => Ok(Frame::Settings(Settings::decode(&mut payload)?)),
             FrameType::CANCEL_PUSH => Ok(Frame::CancelPush(payload.get_var()?.try_into()?)),
             FrameType::PUSH_PROMISE => Ok(Frame::PushPromise(PushPromise::decode(&mut payload)?)),
             FrameType::GOAWAY => Ok(Frame::Goaway(VarInt::decode(&mut payload)?)),
             FrameType::MAX_PUSH_ID => Ok(Frame::MaxPushId(payload.get_var()?.try_into()?)),
+            FrameType::WEBTRANSPORT_STREAM =>Ok(Frame::WebTransportStream(WebTransportStream { buffer: payload.copy_to_bytes(len as usize)})),
             FrameType::H2_PRIORITY
             | FrameType::H2_PING
             | FrameType::H2_WINDOW_UPDATE
@@ -132,6 +135,7 @@ where
                 buf.write_var(6);
                 buf.put_slice(b"grease");
             }
+            Frame::WebTransportStream(_) => todo!(),
         }
     }
 }
@@ -189,6 +193,7 @@ impl fmt::Debug for Frame<PayloadLen> {
             Frame::Goaway(id) => write!(f, "GoAway({})", id),
             Frame::MaxPushId(id) => write!(f, "MaxPushId({})", id),
             Frame::Grease => write!(f, "Grease()"),
+            Frame::WebTransportStream(_) => todo!(),
         }
     }
 }
@@ -207,6 +212,7 @@ where
             Frame::Goaway(id) => write!(f, "GoAway({})", id),
             Frame::MaxPushId(id) => write!(f, "MaxPushId({})", id),
             Frame::Grease => write!(f, "Grease()"),
+            Frame::WebTransportStream(_) => write!(f, "WebTransportStream()"),
         }
     }
 }
@@ -226,6 +232,9 @@ impl<T, U> PartialEq<Frame<T>> for Frame<U> {
             Frame::Goaway(x) => matches!(other, Frame::Goaway(y) if x == y),
             Frame::MaxPushId(x) => matches!(other, Frame::MaxPushId(y) if x == y),
             Frame::Grease => matches!(other, Frame::Grease),
+            Frame::WebTransportStream(x) => {
+                matches!(other, Frame::WebTransportStream(y) if x == y)
+            }
         }
     }
 }
@@ -257,6 +266,7 @@ frame_types! {
     H2_WINDOW_UPDATE = 0x8,
     H2_CONTINUATION = 0x9,
     MAX_PUSH_ID = 0xD,
+    WEBTRANSPORT_STREAM = 0x41,
 }
 
 impl FrameType {
@@ -297,6 +307,11 @@ pub struct PushPromise {
     encoded: Bytes,
 }
 
+#[derive(Debug, PartialEq)]
+pub struct WebTransportStream 
+{
+    buffer: Bytes,
+}
 impl FrameHeader for PushPromise {
     const TYPE: FrameType = FrameType::PUSH_PROMISE;
 
@@ -389,6 +404,17 @@ setting_identifiers! {
     QPACK_MAX_TABLE_CAPACITY = 0x1,
     QPACK_MAX_BLOCKED_STREAMS = 0x7,
     MAX_HEADER_LIST_SIZE = 0x6,
+    QPACK_BLOCKED_STREAMS = 0x7,
+    // https://datatracker.ietf.org/doc/html/rfc9220#section-5
+    ENABLE_CONNECT_PROTOCOL = 0x8,
+    // https://datatracker.ietf.org/doc/html/draft-ietf-masque-h3-datagram-05#section-9.1
+    H3_DATAGRAM = 0xFFD277,
+    // https://datatracker.ietf.org/doc/html/draft-ietf-webtrans-http2-02#section-10.1
+    ENABLE_WEBTRANSPORT = 0x2B603742,
+    H3_SETTING_ENABLE_DATAGRAM_CHROME_SPECIFIC= 0xFFD277,
+    // Dummy setting to check it is correctly ignored by the peer.
+    // https://datatracker.ietf.org/doc/html/rfc9114#section-7.2.4.1
+    DUMMY = 0x21,
 }
 
 const SETTINGS_LEN: usize = 4;

h3/src/proto/stream.rs

@@ -26,6 +26,7 @@ stream_types! {
     PUSH = 0x01,
     ENCODER = 0x02,
     DECODER = 0x03,
+    WEBTRANSPORT = 0x54,
 }
 
 impl StreamType {

h3/src/server.rs

@@ -72,7 +72,7 @@ use crate::{
     quic::{self, RecvStream as _, SendStream as _},
     stream,
 };
-use tracing::{error, trace, warn};
+use tracing::{error, trace, warn, info};
 
 /// Create a builder of HTTP/3 server connections
 ///
@@ -353,8 +353,11 @@ where
         &mut self,
         cx: &mut Context<'_>,
     ) -> Poll<Result<Option<C::BidiStream>, Error>> {
+        info!("poll_accept_request");
         let _ = self.poll_control(cx)?;
+        info!("poll_accept_request: poll_control done");
         let _ = self.poll_requests_completion(cx);
+        info!("poll_accept_request: poll_requests_completion done");
         loop {
             match self.inner.poll_accept_request(cx) {
                 Poll::Ready(Err(x)) => break Poll::Ready(Err(x)),
@@ -400,7 +403,7 @@ where
     fn poll_control(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Error>> {
         while let Poll::Ready(frame) = self.inner.poll_control(cx)? {
             match frame {
-                Frame::Settings(_) => trace!("Got settings"),
+                Frame::Settings(w) => trace!("Got settings > {:?}", w),
                 Frame::Goaway(id) => self.inner.process_goaway(&mut self.recv_closing, id)?,
                 f @ Frame::MaxPushId(_) | f @ Frame::CancelPush(_) => {
                     warn!("Control frame ignored {:?}", f);