Merge branch 'main' into configure-probes

Author: rklaehn

iroh/src/endpoint.rs

@@ -87,14 +87,14 @@ pub use self::{
     quic::{
         AcceptBi, AcceptUni, AckFrequencyConfig, ApplicationClose, Chunk, ClosedStream,
         ConnectionClose, ConnectionError, ConnectionStats, Controller, ControllerFactory,
-        ControllerMetrics, CryptoError, Dir, ExportKeyingMaterialError, FrameStats, FrameType,
-        HandshakeTokenKey, HeaderKey, IdleTimeout, Keys, MtuDiscoveryConfig, OpenBi, OpenUni,
-        PacketKey, PathId, PathStats, QuicConnectError, QuicTransportConfig,
-        QuicTransportConfigBuilder, ReadDatagram, ReadError, ReadExactError, ReadToEndError,
-        RecvStream, ResetError, RttEstimator, SendDatagram, SendDatagramError, SendStream,
-        ServerConfig, ServerConfigBuilder, Side, StoppedError, StreamId, TimeSource, TokenLog,
-        TokenReuseError, TransportError, TransportErrorCode, TransportParameters, UdpStats,
-        UnorderedRecvStream, UnsupportedVersion, ValidationTokenConfig, VarInt,
+        ControllerMetrics, CryptoError, DecryptedInitial, Dir, ExportKeyingMaterialError,
+        FrameStats, FrameType, HandshakeTokenKey, HeaderKey, IdleTimeout, IncomingAlpns, Keys,
+        MtuDiscoveryConfig, OpenBi, OpenUni, PacketKey, PathId, PathStats, QuicConnectError,
+        QuicTransportConfig, QuicTransportConfigBuilder, ReadDatagram, ReadError, ReadExactError,
+        ReadToEndError, RecvStream, ResetError, RttEstimator, SendDatagram, SendDatagramError,
+        SendStream, ServerConfig, ServerConfigBuilder, Side, StoppedError, StreamId, TimeSource,
+        TokenLog, TokenReuseError, TransportError, TransportErrorCode, TransportParameters,
+        UdpStats, UnorderedRecvStream, UnsupportedVersion, ValidationTokenConfig, VarInt,
         VarIntBoundsExceeded, WriteError, Written,
     },
 };

iroh/src/endpoint/connection.rs

@@ -34,6 +34,7 @@ use noq::WeakConnectionHandle;
 use pin_project::pin_project;
 use tracing::{event, warn};
 
+use super::quic::DecryptedInitial;
 use crate::{
     Endpoint,
     endpoint::{
@@ -212,6 +213,14 @@ impl Incoming {
     pub fn remote_addr_validated(&self) -> bool {
         self.inner.remote_address_validated()
     }
+
+    /// Decrypt the Initial packet payload
+    ///
+    /// This clones and decrypts the packet payload (~1200 bytes).
+    /// Can be used to extract information from the TLS ClientHello without completing the handshake.
+    pub fn decrypt(&self) -> Option<DecryptedInitial> {
+        self.inner.decrypt()
+    }
 }
 
 impl IntoFuture for Incoming {

iroh/src/endpoint/quic.rs

@@ -52,8 +52,10 @@ pub use noq_proto::{
     Chunk,                            // noq::RecvStream
     ConnectError as QuicConnectError, // iroh::endpoint::ConnectWithOptsError
     ConnectionClose,                  // noq::ConnectionError
+    DecryptedInitial,                 // iroh::endpoint::connection::Incoming
     FrameStats,                       // noq::ConnectionStats
     FrameType,                        // noq_proto::TransportError
+    IncomingAlpns,                    // iroh::endpoint::DecryptedInitial
     PathId,                           // noq_proto::crypto::PacketKey
     RttEstimator,                     // noq_proto::congestion::Controller
     TimeSource,                       // iroh::endpoint::quic::ServerConfig