quic: fix PATH_CHALLENGE parser

firedancer-io · Nov 18, 2024 · aca5c23 · aca5c23
1 parent 1c1d27b
commit aca5c23
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/waltz/quic/templ/fd_quic_frames_templ.h b/src/waltz/quic/templ/fd_quic_frames_templ.h
@@ -293,7 +293,7 @@ FD_TEMPL_DEF_STRUCT_END(retire_conn_id_frame)
 
 FD_TEMPL_DEF_STRUCT_BEGIN(path_challenge_frame)
   FD_TEMPL_MBR_FRAME_TYPE( type, 0x1a,0x1a )
-  FD_TEMPL_MBR_ELEM_VARINT( data, ulong )
+  FD_TEMPL_MBR_ELEM_FIXED( data, ulong, 8 )
 FD_TEMPL_DEF_STRUCT_END(path_challenge_frame)
 
 
@@ -307,7 +307,7 @@ FD_TEMPL_DEF_STRUCT_END(path_challenge_frame)
 
 FD_TEMPL_DEF_STRUCT_BEGIN(path_response_frame)
   FD_TEMPL_MBR_FRAME_TYPE( type, 0x1b,0x1b )
-  FD_TEMPL_MBR_ELEM_VARINT( data, ulong )
+  FD_TEMPL_MBR_ELEM_FIXED( data, ulong, 8 )
 FD_TEMPL_DEF_STRUCT_END(path_response_frame)
 
 

diff --git a/src/waltz/quic/tests/test_quic_conformance.c b/src/waltz/quic/tests/test_quic_conformance.c
@@ -476,6 +476,26 @@ test_quic_server_alpn_fail( fd_quic_sandbox_t * sandbox,
 
 }
 
+static __attribute__((noinline)) void
+test_quic_parse_path_challenge( void ) {
+  fd_quic_path_challenge_frame_t path_challenge[1];
+  fd_quic_path_response_frame_t  path_response[1];
+
+  do {
+    uchar data[10] = {0x1a};
+    FD_TEST( fd_quic_decode_path_challenge_frame( path_challenge, data,  1UL )==FD_QUIC_PARSE_FAIL );
+    FD_TEST( fd_quic_decode_path_challenge_frame( path_challenge, data,  8UL )==FD_QUIC_PARSE_FAIL );
+    FD_TEST( fd_quic_decode_path_challenge_frame( path_challenge, data,  9UL )==9UL );
+    FD_TEST( fd_quic_decode_path_challenge_frame( path_challenge, data, 10UL )==9UL );
+
+    data[0] = 0x1b;
+    FD_TEST( fd_quic_decode_path_response_frame( path_response, data,  1UL )==FD_QUIC_PARSE_FAIL );
+    FD_TEST( fd_quic_decode_path_response_frame( path_response, data,  8UL )==FD_QUIC_PARSE_FAIL );
+    FD_TEST( fd_quic_decode_path_response_frame( path_response, data,  9UL )==9UL );
+    FD_TEST( fd_quic_decode_path_response_frame( path_response, data, 10UL )==9UL );
+  } while(0);
+}
+
 /* Test FIN arriving out of place */
 
 int
@@ -535,6 +555,7 @@ main( int     argc,
   test_quic_stream_agave_2_0_3           ( sandbox, rng );
   test_quic_ping_frame                   ( sandbox, rng );
   test_quic_server_alpn_fail             ( sandbox, rng );
+  test_quic_parse_path_challenge();
 
   /* Wind down */