Skip to content

Commit 3420929

Browse files
committed
fix(gemini): resolve model from 1.19, guard 10th varint byte, and bound recursion depth
1 parent 1935e0e commit 3420929

2 files changed

Lines changed: 79 additions & 37 deletions

File tree

‎rust/adapters/gemini/src/loader.rs‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,33 @@ mod tests {
8585
.execute("CREATE TABLE gen_metadata (idx INTEGER PRIMARY KEY, data BLOB);")
8686
.unwrap();
8787

88-
// 1.4: tokens submessage (1.4.2 = 100, 1.4.3 = 50, 1.4.5 = 20, 1.4.9 = 10)
88+
// 1.4: tokens submessage (1.4.2 = 1000, 1.4.3 = 200, 1.4.5 = 500, 1.4.9 = 50)
8989
let tokens_bytes = vec![
90-
0x10, 100, // 2: varint 100
91-
0x18, 50, // 3: varint 50
92-
0x28, 20, // 5: varint 20
93-
0x48, 10, // 9: varint 10
90+
0x10, 0xE8, 0x07, // 2: varint 1000
91+
0x18, 0xC8, 0x01, // 3: varint 200
92+
0x28, 0xF4, 0x03, // 5: varint 500
93+
0x48, 50, // 9: varint 50
9494
];
9595
// 1.9.4.1 = 1779000000 (0x6A0BB9C0 -> varint: C0 B3 AF D0 06)
9696
let ts_inner = vec![0x08, 0xC0, 0xB3, 0xAF, 0xD0, 0x06];
9797
let ts_field9 = vec![0x22, ts_inner.len() as u8];
98+
let model_str = b"gemini-2.5-flash";
99+
98100
let mut field1_payload = Vec::new();
99-
field1_payload.push(0x22); // tag for 1.4
101+
// 1.4: ModelUsageStats
102+
field1_payload.push(0x22);
100103
field1_payload.push(tokens_bytes.len() as u8);
101104
field1_payload.extend_from_slice(&tokens_bytes);
102-
field1_payload.push(0x4A); // tag for 1.9
105+
// 1.9: Timestamp container
106+
field1_payload.push(0x4A);
103107
field1_payload.push((ts_field9.len() + ts_inner.len()) as u8);
104108
field1_payload.extend_from_slice(&ts_field9);
105109
field1_payload.extend_from_slice(&ts_inner);
110+
// 1.19: response_model string
111+
field1_payload.push(0x9A); // (19 << 3) | 2 = 154 = 0x9A, 0x01 (varint 154)
112+
field1_payload.push(0x01);
113+
field1_payload.push(model_str.len() as u8);
114+
field1_payload.extend_from_slice(model_str);
106115

107116
let mut blob = Vec::new();
108117
blob.push(0x0A); // tag for 1
@@ -124,9 +133,11 @@ mod tests {
124133

125134
assert_eq!(entries.len(), 1);
126135
assert_eq!(entries[0].session_id.as_ref(), "session-db");
127-
assert_eq!(entries[0].data.message.usage.input_tokens, 100);
128-
assert_eq!(entries[0].data.message.usage.output_tokens, 50);
129-
assert_eq!(entries[0].data.message.usage.cache_read_input_tokens, 20);
130-
assert_eq!(entries[0].extra_total_tokens, 10);
136+
assert_eq!(entries[0].model.as_deref(), Some("gemini-2.5-flash"));
137+
assert_eq!(entries[0].data.message.usage.input_tokens, 1000);
138+
assert_eq!(entries[0].data.message.usage.output_tokens, 200);
139+
assert_eq!(entries[0].data.message.usage.cache_read_input_tokens, 500);
140+
assert_eq!(entries[0].extra_total_tokens, 50);
141+
assert!(entries[0].cost > 0.0);
131142
}
132143
}

‎rust/adapters/gemini/src/parser.rs‎

