Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions src/app/server/tracker/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -722,20 +722,19 @@ fn http2_frame_wire_bytes(frame: &Frame) -> u64 {
let base = u64::try_from(frame.payload_len())
.unwrap_or(u64::MAX)
.saturating_add(HTTP2_FRAME_HEADER_LENGTH);
let Frame::Headers(headers) = frame else {
return base;
let continuations = match frame {
Frame::Headers(frame) => &frame.continuations,
Frame::PushPromise(frame) => &frame.continuations,
_ => return base,
};

headers
.continuations
.iter()
.fold(base, |total, continuation| {
total.saturating_add(
u64::try_from(continuation.length)
.unwrap_or(u64::MAX)
.saturating_add(HTTP2_FRAME_HEADER_LENGTH),
)
})
continuations.iter().fold(base, |total, continuation| {
total.saturating_add(
u64::try_from(continuation.length)
.unwrap_or(u64::MAX)
.saturating_add(HTTP2_FRAME_HEADER_LENGTH),
)
})
}

fn update_http2_request_summary(
Expand Down Expand Up @@ -1167,10 +1166,9 @@ mod tests {
h1::Http1HeadBuffer,
h2::{
frame::{
DataFrame, HeaderField as Http2HeaderField, HeadersFlags,
HeadersFrame as Http2HeadersFrame, PriorityUpdateFrame, RstStreamFrame,
SettingsFrame as Http2SettingsFrame, StreamDependency,
UnknownFrame as Http2UnknownFrame, WindowUpdateFrame,
DataFrame, GoAwayFrame, HeaderField as Http2HeaderField, HeadersFlags,
HeadersFrame as Http2HeadersFrame, PingFrame, PriorityUpdateFrame, RstStreamFrame,
SettingsFrame as Http2SettingsFrame, StreamDependency, WindowUpdateFrame,
},
Frame as Http2Frame, FrameType as Http2FrameType,
},
Expand Down Expand Up @@ -1373,14 +1371,14 @@ mod tests {
capture.push(Http2FrameEvent {
elapsed_us: 55,
direction: Http2FrameDirection::ClientToServer,
frame: Http2Frame::Unknown(Http2UnknownFrame {
frame_type: Http2FrameType::Unknown,
type_id: 0x06,
stream_id: 0,
length: 8,
flags: 0,
payload: vec![0; 8],
}),
frame: Http2Frame::Ping(PingFrame::try_from((0, 0, [0; 8].as_slice())).unwrap()),
});
capture.push(Http2FrameEvent {
elapsed_us: 56,
direction: Http2FrameDirection::ServerToClient,
frame: Http2Frame::GoAway(
GoAwayFrame::try_from((0, 0, [0, 0, 0, 7, 0, 0, 0, 0].as_slice())).unwrap(),
),
});

let info = Http2TrackInfo::new(capture.clone(), None).unwrap();
Expand All @@ -1402,8 +1400,8 @@ mod tests {
assert_eq!(value["h2_text_hash"], "04e7eb17eb6119f9a65c4cacb32f4dea");
assert_eq!(value["sent_frames"].as_array().unwrap().len(), 6);
assert_eq!(value["sent_frames"][2]["increment"], 12_451_840);
assert_eq!(value["sent_frames"][5]["type_id"], 6);
assert_eq!(value["events"].as_array().unwrap().len(), 8);
assert_eq!(value["sent_frames"][5]["frame_type"], "Ping");
assert_eq!(value["events"].as_array().unwrap().len(), 9);
assert_eq!(value["events"][4]["direction"], "ServerToClient");
assert_eq!(value["events"][5]["frame_type"], "RstStream");
assert_eq!(value["events"][5]["error_code"]["name"], "Cancel");
Expand All @@ -1429,6 +1427,9 @@ mod tests {
assert_eq!(reset_stream["reset"], true);
assert_eq!(reset_stream["client_ended"], true);
assert_eq!(reset_stream["server_ended"], true);
assert_eq!(value["streams"].as_array().unwrap().len(), 3);
assert_eq!(value["streams"][2]["server_ended"], false);
assert_eq!(value["events"][8]["frame_type"], "GoAway");

let mut connection = ConnectionTrack::default();
connection.set_http2_capture(capture);
Expand All @@ -1449,11 +1450,18 @@ mod tests {
assert_eq!(scoped["akamai_fingerprint"], "1:65536|00|0|p,m");
assert_eq!(scoped["h2_text"], "SETTINGS:1=65536|HEADERS(stream):p,m");
assert_eq!(scoped["sent_frames"].as_array().unwrap().len(), 4);
assert_eq!(scoped["events"].as_array().unwrap().len(), 4);
assert_eq!(scoped["events"].as_array().unwrap().len(), 5);
assert_eq!(scoped["streams"].as_array().unwrap().len(), 1);
assert_eq!(scoped["streams"][0]["stream_id"], 7);
assert_eq!(scoped["streams"][0]["event_indices"], json!([1, 3]));
assert_eq!(scoped["streams"][0]["event_indices"], json!([1, 4]));
assert_eq!(scoped["streams"][0]["client_wire_bytes"], 24);

let mut parser = pingly::h2::FrameParser::default();
let promise = [0, 0, 5, 5, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0x82];
let continuation = [0, 0, 1, 9, 4, 0, 0, 0, 1, 0x84];
assert!(parser.parse(&promise).unwrap().into_frame().is_none());
let frame = parser.parse(&continuation).unwrap().into_frame().unwrap();
assert_eq!(super::http2_frame_wire_bytes(&frame), 24);
}

#[test]
Expand Down
30 changes: 19 additions & 11 deletions src/app/server/ui/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1247,13 +1247,18 @@ function renderHttp2(http2) {
]);

const frames = getFrames(http2);
const events = getHttp2Events(http2);
const streamSection = renderHttp2Streams(http2);
const frameSection = createSection(
"Client connection",
"Sent frames",
frames.length + " entries"
events.length > 0 ? "Bidirectional connection" : "Client connection",
events.length > 0 ? "All frames" : "Sent frames",
(events.length > 0 ? events.length : frames.length) + " entries"
);
if (frames.length === 0) {
if (events.length > 0) {
frameSection.append(renderHttp2EventTimeline(events, events.map(function (_, index) {
return index;
})));
} else if (frames.length === 0) {
frameSection.append(createEmptyState("No HTTP/2 frames were captured", "network"));
} else {
frameSection.append(renderFrames(frames));
Expand Down Expand Up @@ -1434,6 +1439,7 @@ function renderHttp2EventTimeline(events, eventIndices) {

const meta = create("span", "ms-auto text-secondary font-monospace small text-end");
meta.textContent = "+" + formatElapsedMicros(event.elapsed_us) +
" / " + (event.stream_id === 0 ? "connection" : "stream " + valueOr(event.stream_id, "-")) +
" / " + valueOr(event.length, 0) + " bytes";
summary.append(meta);
details.append(summary);
Expand All @@ -1457,11 +1463,13 @@ function renderHttp2EventTimeline(events, eventIndices) {
}

function http2FrameName(frame) {
if (frame.frame_type !== "Unknown") {
return valueOr(frame.frame_type, "Unknown frame");
}
return HTTP2_UNKNOWN_FRAME_NAMES.get(Number(frame.type_id)) ||
"Unknown " + formatHex(valueOr(frame.type_id, 0));
const name = frame.frame_type === "Unknown"
? HTTP2_UNKNOWN_FRAME_NAMES.get(Number(frame.type_id)) ||
"Unknown " + formatHex(valueOr(frame.type_id, 0))
: valueOr(frame.frame_type, "Unknown frame");
return name === "Ping" && (Number(frame.flags) & 0x01) !== 0
? "Ping (ACK)"
: name;
}

function formatElapsedMicros(value) {
Expand Down Expand Up @@ -2060,12 +2068,12 @@ function renderFrames(frames) {
);
summary.append(
create("span", "badge bg-secondary-lt text-secondary", padIndex(index + 1)),
create("span", "fw-semibold text-break", valueOr(frame.frame_type, "Unknown frame"))
create("span", "fw-semibold text-break", http2FrameName(frame))
);

const meta = create("span", "ms-auto text-secondary font-monospace small text-end");
const metaParts = [
"stream " + valueOr(frame.stream_id, "-"),
frame.stream_id === 0 ? "connection" : "stream " + valueOr(frame.stream_id, "-"),
valueOr(frame.length, 0) + " bytes",
];
const flags = summarizeFlags(frame.flags);
Expand Down
7 changes: 6 additions & 1 deletion src/h2/akamai.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ fn compute_fingerprint<'a>(frames: impl IntoIterator<Item = &'a Frame>) -> Strin
frame.priority.weight
);
}
Frame::RstStream(_) => {}
Frame::RstStream(_)
| Frame::PushPromise(_)
| Frame::Ping(_)
| Frame::GoAway(_)
| Frame::AltSvc(_)
| Frame::Origin(_) => {}
Frame::PriorityUpdate(_) => {}
Frame::Headers(frame) => {
if headers_count > 0 {
Expand Down
23 changes: 17 additions & 6 deletions src/h2/fingerprint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ pub struct Http2Fingerprint {
impl Http2Fingerprint {
/// Builds a fingerprint from client frames in their original wire order.
///
/// The first `HEADERS` frame selects the request stream. Supported control
/// frames are retained until, but not including, the next `HEADERS` field
/// section; `DATA` and opaque frames are omitted. See
/// The first `HEADERS` frame selects the request stream; the next ends the sample.
/// Only SETTINGS, HEADERS, WINDOW_UPDATE, PRIORITY, and PRIORITY_UPDATE contribute. See
/// [RFC 9113, Section 8.1](https://www.rfc-editor.org/rfc/rfc9113#section-8.1).
///
/// `WINDOW_UPDATE` targets follow
Expand All @@ -43,9 +42,13 @@ impl Http2Fingerprint {
}
stream_id = Some(headers.stream_id);
}
if !matches!(
if matches!(
frame,
Frame::Data(_) | Frame::RstStream(_) | Frame::Unknown(_)
Frame::Settings(_)
| Frame::Headers(_)
| Frame::WindowUpdate(_)
| Frame::Priority(_)
| Frame::PriorityUpdate(_)
) {
opening_frames.push(frame);
}
Expand Down Expand Up @@ -77,7 +80,15 @@ fn fingerprint_text(frames: &[&Frame], stream_id: u32) -> String {
let _ = write!(output, "{id}={value}");
}
}
Frame::Settings(_) | Frame::Data(_) | Frame::RstStream(_) | Frame::Unknown(_) => {}
Frame::Settings(_)
| Frame::Data(_)
| Frame::RstStream(_)
| Frame::PushPromise(_)
| Frame::Ping(_)
| Frame::GoAway(_)
| Frame::AltSvc(_)
| Frame::Origin(_)
| Frame::Unknown(_) => {}
Frame::WindowUpdate(frame) => {
push_token(&mut output);
push_target(&mut output, "WINDOW_UPDATE", frame.stream_id, stream_id);
Expand Down
Loading
Loading