flowproof 0.23.7__tar.gz → 0.23.8__tar.gz

{flowproof-0.23.7 → flowproof-0.23.8}/Cargo.lock

@@ -930,7 +930,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-adapters"
-version = "0.23.7"
+version = "0.23.8"
 dependencies = [
  "anyhow",
  "flowproof-driver",
@@ -949,7 +949,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-agent"
-version = "0.23.7"
+version = "0.23.8"
 dependencies = [
  "chrono",
  "flowproof-driver",
@@ -967,7 +967,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-cli"
-version = "0.23.7"
+version = "0.23.8"
 dependencies = [
  "ab_glyph",
  "chrono",
@@ -992,7 +992,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-driver"
-version = "0.23.7"
+version = "0.23.8"
 dependencies = [
  "calamine",
  "flowproof-trace",
@@ -1008,7 +1008,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-python"
-version = "0.23.7"
+version = "0.23.8"
 dependencies = [
  "flowproof-agent",
  "flowproof-cli",
@@ -1020,7 +1020,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-replay"
-version = "0.23.7"
+version = "0.23.8"
 dependencies = [
  "chrono",
  "flowproof-agent",
@@ -1034,7 +1034,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-trace"
-version = "0.23.7"
+version = "0.23.8"
 dependencies = [
  "jsonschema",
  "regex",

{flowproof-0.23.7 → flowproof-0.23.8}/Cargo.toml

@@ -22,7 +22,7 @@ members = ["crates/flowproof-driver", "crates/flowproof-trace", "crates/flowproo
 exclude = ["spike/windows-containment"]
 
 [workspace.package]
-version = "0.23.7"
+version = "0.23.8"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/automators-com/flowproof"

{flowproof-0.23.7 → flowproof-0.23.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowproof
-Version: 0.23.7
+Version: 0.23.8
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3

{flowproof-0.23.7 → flowproof-0.23.8}/crates/flowproof-adapters/src/web.rs

@@ -5524,9 +5524,25 @@ impl AppDriver for WebAppDriver {
         let tab = self.tab()?;
         let fields = tab
             .find_elements("input[type=password]")
-            .unwrap_or_default();
+            .map_err(|e| web_err("finding password fields", e))?;
         let mut rects = Vec::new();
         for field in fields {
+            // Hidden wizard pages still contain password inputs, but have no
+            // layout box. Only positively identified non-rendered fields may
+            // be skipped; failed visibility probes must still drop the frame.
+            let rendered = field
+                .call_js_fn(
+                    "function() { return this.getClientRects().length > 0; }",
+                    vec![],
+                    false,
+                )
+                .map_err(|e| web_err("checking password field layout", e))?
+                .value
+                .and_then(|v| v.as_bool())
+                .ok_or_else(|| DriverError::Browser("password field layout unavailable".into()))?;
+            if !rendered {
+                continue;
+            }
             let quad = field
                 .get_box_model()
                 .map_err(|e| web_err("box model of password field", e))?

flowproof-0.23.8/crates/flowproof-adapters/tests/password_recording_e2e.rs

@@ -0,0 +1,53 @@
+//! Hidden password fields must not discard otherwise safe screenshots.
+use flowproof_driver::{AppDriver, UiaSelector};
+#[test]
+fn hidden_password_inputs_do_not_drop_frames_and_visible_passwords_stay_masked() {
+    if std::env::var("FLOWPROOF_E2E").as_deref() != Ok("1") {
+        return;
+    }
+    let _guard = flowproof_adapters::SharedBrowserGuard::new();
+    let html = r#"<html><body><input type='password' value='visible-secret' style='width:200px;height:40px'><section id='later' style='display:none'><input type='password' value='hidden-secret'></section><button id='reveal' onclick="document.getElementById('later').style.display='block'">Reveal</button></body></html>"#;
+    let listener = std::net::TcpListener::bind("127.0.0.1:0").expect("fixture listener");
+    let port = listener.local_addr().expect("fixture address").port();
+    std::thread::spawn(move || {
+        use std::io::{Read, Write};
+        for mut stream in listener.incoming().flatten() {
+            let mut request = [0; 2048];
+            let _ = stream.read(&mut request);
+            let _ = write!(stream, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}", html.len(), html);
+        }
+    });
+    let mut driver = flowproof_adapters::WebAppDriver::new().expect("Chrome launches");
+    driver
+        .launch(
+            &format!("http://127.0.0.1:{port}"),
+            "",
+            std::time::Duration::from_secs(30),
+        )
+        .expect("fixture loads");
+
+    let rects = flowproof_driver::redact::resolve_rects(&mut driver, &[])
+        .expect("hidden inputs are safe to skip");
+    assert_eq!(rects.len(), 1);
+    let mut frame = driver
+        .capture()
+        .expect("screenshot captured")
+        .expect("web screenshots supported");
+    flowproof_driver::redact::apply(&mut frame, &rects);
+    let (x, y, w, h) = rects[0];
+    assert!(w > 0 && h > 0);
+    for py in y.max(0) as u32..((y.max(0) as u32 + h).min(frame.height())) {
+        for px in x.max(0) as u32..((x.max(0) as u32 + w).min(frame.width())) {
+            assert_eq!(frame.get_pixel(px, py).0, [0, 0, 0, 255]);
+        }
+    }
+    driver
+        .invoke(&UiaSelector::css("#reveal"))
+        .expect("reveal password field");
+    assert_eq!(
+        flowproof_driver::redact::resolve_rects(&mut driver, &[])
+            .expect("visible password rectangles resolved")
+            .len(),
+        2
+    );
+}

{flowproof-0.23.7 → flowproof-0.23.8}/crates/flowproof-cli/src/agent_flow.rs

@@ -1721,7 +1721,12 @@ fn require_progress(run: &AgentRun, cassette: &Cassette, plan: &Plan) -> Result<
 /// the proxy - not that all of them did. Reporting the observation and
 /// letting the reader judge is the honest shape, and the same reason the
 /// zero-capture guard names causes as possibilities rather than facts.
-pub fn cmd_doctor_agent(command: &str, timeout_secs: u64, prompt: &str) -> Result<u8, String> {
+pub fn cmd_doctor_agent(
+    command: &str,
+    timeout_secs: u64,
+    prompt: &str,
+    json: bool,
+) -> Result<u8, String> {
     use flowproof_trace::cassette::{Cassette, Message, Turn, TurnRequest, TurnResponse};
 
     // One canned turn. Anything the agent sends is answered from this, so no
@@ -1752,11 +1757,13 @@ pub fn cmd_doctor_agent(command: &str, timeout_secs: u64, prompt: &str) -> Resul
         ..Default::default()
     };
 
+    let mut report = crate::doctor::DoctorReport::new("agent");
+
     let proxy = AgentProxy::start(probe, Mocks::new(), 0)
         .map_err(|e| format!("starting the probe proxy: {e}"))?;
     let base = proxy.base_url();
-    println!("proxy listening on {base}");
-    println!("running: {command}");
+    report.note(json, "ok", "proxy", format!("proxy listening on {base}"));
+    report.note(json, "ok", "command", format!("running: {command}"));
 
     let mut env = BTreeMap::new();
     env.insert(PROMPT_VAR.to_string(), prompt.to_string());
@@ -1768,61 +1775,118 @@ pub fn cmd_doctor_agent(command: &str, timeout_secs: u64, prompt: &str) -> Resul
     let arrived = log.served + usize::from(log.divergence.is_some());
     drop(log);
 
-    println!();
-    println!("model requests that reached the proxy: {arrived}");
+    if !json {
+        println!();
+    }
+    report.note(
+        json,
+        if arrived > 0 { "ok" } else { "fail" },
+        "traffic",
+        format!("model requests that reached the proxy: {arrived}"),
+    );
     if run.timed_out {
-        println!(
-            "the agent was still running after {timeout_secs}s and was stopped. That is an \
-             observation, not a wiring failure: an agent waiting for a useful reply will hang \
-             against a canned one."
+        report.note(
+            json,
+            "warn",
+            "timeout",
+            format!(
+                "the agent was still running after {timeout_secs}s and was stopped. That is an \
+                 observation, not a wiring failure: an agent waiting for a useful reply will hang \
+                 against a canned one."
+            ),
         );
         // Found while testing this command: the deadline kills the process
         // flowproof started, but a GRANDCHILD holding the inherited stdout
         // pipe keeps the read blocking, so the wall-clock wait can exceed
         // the timeout by a lot. Say so rather than let it look like a hang
         // with no explanation.
-        println!(
-            "  (if this took much longer than {timeout_secs}s, the agent spawned a child that \
-             outlived it and kept the output pipe open. flowproof stops the process it started, \
-             not the tree.)"
+        report.note(
+            json,
+            "warn",
+            "timeout",
+            format!(
+                "(if this took much longer than {timeout_secs}s, the agent spawned a child that \
+                 outlived it and kept the output pipe open. flowproof stops the process it \
+                 started, not the tree.)"
+            ),
         );
     } else {
-        println!(
-            "the agent exited {}",
-            run.exit_code
-                .map(|c| c.to_string())
-                .unwrap_or_else(|| "with no code".into())
+        report.note(
+            json,
+            "ok",
+            "exit",
+            format!(
+                "the agent exited {}",
+                run.exit_code
+                    .map(|c| c.to_string())
+                    .unwrap_or_else(|| "with no code".into())
+            ),
         );
     }
 
     if arrived == 0 {
-        println!();
-        println!("NOTHING reached the proxy. The client is not honouring the base URL flowproof");
-        println!("injected (OPENAI_BASE_URL, OPENAI_API_BASE, OPENAI_BASE, ANTHROPIC_BASE_URL,");
-        println!("FLOWPROOF_LLM_PROXY). If it reads a different variable, or builds its base URL");
-        println!("from a config object, map it in `agent.env`:");
-        println!();
-        println!("    env:");
-        println!("      YOUR_VARIABLE: \"${{flowproof.proxy_url}}\"        # includes /v1");
-        println!(
-            "      OR:            \"${{flowproof.proxy_url_no_v1}}\"  # client appends its own"
+        if !json {
+            println!();
+            println!(
+                "NOTHING reached the proxy. The client is not honouring the base URL flowproof"
+            );
+            println!(
+                "injected (OPENAI_BASE_URL, OPENAI_API_BASE, OPENAI_BASE, ANTHROPIC_BASE_URL,"
+            );
+            println!(
+                "FLOWPROOF_LLM_PROXY). If it reads a different variable, or builds its base URL"
+            );
+            println!("from a config object, map it in `agent.env`:");
+            println!();
+            println!("    env:");
+            println!("      YOUR_VARIABLE: \"${{flowproof.proxy_url}}\"        # includes /v1");
+            println!(
+                "      OR:            \"${{flowproof.proxy_url_no_v1}}\"  # client appends its own"
+            );
+            println!();
+            println!("If the model call happens in a CHILD process, check that it inherits the");
+            println!("environment - that is the usual cause when the command itself looks right.");
+        }
+        report.note(
+            json,
+            "fail",
+            "wiring",
+            "NOTHING reached the proxy. The client is not honouring the base URL flowproof \
+             injected (OPENAI_BASE_URL, OPENAI_API_BASE, OPENAI_BASE, ANTHROPIC_BASE_URL, \
+             FLOWPROOF_LLM_PROXY); map it in `agent.env` via `${{flowproof.proxy_url}}` or \
+             `${{flowproof.proxy_url_no_v1}}`, and check a child-process model call inherits the \
+             environment.",
         );
-        println!();
-        println!("If the model call happens in a CHILD process, check that it inherits the");
-        println!("environment - that is the usual cause when the command itself looks right.");
         if !run.stderr.trim().is_empty() {
-            println!();
-            println!("stderr:\n{}", run.stderr.trim());
+            if !json {
+                println!();
+                println!("stderr:\n{}", run.stderr.trim());
+            }
+            report.note(json, "warn", "stderr", run.stderr.trim());
         }
+        report.emit(json)?;
         return Ok(crate::EXIT_FAIL);
     }
 
-    println!();
-    println!("At least one client reached the proxy, so recording can capture that traffic.");
-    println!("This does NOT prove every model call goes through flowproof: an agent with more");
-    println!("than one client can reach the proxy with one and the real provider with another.");
-    println!("`record` is the check that settles it - it fails and writes no trace if nothing");
-    println!("is captured.");
+    if !json {
+        println!();
+        println!("At least one client reached the proxy, so recording can capture that traffic.");
+        println!("This does NOT prove every model call goes through flowproof: an agent with more");
+        println!(
+            "than one client can reach the proxy with one and the real provider with another."
+        );
+        println!("`record` is the check that settles it - it fails and writes no trace if nothing");
+        println!("is captured.");
+    }
+    report.note(
+        json,
+        "ok",
+        "verdict",
+        "At least one client reached the proxy, so recording can capture that traffic. This does \
+         NOT prove every model call goes through flowproof.",
+    );
+    report.pass = true;
+    report.emit(json)?;
     Ok(crate::EXIT_PASS)
 }