update strom dependency which fixes disable remote fingerprint verification, modify multistream protocol message, modify opening based on str0m api changes

Author: timwu20

Cargo.lock

@@ -64,7 +64,7 @@ rcgen = { version = "0.14.5", optional = true }
 # End of Quic related dependencies.
 
 # WebRTC related dependencies. WebRTC is an experimental feature flag. The dependencies must be updated.
-str0m = { version = "0.9.0", optional = true }
+str0m = { git = "https://github.com/algesten/str0m", rev = "8058d4d66bc1ac465962f95ac30df3235e671612", optional = true }
 # End of WebRTC related dependencies.
 
 # Fuzzing related dependencies.

Cargo.toml

@@ -220,6 +220,10 @@ impl Message {
 
             // Skip ahead to the next protocol.
             remaining = &tail[len..];
+            if remaining.len() == 0 {
+                // During negotiation the remote may not append a trailing newline.
+                break;
+            }
         }
 
         Ok(Message::Protocols(protocols))
@@ -230,7 +234,7 @@ impl Message {
 ///
 /// # Note
 ///
-/// This is implementation is not compliant with the multistream-select protocol spec.
+/// This implementation may not be compliant with the multistream-select protocol spec.
 /// The only purpose of this was to get the `multistream-select` protocol working with smoldot.
 pub fn webrtc_encode_multistream_message(
     messages: impl IntoIterator<Item = Message>,
@@ -249,9 +253,6 @@ pub fn webrtc_encode_multistream_message(
         header.append(&mut proto_bytes);
     }
 
-    // For the `Message::Protocols` to be interpreted correctly, it must be followed by a newline.
-    header.push(b'\n');
-
     Ok(BytesMut::from(&header[..]))
 }
 
@@ -542,4 +543,21 @@ mod tests {
             ProtocolError::InvalidMessage
         );
     }
+
+    #[test]
+    fn test_decode_multiple_protocols_no_trailing_newline() {
+        let raw: [u8; 38] = [
+            19, 47, 109, 117, 108, 116, 105, 115, 116, 114, 101, 97, 109, 47, 49, 46, 48, 46, 48, 10,
+            17, 47, 105, 112, 102, 115, 47, 112, 105, 110, 103, 47, 49, 46, 48, 46, 48, 10,
+        ];
+        let bytes = Bytes::copy_from_slice(&raw);
+        
+        assert_eq!(
+            Message::decode(bytes).unwrap(),
+            Message::Protocols(vec![
+                Protocol::try_from(Bytes::from_static(b"/multistream/1.0.0")).unwrap(),
+                Protocol::try_from(Bytes::from_static(b"/ipfs/ping/1.0.0")).unwrap(),
+            ])
+        );
+    }
 }

src/multistream_select/protocol.rs

@@ -176,8 +176,8 @@ impl OpeningWebRtcConnection {
             .rtc
             .direct_api()
             .remote_dtls_fingerprint()
-            .clone()
-            .expect("fingerprint to exist");
+            .expect("fingerprint to exist")
+            .clone();
         Self::fingerprint_to_bytes(&fingerprint)
     }
 
@@ -268,8 +268,8 @@ impl OpeningWebRtcConnection {
             .rtc
             .direct_api()
             .remote_dtls_fingerprint()
-            .clone()
             .expect("fingerprint to exist")
+            .clone()
             .bytes;
 
         const MULTIHASH_SHA256_CODE: u64 = 0x12;