fix data length in client hello (#433)

* fix data length in client hello
plabayo · Feb 26, 2025 · a58bfdf · a58bfdf
1 parent 1da2128
commit a58bfdf
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 33 deletions.
diff --git a/rama-cli/src/cmd/fp/data.rs b/rama-cli/src/cmd/fp/data.rs
@@ -258,7 +258,7 @@ pub(super) struct Ja3DisplayInfo {
 #[derive(Debug, Clone, Serialize)]
 pub(super) struct TlsDisplayInfoExtension {
     pub(super) id: String,
-    pub(super) data: TlsDisplayInfoExtensionData,
+    pub(super) data: Option<TlsDisplayInfoExtensionData>,
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -306,50 +306,52 @@ pub(super) fn get_tls_display_info(ctx: &Context<Arc<State>>) -> Option<TlsDispl
             .map(|extension| match extension {
                 ClientHelloExtension::ServerName(domain) => TlsDisplayInfoExtension {
                     id: extension.id().to_string(),
-                    data: TlsDisplayInfoExtensionData::Single(match domain {
-                        Some(domain) => domain.to_string(),
-                        None => "".to_owned(),
-                    }),
+                    data: domain
+                        .as_ref()
+                        .map(|d| TlsDisplayInfoExtensionData::Single(d.to_string())),
                 },
                 ClientHelloExtension::SignatureAlgorithms(v) => TlsDisplayInfoExtension {
                     id: extension.id().to_string(),
-                    data: TlsDisplayInfoExtensionData::Multi(
+                    data: Some(TlsDisplayInfoExtensionData::Multi(
                         v.iter().map(|s| s.to_string()).collect(),
-                    ),
+                    )),
                 },
                 ClientHelloExtension::SupportedVersions(v) => TlsDisplayInfoExtension {
                     id: extension.id().to_string(),
-                    data: TlsDisplayInfoExtensionData::Multi(
+                    data: Some(TlsDisplayInfoExtensionData::Multi(
                         v.iter().map(|s| s.to_string()).collect(),
-                    ),
+                    )),
                 },
                 ClientHelloExtension::ApplicationLayerProtocolNegotiation(v) => {
                     TlsDisplayInfoExtension {
                         id: extension.id().to_string(),
-                        data: TlsDisplayInfoExtensionData::Multi(
+                        data: Some(TlsDisplayInfoExtensionData::Multi(
                             v.iter().map(|s| s.to_string()).collect(),
-                        ),
+                        )),
                     }
                 }
                 ClientHelloExtension::SupportedGroups(v) => TlsDisplayInfoExtension {
                     id: extension.id().to_string(),
-                    data: TlsDisplayInfoExtensionData::Multi(
+                    data: Some(TlsDisplayInfoExtensionData::Multi(
                         v.iter().map(|s| s.to_string()).collect(),
-                    ),
+                    )),
                 },
                 ClientHelloExtension::ECPointFormats(v) => TlsDisplayInfoExtension {
                     id: extension.id().to_string(),
-                    data: TlsDisplayInfoExtensionData::Multi(
+                    data: Some(TlsDisplayInfoExtensionData::Multi(
                         v.iter().map(|s| s.to_string()).collect(),
-                    ),
+                    )),
                 },
                 ClientHelloExtension::Opaque { id, data } => TlsDisplayInfoExtension {
                     id: id.to_string(),
-                    data: TlsDisplayInfoExtensionData::Single(if data.is_empty() {
-                        "EMPTY".to_owned()
+                    data: if data.is_empty() {
+                        None
                     } else {
-                        format!("0x{}", hex::encode(data))
-                    }),
+                        Some(TlsDisplayInfoExtensionData::Single(format!(
+                            "0x{}",
+                            hex::encode(data)
+                        )))
+                    },
                 },
             })
             .collect::<Vec<_>>(),

diff --git a/rama-cli/src/cmd/fp/endpoints.rs b/rama-cli/src/cmd/fp/endpoints.rs
@@ -547,18 +547,19 @@ impl From<TlsDisplayInfo> for Vec<Table> {
             ],
         });
         for extension in info.extensions {
+            let mut rows = vec![("ID".to_owned(), extension.id)];
+            if let Some(data) = extension.data {
+                rows.push((
+                    "Data".to_owned(),
+                    match data {
+                        TlsDisplayInfoExtensionData::Single(s) => s,
+                        TlsDisplayInfoExtensionData::Multi(v) => v.join(", "),
+                    },
+                ));
+            }
             vec.push(Table {
                 title: "🔒 TLS Client Hello — Extension".to_owned(),
-                rows: vec![
-                    ("ID".to_owned(), extension.id),
-                    (
-                        "Data".to_owned(),
-                        match extension.data {
-                            TlsDisplayInfoExtensionData::Single(s) => s,
-                            TlsDisplayInfoExtensionData::Multi(v) => v.join(", "),
-                        },
-                    ),
-                ],
+                rows,
             });
         }
         vec

diff --git a/src/cli/service/echo.rs b/src/cli/service/echo.rs
@@ -414,10 +414,16 @@ impl Service<(), Request> for EchoService {
                             "id": extension.id().to_string(),
                             "data": v.iter().map(|s| s.to_string()).collect::<Vec<_>>(),
                         }),
-                        ClientHelloExtension::Opaque { id, data } => json!({
-                            "id": id.to_string(),
-                            "data": format!("0x{}", hex::encode(data)),
-                        }),
+                        ClientHelloExtension::Opaque { id, data } => if data.is_empty() {
+                            json!({
+                                "id": id.to_string()
+                            })
+                        } else {
+                            json!({
+                                "id": id.to_string(),
+                                "data": format!("0x{}", hex::encode(data))
+                            })
+                        },
                     }).collect::<Vec<_>>(),
                     "ja3": ja3,
                     "ja4": ja4,