diff options
| author | liuxueli <[email protected]> | 2021-11-02 19:55:46 +0300 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2021-11-02 19:55:46 +0300 |
| commit | eecd661b91fbca2240dd7fdb0792459e036af75a (patch) | |
| tree | e167156215c5ec55821782731e448324e586d6f5 /test | |
| parent | a6d1dbf9d2ffb9e2a89474a6d4933cfe3bf43439 (diff) | |
TSG-8261,TSG-8291: 部分QUIC RFC9000未解析出SNI/User-Agent字段v1.4.7
Diffstat (limited to 'test')
24 files changed, 160 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 726506f..77936d6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -38,7 +38,6 @@ set_target_properties(${lib_name}_test_plug PROPERTIES PREFIX "") add_test(NAME COPY_QUIC_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/${lib_name}.so ${PROTO_TEST_RUN_DIR}/plug/protocol/${lib_name}/${lib_name}.so") add_test(NAME COPY_TEST_SO COMMAND sh -c "cp ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_test_plug.so ${PROTO_TEST_RUN_DIR}/plug/business/${lib_name}_test_plug/${lib_name}_test_plug.so") add_test(NAME IQUIC_29_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/iquic/29//${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/iquic/29/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) -add_test(NAME QUIC_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) add_test(NAME GQUIC_23_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/gquic/23/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/gquic/23/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) add_test(NAME GQUIC_25_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/gquic/25/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/gquic/25/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) add_test(NAME GQUIC_33_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/gquic/33/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/gquic/33/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) @@ -55,3 +54,6 @@ add_test(NAME MVFST_01_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/ add_test(NAME MVFST_02_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/mvfst/02/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/mvfst/02/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) add_test(NAME TQUIC_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/tquic/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/tquic/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) add_test(NAME IQUIC_PORT_8443_TEST COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/port-8443/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/port-8443/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) +add_test(NAME QUIC_RFC9000 COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) +add_test(NAME QUIC_RFC9000_FRAGMENT COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000-fragment/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000-fragment/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) +add_test(NAME QUIC_RFC9000_SPECIAL COMMAND proto_test_main ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000-special/${lib_name}_result.json -f "find ${CMAKE_CURRENT_SOURCE_DIR}/pcap/rfc9000-special/ -name *.pcap|sort -V" WORKING_DIRECTORY ${PROTO_TEST_RUN_DIR}) diff --git a/test/pcap/gquic/33/quic_result.json b/test/pcap/gquic/33/quic_result.json index 153eb62..7df585e 100644 --- a/test/pcap/gquic/33/quic_result.json +++ b/test/pcap/gquic/33/quic_result.json @@ -2,6 +2,8 @@ "Tuple4": "90.143.189.5.8026>173.194.188.40.443", "VERSION": "Google QUIC 33", "SNI": "r3---sn-4g5ednse.googlevideo.com", + "UA": "com.google.android.youtube Cronet/53.0.2768.0", "SNI": "r3---sn-4g5ednse.googlevideo.com", + "UA": "com.google.android.youtube Cronet/53.0.2768.0", "name": "QUIC_RESULT_1" }] diff --git a/test/pcap/gquic/34/quic_result.json b/test/pcap/gquic/34/quic_result.json index a005423..cf4a4fc 100644 --- a/test/pcap/gquic/34/quic_result.json +++ b/test/pcap/gquic/34/quic_result.json @@ -2,6 +2,8 @@ "Tuple4": "85.117.125.8.21243>173.194.73.102.443", "VERSION": "Google QUIC 34", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/54.0.2823.2", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/54.0.2823.2", "name": "QUIC_RESULT_1" }] diff --git a/test/pcap/gquic/35/quic_result.json b/test/pcap/gquic/35/quic_result.json index 86d4e46..b2683ed 100644 --- a/test/pcap/gquic/35/quic_result.json +++ b/test/pcap/gquic/35/quic_result.json @@ -2,12 +2,17 @@ "Tuple4": "85.117.122.194.32370>173.194.220.138.443", "VERSION": "Google QUIC 35", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/56.0.2900.3", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/56.0.2900.3", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/56.0.2900.3", "name": "QUIC_RESULT_1" }, { "Tuple4": "85.117.122.21.21396>173.194.220.138.443", "VERSION": "Google QUIC 35", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/59.0.3068.4", "name": "QUIC_RESULT_2" }] + diff --git a/test/pcap/gquic/37/quic_result.json b/test/pcap/gquic/37/quic_result.json index ed07e78..9b31ec5 100644 --- a/test/pcap/gquic/37/quic_result.json +++ b/test/pcap/gquic/37/quic_result.json @@ -2,139 +2,174 @@ "Tuple4": "90.143.185.235.17239>173.194.44.6.443", "VERSION": "Google QUIC 37", "SNI": "www.youtube.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "name": "QUIC_RESULT_1" }, { "Tuple4": "10.32.121.249.33765>64.233.161.95.443", "VERSION": "Google QUIC 37", "SNI": "instantmessaging-pa.googleapis.com", + "UA": "com.google.android.apps.tachyon Cronet/61.0.3142.0", "name": "QUIC_RESULT_2" }, { "Tuple4": "10.35.127.134.42356>64.233.165.139.443", "VERSION": "Google QUIC 37", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/60.0.3108.3", "name": "QUIC_RESULT_3" }, { "Tuple4": "185.57.74.232.43276>173.194.44.78.443", "VERSION": "Google QUIC 37", "SNI": "www.youtube.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_4" }, { "Tuple4": "185.57.74.32.52134>74.125.232.249.443", "VERSION": "Google QUIC 37", "SNI": "googleads.g.doubleclick.net", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_5" }, { "Tuple4": "195.162.27.132.31404>217.76.77.81.443", "VERSION": "Google QUIC 37", "SNI": "r6---sn-5auxa-unxe.googlevideo.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_6" }, { "Tuple4": "195.162.27.132.31405>217.76.77.81.443", "VERSION": "Google QUIC 37", "SNI": "r6---sn-5auxa-unxe.googlevideo.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_7" }, { "Tuple4": "85.117.112.160.21969>64.233.165.95.443", "VERSION": "Google QUIC 37", "SNI": "www.googleapis.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "name": "QUIC_RESULT_8" }, { "Tuple4": "85.117.113.62.29644>173.194.73.95.443", "VERSION": "Google QUIC 37", "SNI": "youtubei.googleapis.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_9" }, { "Tuple4": "85.117.116.192.18140>173.194.44.1.443", "VERSION": "Google QUIC 37", "SNI": "www.youtube.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_10" }, { "Tuple4": "85.117.116.195.38495>173.194.222.132.443", "VERSION": "Google QUIC 37", "SNI": "yt3.ggpht.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_11" }, { "Tuple4": "85.117.123.242.33040>64.233.162.95.443", "VERSION": "Google QUIC 37", "SNI": "www.googleapis.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_12" }, { "Tuple4": "85.117.126.141.34209>64.233.164.132.443", "VERSION": "Google QUIC 37", "SNI": "yt3.ggpht.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "SNI": "yt3.ggpht.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "SNI": "yt3.ggpht.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "name": "QUIC_RESULT_13" }, { "Tuple4": "85.117.126.166.46412>173.194.44.4.443", "VERSION": "Google QUIC 37", "SNI": "www.youtube.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "SNI": "www.youtube.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_14" }, { "Tuple4": "85.117.126.63.9977>64.233.165.113.443", "VERSION": "Google QUIC 37", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3136.4", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3136.4", "name": "QUIC_RESULT_15" }, { "Tuple4": "85.117.126.68.44666>173.194.44.41.443", "VERSION": "Google QUIC 37", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3124.3", "name": "QUIC_RESULT_16" }, { "Tuple4": "90.143.176.79.38351>108.177.14.119.443", "VERSION": "Google QUIC 37", "SNI": "i.ytimg.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_17" }, { "Tuple4": "90.143.176.91.52171>173.194.222.101.443", "VERSION": "Google QUIC 37", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3142.0", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3142.0", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3142.0", "name": "QUIC_RESULT_18" }, { "Tuple4": "90.143.178.25.15835>173.194.73.119.443", "VERSION": "Google QUIC 37", "SNI": "i.ytimg.com", + "UA": "com.google.android.youtube Cronet/61.0.3129.3", "name": "QUIC_RESULT_19" }, { "Tuple4": "90.143.179.24.35032>173.194.32.196.443", "VERSION": "Google QUIC 37", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3124.3", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3124.3", "name": "QUIC_RESULT_20" }, { "Tuple4": "90.143.180.185.57766>173.194.32.196.443", "VERSION": "Google QUIC 37", "SNI": "clients4.google.com", + "UA": "com.google.android.apps.maps Cronet/61.0.3142.0", "name": "QUIC_RESULT_21" }, { "Tuple4": "90.143.183.75.19770>74.125.232.167.443", "VERSION": "Google QUIC 37", "SNI": "www.youtube.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_22" }, { "Tuple4": "90.143.184.225.24092>173.194.222.95.443", "VERSION": "Google QUIC 37", "SNI": "youtubei.googleapis.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "name": "QUIC_RESULT_23" }, { "Tuple4": "90.143.186.194.32570>173.194.44.1.443", "VERSION": "Google QUIC 37", "SNI": "www.youtube.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_24" }, { "Tuple4": "90.143.188.47.22565>64.233.162.95.443", "VERSION": "Google QUIC 37", "SNI": "youtubei.googleapis.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "SNI": "youtubei.googleapis.com", + "UA": "com.google.android.youtube Cronet/61.0.3142.0", "name": "QUIC_RESULT_25" }, { "Tuple4": "90.143.190.56.19723>108.177.14.102.443", "VERSION": "Google QUIC 37", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/60.0.3112.12", "name": "QUIC_RESULT_26" - }] +}] diff --git a/test/pcap/gquic/39/quic_result.json b/test/pcap/gquic/39/quic_result.json index bce3db3..6528c33 100644 --- a/test/pcap/gquic/39/quic_result.json +++ b/test/pcap/gquic/39/quic_result.json @@ -2,8 +2,12 @@ "Tuple4": "85.117.119.45.22495>173.194.73.101.443", "VERSION": "Google QUIC 39", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/65.0.3322.0", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/65.0.3322.0", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/65.0.3322.0", "SNI": "redirector.googlevideo.com", + "UA": "com.google.android.youtube Cronet/65.0.3322.0", "name": "QUIC_RESULT_1" }] diff --git a/test/pcap/gquic/41/quic_result.json b/test/pcap/gquic/41/quic_result.json index f39d2c6..30d0cc2 100644 --- a/test/pcap/gquic/41/quic_result.json +++ b/test/pcap/gquic/41/quic_result.json @@ -2,12 +2,14 @@ "Tuple4": "90.143.180.56.28496>64.233.165.113.443", "VERSION": "Google QUIC 41", "SNI": "s.youtube.com", + "UA": "com.google.android.youtube Cronet/66.0.3335.4", "SNI": "s.youtube.com", + "UA": "com.google.android.youtube Cronet/66.0.3335.4", "name": "QUIC_RESULT_1" }, { "Tuple4": "90.143.189.30.53357>64.233.165.95.443", "VERSION": "Google QUIC 41", "SNI": "youtubei.googleapis.com", + "UA": "com.google.android.youtube Cronet/66.0.3335.4", "name": "QUIC_RESULT_2" }] - diff --git a/test/pcap/gquic/44/quic_result.json b/test/pcap/gquic/44/quic_result.json index ed034e4..c5db421 100644 --- a/test/pcap/gquic/44/quic_result.json +++ b/test/pcap/gquic/44/quic_result.json @@ -10,133 +10,166 @@ "Tuple4": "185.57.75.21.44739>173.194.73.132.443", "VERSION": "Google QUIC 44", "SNI": "yt3.ggpht.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "name": "QUIC_RESULT_3" }, { "Tuple4": "212.154.234.46.62716>74.125.131.156.443", "VERSION": "Google QUIC 44", "SNI": "stats.g.doubleclick.net", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "SNI": "stats.g.doubleclick.net", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "name": "QUIC_RESULT_4" }, { "Tuple4": "2.135.246.186.56653>173.194.113.166.443", "VERSION": "Google QUIC 44", "SNI": "www.google-analytics.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1", "SNI": "www.google-analytics.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1", "name": "QUIC_RESULT_5" }, { "Tuple4": "85.117.110.235.48996>74.125.131.211.443", "VERSION": "Google QUIC 44", "SNI": "proxy.googlezip.net", + "UA": "dev Chrome/73.0.3667.2 Android 4.4.2; SM-G900F", "name": "QUIC_RESULT_6" }, { "Tuple4": "85.117.112.180.21665>173.194.113.153.443", "VERSION": "Google QUIC 44", "SNI": "adservice.google.kz", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.2; WOW64", "name": "QUIC_RESULT_7" }, { "Tuple4": "85.117.112.180.61808>64.233.165.132.443", "VERSION": "Google QUIC 44", "SNI": "yt3.ggpht.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.2; WOW64", "name": "QUIC_RESULT_8" }, { "Tuple4": "85.117.114.90.16060>64.233.165.94.443", "VERSION": "Google QUIC 44", "SNI": "www.google.kz", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "SNI": "www.google.kz", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "name": "QUIC_RESULT_9" }, { "Tuple4": "85.117.117.190.11567>64.233.165.94.443", "VERSION": "Google QUIC 44", "SNI": "www.google.kz", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.3; Win64; x64", "name": "QUIC_RESULT_10" }, { "Tuple4": "85.117.117.190.48098>173.194.221.95.443", "VERSION": "Google QUIC 44", "SNI": "safebrowsing.googleapis.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.3; Win64; x64", "name": "QUIC_RESULT_11" }, { "Tuple4": "85.117.119.57.4009>64.233.162.155.443", "VERSION": "Google QUIC 44", "SNI": "stats.g.doubleclick.net", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "name": "QUIC_RESULT_12" }, { "Tuple4": "85.117.126.11.11719>64.233.165.138.443", "VERSION": "Google QUIC 44", "SNI": "play.google.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_13" }, { "Tuple4": "85.117.126.11.29355>173.194.220.94.443", "VERSION": "Google QUIC 44", "SNI": "beacons3.gvt2.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_14" }, { "Tuple4": "85.117.126.11.45264>74.125.205.102.443", "VERSION": "Google QUIC 44", "SNI": "clients2.google.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_15" }, { "Tuple4": "89.218.169.150.55676>173.194.32.238.443", "VERSION": "Google QUIC 44", "SNI": "www.google-analytics.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "SNI": "www.google-analytics.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "name": "QUIC_RESULT_16" }, { "Tuple4": "89.218.79.162.64017>173.194.73.95.443", "VERSION": "Google QUIC 44", "SNI": "ajax.googleapis.com", + "UA": "canary Chrome/73.0.3671.3 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_17" }, { "Tuple4": "90.143.176.186.54278>173.194.32.194.443", "VERSION": "Google QUIC 44", "SNI": "clients4.google.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; Win64; x64", "name": "QUIC_RESULT_18" }, { "Tuple4": "90.143.177.184.59077>74.125.232.247.443", "VERSION": "Google QUIC 44", "SNI": "www.gstatic.com", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; WOW64", "name": "QUIC_RESULT_19" }, { "Tuple4": "90.143.177.184.5951>173.194.44.26.443", "VERSION": "Google QUIC 44", "SNI": "googleads.g.doubleclick.net", + "UA": "dev Chrome/73.0.3664.3 Windows NT 6.1; WOW64", "name": "QUIC_RESULT_20" }, { "Tuple4": "90.143.178.243.51779>64.233.164.94.443", "VERSION": "Google QUIC 44", "SNI": "update.googleapis.com", + "UA": "canary Chrome/73.0.3672.0 Windows NT 10.0; Win64; x64", "SNI": "update.googleapis.com", + "UA": "canary Chrome/73.0.3672.0 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_21" }, { "Tuple4": "90.143.181.226.34777>74.125.232.237.443", "VERSION": "Google QUIC 44", "SNI": "googleads.g.doubleclick.net", + "UA": "dev Chrome/73.0.3664.3 Windows NT 10.0; Win64; x64", "SNI": "googleads.g.doubleclick.net", + "UA": "dev Chrome/73.0.3664.3 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_22" }, { "Tuple4": "90.143.181.245.31397>74.125.232.191.443", "VERSION": "Google QUIC 44", "SNI": "www.google.kz", + "UA": "dev Chrome/73.0.3664.3 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_23" }, { "Tuple4": "90.143.187.227.10862>64.233.165.139.443", "VERSION": "Google QUIC 44", "SNI": "www.google-analytics.com", + "UA": "canary Chrome/73.0.3672.0 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_24" }, { "Tuple4": "90.143.187.227.10863>64.233.165.139.443", "VERSION": "Google QUIC 44", "SNI": "www.google-analytics.com", + "UA": "canary Chrome/73.0.3672.0 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_25" }, { "Tuple4": "90.143.187.227.4586>173.194.44.58.443", "VERSION": "Google QUIC 44", "SNI": "googleads.g.doubleclick.net", + "UA": "canary Chrome/73.0.3672.0 Windows NT 10.0; Win64; x64", "SNI": "googleads.g.doubleclick.net", + "UA": "canary Chrome/73.0.3672.0 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_26" }, { "Tuple4": "90.143.188.64.2542>64.233.165.94.443", "VERSION": "Google QUIC 44", "SNI": "beacons5.gvt2.com", + "UA": "dev Chrome/73.0.3667.2 Android 6.0.1; SM-A700FD", "SNI": "beacons5.gvt2.com", + "UA": "dev Chrome/73.0.3667.2 Android 6.0.1; SM-A700FD", "name": "QUIC_RESULT_27" }] diff --git a/test/pcap/gquic/46/quic_result.json b/test/pcap/gquic/46/quic_result.json index b04f987..ac14823 100644 --- a/test/pcap/gquic/46/quic_result.json +++ b/test/pcap/gquic/46/quic_result.json @@ -6,6 +6,8 @@ "Tuple4": "172.16.30.79.65003>203.208.50.45.443", "VERSION": "Google QUIC 46", "SNI": "pagead2.googlesyndication.com", + "UA": "Chrome/79.0.3945.79 Windows NT 6.1; Win64; x64", "SNI": "pagead2.googlesyndication.com", + "UA": "Chrome/79.0.3945.79 Windows NT 6.1; Win64; x64", "name": "QUIC_RESULT_2" }] diff --git a/test/pcap/gquic/50/quic_result.json b/test/pcap/gquic/50/quic_result.json index 7aa2c47..c1f0faa 100644 --- a/test/pcap/gquic/50/quic_result.json +++ b/test/pcap/gquic/50/quic_result.json @@ -2,15 +2,18 @@ "Tuple4": "172.20.9.135.65045>64.233.162.119.443", "VERSION": "Google QUIC 50", "SNI": "i.ytimg.com", + "UA": "Chrome/86.0.4240.75 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_1" }, { "Tuple4": "172.20.9.135.61564>173.194.221.103.443", "VERSION": "Google QUIC 50", "SNI": "www.google.com", + "UA": "Chrome/86.0.4240.75 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_2" }, { "Tuple4": "172.20.9.135.49347>64.233.165.93.443", "VERSION": "Google QUIC 50", "SNI": "www.youtube.com", + "UA": "Chrome/86.0.4240.75 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_3" }] diff --git a/test/pcap/iquic/29/quic_result.json b/test/pcap/iquic/29/quic_result.json index 6cee24e..e6bd13b 100644 --- a/test/pcap/iquic/29/quic_result.json +++ b/test/pcap/iquic/29/quic_result.json @@ -11,5 +11,7 @@ "Tuple4": "192.168.50.33.57220>114.250.70.38.443", "VERSION": "IETF QUIC 29", "SNI": "securepubads.g.doubleclick.net", + "UA": "Chrome/90.0.4430.72 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_3" }] + diff --git a/test/pcap/port-8443/quic_result.json b/test/pcap/port-8443/quic_result.json index 89070bb..cf5e36b 100644 --- a/test/pcap/port-8443/quic_result.json +++ b/test/pcap/port-8443/quic_result.json @@ -2,5 +2,6 @@ "Tuple4": "192.168.50.49.58445>45.77.96.66.8443", "VERSION": "IETF QUIC 29", "SNI": "quic.tech", + "UA": "Chrome/92.0.4515.159 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_1" }] diff --git a/test/pcap/rfc9000-fragment/1-addis-quic-sni-not-parsed-filtered.pcap b/test/pcap/rfc9000-fragment/1-addis-quic-sni-not-parsed-filtered.pcap Binary files differnew file mode 100644 index 0000000..34b5c2d --- /dev/null +++ b/test/pcap/rfc9000-fragment/1-addis-quic-sni-not-parsed-filtered.pcap diff --git a/test/pcap/rfc9000-fragment/2-quic-no-parse-sni-RFC9000-192.168.8.106.53736-142.250.185.36.443-6.pcap b/test/pcap/rfc9000-fragment/2-quic-no-parse-sni-RFC9000-192.168.8.106.53736-142.250.185.36.443-6.pcap Binary files differnew file mode 100644 index 0000000..eb8d602 --- /dev/null +++ b/test/pcap/rfc9000-fragment/2-quic-no-parse-sni-RFC9000-192.168.8.106.53736-142.250.185.36.443-6.pcap diff --git a/test/pcap/rfc9000-fragment/3-quic-no-parse-sni-RFC9000-63821-443-192.168.8.106-142.250.185.36.pcap b/test/pcap/rfc9000-fragment/3-quic-no-parse-sni-RFC9000-63821-443-192.168.8.106-142.250.185.36.pcap Binary files differnew file mode 100644 index 0000000..c86c379 --- /dev/null +++ b/test/pcap/rfc9000-fragment/3-quic-no-parse-sni-RFC9000-63821-443-192.168.8.106-142.250.185.36.pcap diff --git a/test/pcap/rfc9000-fragment/quic_result.json b/test/pcap/rfc9000-fragment/quic_result.json new file mode 100644 index 0000000..65dbdd3 --- /dev/null +++ b/test/pcap/rfc9000-fragment/quic_result.json @@ -0,0 +1,31 @@ +[{ + "Tuple4": "192.168.8.106.57644>142.250.185.36.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "www.google.com", + "UA": "Chrome/94.0.4606.81 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_1" + }, { + "Tuple4": "192.168.8.106.60687>142.250.185.36.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "www.google.com", + "UA": "Chrome/94.0.4606.81 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_2" + }, { + "Tuple4": "192.168.8.106.53622>142.250.185.36.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "www.google.com", + "UA": "Chrome/94.0.4606.81 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_3" + }, { + "Tuple4": "192.168.8.106.53736>142.250.185.36.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "www.google.com", + "UA": "Chrome/94.0.4606.81 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_4" + }, { + "Tuple4": "192.168.8.106.63821>142.250.185.36.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "www.google.com", + "UA": "Chrome/94.0.4606.81 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_5" +}] diff --git a/test/pcap/rfc9000-special/1-quic-rc9000-no-parse-UA-192.168.8.110.49832-172.217.18.150.443.pcap b/test/pcap/rfc9000-special/1-quic-rc9000-no-parse-UA-192.168.8.110.49832-172.217.18.150.443.pcap Binary files differnew file mode 100644 index 0000000..f79f09d --- /dev/null +++ b/test/pcap/rfc9000-special/1-quic-rc9000-no-parse-UA-192.168.8.110.49832-172.217.18.150.443.pcap diff --git a/test/pcap/rfc9000-special/2-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.50339-172.217.169.227.443.pcap b/test/pcap/rfc9000-special/2-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.50339-172.217.169.227.443.pcap Binary files differnew file mode 100644 index 0000000..c53cbee --- /dev/null +++ b/test/pcap/rfc9000-special/2-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.50339-172.217.169.227.443.pcap diff --git a/test/pcap/rfc9000-special/3-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.52455-213.55.110.12.443.pcap b/test/pcap/rfc9000-special/3-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.52455-213.55.110.12.443.pcap Binary files differnew file mode 100644 index 0000000..3a1736c --- /dev/null +++ b/test/pcap/rfc9000-special/3-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.52455-213.55.110.12.443.pcap diff --git a/test/pcap/rfc9000-special/4-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.64550-142.250.185.36.443.pcap b/test/pcap/rfc9000-special/4-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.64550-142.250.185.36.443.pcap Binary files differnew file mode 100644 index 0000000..09e3dc2 --- /dev/null +++ b/test/pcap/rfc9000-special/4-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.64550-142.250.185.36.443.pcap diff --git a/test/pcap/rfc9000-special/5-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.65140-213.55.110.13.443.pcap b/test/pcap/rfc9000-special/5-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.65140-213.55.110.13.443.pcap Binary files differnew file mode 100644 index 0000000..7e484b7 --- /dev/null +++ b/test/pcap/rfc9000-special/5-quic-rfc9000-no-parse-SNI-UA-192.168.8.110.65140-213.55.110.13.443.pcap diff --git a/test/pcap/rfc9000-special/quic_result.json b/test/pcap/rfc9000-special/quic_result.json new file mode 100644 index 0000000..da2b724 --- /dev/null +++ b/test/pcap/rfc9000-special/quic_result.json @@ -0,0 +1,31 @@ +[{ + "Tuple4": "192.168.8.110.49832>172.217.18.150.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "i.ytimg.com", + "UA": "Chrome/95.0.4638.54 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_1" + }, { + "Tuple4": "192.168.8.110.50339>172.217.169.227.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "www.google.com.et", + "UA": "Chrome/95.0.4638.54 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_2" + }, { + "Tuple4": "192.168.8.110.52455>213.55.110.12.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "r1---sn-xuj-5qqz.googlevideo.com", + "UA": "Chrome/95.0.4638.54 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_3" + }, { + "Tuple4": "192.168.8.110.64550>142.250.185.36.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "www.google.com", + "UA": "Chrome/95.0.4638.54 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_4" + }, { + "Tuple4": "192.168.8.110.65140>213.55.110.13.443", + "VERSION": "IETF QUIC RFC9000", + "SNI": "r2---sn-xuj-5qqz.googlevideo.com", + "UA": "Chrome/95.0.4638.54 Windows NT 10.0; Win64; x64", + "name": "QUIC_RESULT_5" +}] diff --git a/test/pcap/rfc9000/quic_result.json b/test/pcap/rfc9000/quic_result.json index 38f21e3..8a68816 100644 --- a/test/pcap/rfc9000/quic_result.json +++ b/test/pcap/rfc9000/quic_result.json @@ -2,6 +2,7 @@ "Tuple4": "192.168.60.32.59699>64.233.164.84.443", "VERSION": "IETF QUIC RFC9000", "SNI": "accounts.google.com", + "UA": "Chrome/92.0.4515.159 Windows NT 10.0; Win64; x64", "name": "QUIC_RESULT_1" }, { "Tuple4": "124.88.191.113.39716>114.250.66.33.443", diff --git a/test/quic_test_plug.cpp b/test/quic_test_plug.cpp index 1c0ffcb..a8b48c7 100644 --- a/test/quic_test_plug.cpp +++ b/test/quic_test_plug.cpp @@ -49,6 +49,7 @@ extern "C" unsigned char QUIC_TEST_PLUG_ENTRY(stSessionInfo *session_info, void } quic_info = (struct _quic_info *)session_info->app_info; cJSON_AddStringToObject(ctx, "SNI", (char *)(quic_info->client_hello->ext_tags[quic_info->client_hello->sni_idx].value)); + cJSON_AddStringToObject(ctx, "UA", (char *)(quic_info->client_hello->ext_tags[quic_info->client_hello->ua_idx].value)); break; case QUIC_USEING_VERSION: version = *(unsigned int *)(session_info->buf); |