Lines changed: 57 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -244,21 +244,32 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Vec<GeminiUsageEvent>> {
244244
}
245245
let parsed = parse_antigravity_protobuf(&blob);
246246
let model = parsed
247-
.get("1.3")
248-
.map(|value| value.to_string())
247+
.strings
248+
.get("1.19")
249+
.or_else(|| parsed.strings.get("1.21"))
250+
.or_else(|| parsed.strings.get("1.3"))
251+
.cloned()
249252
.unwrap_or_else(|| "gemini-internal-model".to_string());
250-
let input_tokens = parsed.get("1.4.2").copied().unwrap_or(0);
251-
let output_tokens = parsed.get("1.4.3").copied().unwrap_or(0);
252-
let cache_read_tokens = parsed.get("1.4.5").copied().unwrap_or(0);
253-
let reasoning_tokens = parsed.get("1.4.9").copied().unwrap_or(0);
254-
let visible_tokens = parsed.get("1.4.10").copied().unwrap_or(0);
255-
let timestamp = parsed
256-
.get("1.9.4.1")
253+
let input_tokens = parsed.numbers.get("1.4.2").copied().unwrap_or(0);
254+
let output_tokens = parsed.numbers.get("1.4.3").copied().unwrap_or(0);
255+
let cache_read_tokens = parsed.numbers.get("1.4.5").copied().unwrap_or(0);
256+
let reasoning_tokens = parsed.numbers.get("1.4.9").copied().unwrap_or(0);
257+
let visible_tokens = parsed.numbers.get("1.4.10").copied().unwrap_or(0);
258+
let timestamp_seconds = parsed.numbers.get("1.9.4.1").copied();
259+
let timestamp_nanos = parsed
260+
.numbers
261+
.get("1.9.4.2")
257262
.copied()
263+
.unwrap_or(0)
264+
.min(999_999_999);
265+
let timestamp = timestamp_seconds
258266
.and_then(|value| i64::try_from(value).ok())
259-
.and_then(|ms| {
260-
if ms > 0 {
261-
Some(TimestampMs::from_millis(ms * 1000))
267+
.and_then(|secs| {
268+
if secs > 0 {
269+
let ms = secs
270+
.saturating_mul(1000)
271+
.saturating_add((timestamp_nanos / 1_000_000) as i64);
272+
Some(TimestampMs::from_millis(ms))
262273
} else {
263274
None
264275
}
@@ -294,13 +305,29 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Vec<GeminiUsageEvent>> {
294305
Ok(events)
295306
}
296307

297-
fn parse_antigravity_protobuf(blob: &[u8]) -> HashMap<String, u64> {
298-
let mut out = HashMap::new();
299-
parse_antigravity_protobuf_fields(blob, &mut out, "");
308+
const MAX_PROTOBUF_DEPTH: usize = 16;
309+
310+
#[derive(Default)]
311+
struct AntigravityProtobuf {
312+
numbers: HashMap<String, u64>,
313+
strings: HashMap<String, String>,
314+
}
315+
316+
fn parse_antigravity_protobuf(blob: &[u8]) -> AntigravityProtobuf {
317+
let mut out = AntigravityProtobuf::default();
318+
parse_antigravity_protobuf_fields(blob, &mut out, "", 0);
300319
out
301320
}
302321

303-
fn parse_antigravity_protobuf_fields(blob: &[u8], out: &mut HashMap<String, u64>, prefix: &str) {
322+
fn parse_antigravity_protobuf_fields(
323+
blob: &[u8],
324+
out: &mut AntigravityProtobuf,
325+
prefix: &str,
326+
depth: usize,
327+
) {
328+
if depth >= MAX_PROTOBUF_DEPTH {
329+
return;
330+
}
304331
let mut cursor = 0usize;
305332
while cursor < blob.len() {
306333
let Some((tag, next)) = read_varint(blob, cursor) else {
@@ -320,7 +347,7 @@ fn parse_antigravity_protobuf_fields(blob: &[u8], out: &mut HashMap<String, u64>
320347
break;
321348
};
322349
cursor = next;
323-
out.insert(path, value);
350+
out.numbers.insert(path, value);
324351
}
325352
2 => {
326353
let Some((len, next)) = read_varint(blob, cursor) else {
@@ -335,15 +362,15 @@ fn parse_antigravity_protobuf_fields(blob: &[u8], out: &mut HashMap<String, u64>
335362
break;
336363
};
337364
let payload = &blob[cursor..end];
338-
let mut nested = HashMap::new();
339-
parse_antigravity_protobuf_fields(payload, &mut nested, &path);
340-
if nested.is_empty() {
341-
out.insert(path, 0);
342-
} else {
343-
for (nested_path, value) in nested {
344-
out.insert(nested_path, value);
345-
}
365+
if let Ok(text) = std::str::from_utf8(payload)
366+
&& !text.is_empty()
367+
&& text
368+
.chars()
369+
.all(|c| !c.is_control() || c == '\n' || c == '\t')
370+
{
371+
out.strings.insert(path.clone(), text.to_string());
346372
}
373+
parse_antigravity_protobuf_fields(payload, out, &path, depth + 1);
347374
cursor = end;
348375
}
349376
1 => cursor += 8,
@@ -362,7 +389,11 @@ fn read_varint(blob: &[u8], mut offset: usize) -> Option<(u64, usize)> {
362389
}
363390
let byte = blob[offset];
364391
offset += 1;
365-
value |= u64::from(byte & 0x7F) << shift;
392+
let payload = byte & 0x7F;
393+
if shift == 63 && payload > 1 {
394+
return None;
395+
}
396+
value |= u64::from(payload) << shift;
366397
if byte & 0x80 == 0 {
367398
return Some((value, offset));
368399
}

0 commit comments

Comments
 (0)