Skip to content

Commit 7464072

Browse files
acarl005oz-agent
andcommitted
fix: update rmcp to resolve CVE-2026-42559
Co-Authored-By: Oz <oz-agent@warp.dev>
1 parent c68c2a0 commit 7464072

9 files changed

Lines changed: 469 additions & 138 deletions

File tree

Cargo.lock

Lines changed: 118 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ reqwest = { version = "0.12.28", default-features = false, features = [
222222
"json",
223223
"macos-system-configuration",
224224
"rustls-tls-native-roots-no-provider",
225+
"rustls-tls-webpki-roots-no-provider",
225226
"stream",
226227
"system-proxy",
227228
] }
@@ -378,7 +379,7 @@ typed-path = "0.10.0"
378379
streaming-iterator = "0.1.0"
379380
derivative = "2.2.0"
380381
parquet = { version = "55.0.0", features = ["arrow"] }
381-
rmcp = { git = "https://github.com/warpdotdev/rmcp.git", rev = "c0f65dc441af7d714b9c453ac5e7ef641451abe3" }
382+
rmcp = { git = "https://github.com/warpdotdev/rmcp.git", rev = "321ab14f67da734a8e0cfa0bfcdee1690663d9dc" }
382383

383384
[profile.release]
384385
# Use line-tables-only (debug = 1) rather than full debuginfo (debug = 2 /

app/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,10 @@ aws-types = "1"
299299

300300
rmcp = { workspace = true, features = [
301301
"auth",
302-
"transport-streamable-http-client-reqwest",
303-
"transport-sse-client-reqwest",
302+
"transport-streamable-http-client",
304303
"transport-child-process",
305304
] }
305+
sse-stream = "0.2"
306306
notify-debouncer-full.workspace = true
307307
rquickjs = { workspace = true, optional = true }
308308
rustls.workspace = true

app/src/ai/blocklist/action_model/execute/call_mcp_tool.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ impl CallMCPToolExecutor {
141141
ActionExecution::new_async(
142142
async move {
143143
reconnecting_peer
144-
.call_tool(rmcp::model::CallToolRequestParam {
145-
name: name_owned_inner.into(),
146-
arguments: Some(arguments),
147-
})
144+
.call_tool(rmcp::model::CallToolRequestParams::new(
145+
name_owned_inner,
146+
Some(arguments),
147+
))
148148
.await
149149
},
150150
move |res, ctx| handle_call_tool_result(res, server_output_id, name_clone, ctx),

app/src/ai/blocklist/action_model/execute/read_mcp_resource.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl ReadMCPResourceExecutor {
128128
ActionExecution::new_async(
129129
async move {
130130
reconnecting_peer
131-
.read_resource(rmcp::model::ReadResourceRequestParam { uri })
131+
.read_resource(rmcp::model::ReadResourceRequestParams::new(uri))
132132
.await
133133
},
134134
|res, _ctx| handle_read_resource_result(res),

0 commit comments

Comments
 (0)