Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(cua-driver): share the DevTools /json/version probe across browser adapters (#6098)

injaneity61efedd41149
diff --git a/libs/cua-driver/rust/crates/cua-driver-core/src/browser/adapter_support.rs b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/adapter_support.rs
index 8af59a15f6..cc378d2cc5 100644
--- a/libs/cua-driver/rust/crates/cua-driver-core/src/browser/adapter_support.rs
+++ b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/adapter_support.rs
@@ -3,11 +3,14 @@
//!
//! Every platform adapter reads Chromium's `DevToolsActivePort` file,
//! re-proves that a discovered websocket stays on the attested loopback
-//! listener, recognizes Firefox, and keeps one visible browser cursor per
-//! native window. Those semantics are platform-independent, so they live here
+//! listener, reads the `/json/version` discovery surface, recognizes Firefox,
+//! and keeps one visible browser cursor per native window. Those semantics are platform-independent, so they live here
//! and the adapters stay thin.
use std::collections::HashMap;
+use std::time::Duration;
+
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
/// Parse Chromium's `DevToolsActivePort` file.
///
@@ -47,6 +50,55 @@ pub fn loopback_websocket_port(url: &str) -> Option<u16> {
})
}
+/// Read `webSocketDebuggerUrl` from `GET /json/version` on `127.0.0.1:<port>`.
+///
+/// Uses a raw HTTP/1.1 request under a 2 second timeout and refuses responses
+/// over 256 KiB. Returns `None` on any failure. The URL is returned exactly as
+/// the browser reported it: callers must re-prove it against the attested
+/// listener port (and canonicalize it if they need to) before trusting it.
+pub async fn fetch_json_version_ws_url(port: u16) -> Option<String> {
+ tokio::time::timeout(Duration::from_secs(2), async move {
+ let mut stream = tokio::net::TcpStream::connect(("127.0.0.1", port))
+ .await
+ .ok()?;
+ let request = format!(
+ "GET /json/version HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n"
+ );
+ stream.write_all(request.as_bytes()).await.ok()?;
+ let mut bytes = Vec::new();
+ let mut chunk = [0u8; 4096];
+ loop {
+ let read = stream.read(&mut chunk).await.ok()?;
+ if read == 0 {
+ break;
+ }
+ bytes.extend_from_slice(&chunk[..read]);
+ if bytes.len() > 256 * 1024 {
+ return None;
+ }
+ if let Some(header_end) = bytes.windows(4).position(|part| part == b"\r\n\r\n") {
+ let headers = String::from_utf8_lossy(&bytes[..header_end]);
+ if let Some(length) = headers.lines().find_map(|line| {
+ let (name, value) = line.split_once(':')?;
+ name.eq_ignore_ascii_case("content-length")
+ .then(|| value.trim().parse::<usize>().ok())
+ .flatten()
+ }) {
+ if bytes.len() >= header_end + 4 + length {
+ break;
+ }
+ }
+ }
+ }
+ let body_start = bytes.windows(4).position(|part| part == b"\r\n\r\n")? + 4;
+ let value: serde_json::Value = serde_json::from_slice(&bytes[body_start..]).ok()?;
+ Some(value.get("webSocketDebuggerUrl")?.as_str()?.to_owned())
+ })
+ .await
+ .ok()
+ .flatten()
+}
+
/// Whether a process identity names Firefox.
///
/// `identity` is whatever the adapter has for the process: an executable
@@ -117,6 +169,7 @@ impl BrowserCursorTracker {
#[cfg(test)]
mod tests {
use super::*;
+ use tokio::io::{AsyncReadExt, AsyncWriteExt};
#[test]
fn active_port_parser_requires_one_exact_browser_path() {
@@ -216,4 +269,129 @@ mod tests {
"an active tab in another native window must not hide this window"
);
}
+
+ /// Serve one canned response per accepted connection and report each
+ /// request. `hold_open` keeps the socket open after the response.
+ async fn serve_once(
+ response: Vec<u8>,
+ hold_open: bool,
+ ) -> (u16, tokio::sync::oneshot::Receiver<String>) {
+ let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+ let port = listener.local_addr().unwrap().port();
+ let (tx, rx) = tokio::sync::oneshot::channel();
+ tokio::spawn(async move {
+ let (mut stream, _) = listener.accept().await.unwrap();
+ let mut request = vec![0u8; 4096];
+ let read = stream.read(&mut request).await.unwrap();
+ let _ = tx.send(String::from_utf8_lossy(&request[..read]).into_owned());
+ let _ = stream.write_all(&response).await;
+ if hold_open {
+ tokio::time::sleep(Duration::from_secs(30)).await;
+ }
+ });
+ (port, rx)
+ }
+
+ fn http_ok(body: &str, with_length: bool) -> Vec<u8> {
+ let length = if with_length {
+ format!("Content-Length: {}\r\n", body.len())
+ } else {
+ String::new()
+ };
+ format!("HTTP/1.1 200 OK\r\n{length}Connection: close\r\n\r\n{body}").into_bytes()
+ }
+
+ const CAP: usize = 256 * 1024;
+
+ /// A valid response of exactly `total` bytes, headers included.
+ fn response_of_total_size(total: usize) -> Vec<u8> {
+ let build = |pad: usize| {
+ let body = format!(
+ "{{\"webSocketDebuggerUrl\":\"ws://127.0.0.1:1/devtools/browser/id\",\"pad\":\"{}\"}}",
+ "a".repeat(pad)
+ );
+ http_ok(&body, true)
+ };
+ let base = build(0).len();
+ // The Content-Length digit count can change with the pad; solve by retry.
+ for pad in total.saturating_sub(base + 8)..=total {
+ let bytes = build(pad);
+ if bytes.len() == total {
+ return bytes;
+ }
+ }
+ panic!("no response of {total} bytes");
+ }
+
+ #[tokio::test]
+ async fn json_version_probe_sends_the_exact_request_and_returns_the_raw_url() {
+ let body = r#"{"webSocketDebuggerUrl":"ws://localhost:1/devtools/browser/id"}"#;
+ let (port, request) = serve_once(http_ok(body, true), true).await;
+ let url = fetch_json_version_ws_url(port).await;
+ assert_eq!(
+ request.await.unwrap(),
+ format!(
+ "GET /json/version HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n"
+ )
+ );
+ // Raw URL: neither host nor port is canonicalised or checked here, and
+ // the open socket proves the read stopped at Content-Length.
+ assert_eq!(url.as_deref(), Some("ws://localhost:1/devtools/browser/id"));
+ }
+
+ #[tokio::test]
+ async fn json_version_probe_reads_to_eof_without_content_length() {
+ let body = r#"{"webSocketDebuggerUrl":"ws://127.0.0.1:1/devtools/browser/id"}"#;
+ let (port, _) = serve_once(http_ok(body, false), false).await;
+ assert_eq!(
+ fetch_json_version_ws_url(port).await.as_deref(),
+ Some("ws://127.0.0.1:1/devtools/browser/id")
+ );
+ }
+
+ #[tokio::test]
+ async fn json_version_probe_refuses_oversized_missing_or_malformed_bodies() {
+ let oversized = format!("{{\"pad\":\"{}\"}}", "a".repeat(CAP));
+ for body in [
+ oversized.as_str(),
+ "{}",
+ r#"{"webSocketDebuggerUrl":7}"#,
+ "not json",
+ ] {
+ let (port, _) = serve_once(http_ok(body, true), false).await;
+ assert_eq!(fetch_json_version_ws_url(port).await, None, "{body:.40}");
+ }
+ let closed = {
+ let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+ listener.local_addr().unwrap().port()
+ };
+ assert_eq!(fetch_json_version_ws_url(closed).await, None);
+ }
+
+ #[tokio::test]
+ async fn json_version_probe_cap_boundary_is_exactly_256_kib() {
+ let at_cap = response_of_total_size(CAP);
+ assert_eq!(at_cap.len(), CAP);
+ let (port, _) = serve_once(at_cap, false).await;
+ assert_eq!(
+ fetch_json_version_ws_url(port).await.as_deref(),
+ Some("ws://127.0.0.1:1/devtools/browser/id")
+ );
+
+ let over_cap = response_of_total_size(CAP + 1);
+ assert_eq!(over_cap.len(), CAP + 1);
+ let (port, _) = serve_once(over_cap, false).await;
+ assert_eq!(fetch_json_version_ws_url(port).await, None);
+ }
+
+ #[tokio::test]
+ async fn json_version_probe_times_out_after_two_seconds() {
+ let (port, _) = serve_once(Vec::new(), true).await;
+ let started = std::time::Instant::now();
+ let url = tokio::time::timeout(Duration::from_secs(5), fetch_json_version_ws_url(port))
+ .await
+ .expect("probe must give up on its own timeout");
+ assert_eq!(url, None);
+ assert!(started.elapsed() >= Duration::from_secs(2));
+ }
}
diff --git a/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rs b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rs
index 070d6c0734..ce76d298ba 100644
--- a/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rs
+++ b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rs
@@ -59,7 +59,8 @@ pub mod types;
mod v2_tests;
pub use adapter_support::{
- is_firefox, loopback_websocket_port, parse_devtools_active_port, BrowserCursorTracker,
+ fetch_json_version_ws_url, is_firefox, loopback_websocket_port, parse_devtools_active_port,
+ BrowserCursorTracker,
};
pub use engine::BrowserEngine;
pub use platform::{
diff --git a/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rs b/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rs
index 8e14a63188..a7261a726b 100644
--- a/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rs
+++ b/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rs
@@ -19,10 +19,9 @@ use cua_driver_core::browser::types::{
NativeOwnershipProof, NativeWindowInfo, OwnedEndpoint, ProcessFingerprint, Rect,
};
use cua_driver_core::browser::{
- existing_profile_setup_descriptor, is_firefox, loopback_websocket_port,
- parse_devtools_active_port, BrowserCursorTracker,
+ existing_profile_setup_descriptor, fetch_json_version_ws_url, is_firefox,
+ loopback_websocket_port, parse_devtools_active_port, BrowserCursorTracker,
};
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
pub struct LinuxBrowserPlatform {
cursor_registry: Arc<cursor_overlay::CursorRegistry>,
@@ -460,47 +459,8 @@ fn process_identity(pid: i64) -> Result<(u64, Option<String>), BrowserRefusal> {
}
async fn browser_websocket_url(port: u16) -> Option<String> {
- tokio::time::timeout(Duration::from_secs(2), async move {
- let mut stream = tokio::net::TcpStream::connect(("127.0.0.1", port))
- .await
- .ok()?;
- let request = format!(
- "GET /json/version HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n"
- );
- stream.write_all(request.as_bytes()).await.ok()?;
- let mut bytes = Vec::new();
- let mut chunk = [0u8; 4096];
- loop {
- let read = stream.read(&mut chunk).await.ok()?;
- if read == 0 {
- break;
- }
- bytes.extend_from_slice(&chunk[..read]);
- if bytes.len() > 256 * 1024 {
- return None;
- }
- if let Some(header_end) = bytes.windows(4).position(|part| part == b"\r\n\r\n") {
- let headers = String::from_utf8_lossy(&bytes[..header_end]);
- if let Some(length) = headers.lines().find_map(|line| {
- let (name, value) = line.split_once(':')?;
- name.eq_ignore_ascii_case("content-length")
- .then(|| value.trim().parse::<usize>().ok())
- .flatten()
- }) {
- if bytes.len() >= header_end + 4 + length {
- break;
- }
- }
- }
- }
- let body_start = bytes.windows(4).position(|part| part == b"\r\n\r\n")? + 4;
- let value: serde_json::Value = serde_json::from_slice(&bytes[body_start..]).ok()?;
- let url = value.get("webSocketDebuggerUrl")?.as_str()?.to_owned();
- (loopback_websocket_port(&url) == Some(port)).then_some(url)
- })
- .await
- .ok()
- .flatten()
+ let url = fetch_json_version_ws_url(port).await?;
+ (loopback_websocket_port(&url) == Some(port)).then_some(url)
}
#[async_trait]
diff --git a/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rs b/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rs
index 0d5128b2b6..c31518f504 100644
--- a/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rs
+++ b/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rs
@@ -19,11 +19,10 @@ use cua_driver_core::browser::types::{
NativeOwnershipProof, NativeWindowInfo, OwnedEndpoint, ProcessFingerprint, Rect,
};
use cua_driver_core::browser::{
- existing_profile_setup_descriptor, is_firefox, loopback_websocket_port,
- parse_devtools_active_port, BrowserCursorTracker,
+ existing_profile_setup_descriptor, fetch_json_version_ws_url, is_firefox,
+ loopback_websocket_port, parse_devtools_active_port, BrowserCursorTracker,
};
use serde::Serialize;
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
const CONSENT_CLEANUP_PASSES: usize = 20;
@@ -817,47 +816,8 @@ async fn active_port_endpoint_with_relative_fallback(
}
async fn browser_websocket_url(port: u16) -> Option<String> {
- tokio::time::timeout(Duration::from_secs(2), async move {
- let mut stream = tokio::net::TcpStream::connect(("127.0.0.1", port))
- .await
- .ok()?;
- let request = format!(
- "GET /json/version HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n"
- );
- stream.write_all(request.as_bytes()).await.ok()?;
- let mut bytes = Vec::new();
- let mut chunk = [0u8; 4096];
- loop {
- let read = stream.read(&mut chunk).await.ok()?;
- if read == 0 {
- break;
- }
- bytes.extend_from_slice(&chunk[..read]);
- if bytes.len() > 256 * 1024 {
- return None;
- }
- if let Some(header_end) = bytes.windows(4).position(|part| part == b"\r\n\r\n") {
- let headers = String::from_utf8_lossy(&bytes[..header_end]);
- if let Some(length) = headers.lines().find_map(|line| {
- let (name, value) = line.split_once(':')?;
- name.eq_ignore_ascii_case("content-length")
- .then(|| value.trim().parse::<usize>().ok())
- .flatten()
- }) {
- if bytes.len() >= header_end + 4 + length {
- break;
- }
- }
- }
- }
- let body_start = bytes.windows(4).position(|part| part == b"\r\n\r\n")? + 4;
- let value: serde_json::Value = serde_json::from_slice(&bytes[body_start..]).ok()?;
- let url = value.get("webSocketDebuggerUrl")?.as_str()?.to_owned();
- (loopback_websocket_port(&url) == Some(port)).then_some(url)
- })
- .await
- .ok()
- .flatten()
+ let url = fetch_json_version_ws_url(port).await?;
+ (loopback_websocket_port(&url) == Some(port)).then_some(url)
}
#[async_trait]
@@ -1508,6 +1468,7 @@ impl BrowserPlatform for MacOsBrowserPlatform {
#[cfg(test)]
mod tests {
use super::*;
+ use tokio::io::{AsyncReadExt, AsyncWriteExt};
fn consent_surface(window_id: u32) -> ConsentSurfaceEvidence {
ConsentSurfaceEvidence {
diff --git a/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rs b/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rs
index 611545c9a2..68233ebafe 100644
--- a/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rs
+++ b/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rs
@@ -22,9 +22,9 @@ use cua_driver_core::browser::types::{
NativeOwnershipProof, NativeWindowInfo, OwnedEndpoint, ProcessFingerprint, Rect,
};
use cua_driver_core::browser::{
- existing_profile_setup_descriptor, is_firefox, parse_devtools_active_port, BrowserCursorTracker,
+ existing_profile_setup_descriptor, fetch_json_version_ws_url, is_firefox,
+ parse_devtools_active_port, BrowserCursorTracker,
};
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
use crate::browser_installation_path::{
plain_windows_path, resolve_installation, InstallationEntry, InstallationFs,
@@ -1581,47 +1581,8 @@ async fn unfiltered_loopback_ports_for_exact_pid(pid: u32) -> Result<Vec<u16>, B
}
async fn browser_websocket_url(port: u16) -> Option<String> {
- tokio::time::timeout(Duration::from_secs(2), async move {
- let mut stream = tokio::net::TcpStream::connect(("127.0.0.1", port))
- .await
- .ok()?;
- let request = format!(
- "GET /json/version HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n"
- );
- stream.write_all(request.as_bytes()).await.ok()?;
- let mut bytes = Vec::new();
- let mut chunk = [0u8; 4096];
- loop {
- let read = stream.read(&mut chunk).await.ok()?;
- if read == 0 {
- break;
- }
- bytes.extend_from_slice(&chunk[..read]);
- if bytes.len() > 256 * 1024 {
- return None;
- }
- if let Some(header_end) = bytes.windows(4).position(|part| part == b"\r\n\r\n") {
- let headers = String::from_utf8_lossy(&bytes[..header_end]);
- if let Some(length) = headers.lines().find_map(|line| {
- let (name, value) = line.split_once(':')?;
- name.eq_ignore_ascii_case("content-length")
- .then(|| value.trim().parse::<usize>().ok())
- .flatten()
- }) {
- if bytes.len() >= header_end + 4 + length {
- break;
- }
- }
- }
- }
- let body_start = bytes.windows(4).position(|part| part == b"\r\n\r\n")? + 4;
- let value: serde_json::Value = serde_json::from_slice(&bytes[body_start..]).ok()?;
- let url = value.get("webSocketDebuggerUrl")?.as_str()?;
- canonical_discovered_websocket_url(url, port)
- })
- .await
- .ok()
- .flatten()
+ let url = fetch_json_version_ws_url(port).await?;
+ canonical_discovered_websocket_url(&url, port)
}
fn select_provisional_setup_port(