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
5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rmcp = { version = "0.8.0", features = [
"transport-streamable-http-server",
] }
percent-encoding = "2.3"
reqwest = { version = "0.12", features = ["json", "blocking"] }
reqwest = { version = "0.12", features = ["json"] }
tempfile = "3"
tokio = { version = "1.43", features = ["full"] }
log = "0.4"
Expand All @@ -30,3 +30,6 @@ terminal_size = "0.4.3"
url = "2.5.8"
axum = { version = "0.8.8", features = ["tokio"] }
subtle = "2.6.1"

[dev-dependencies]
reqwest = { version = "0.12", features = ["blocking"] }
2 changes: 1 addition & 1 deletion src/compile/onees.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ fn generate_mcp_configuration(mcps: &HashMap<String, McpConfig>) -> String {
.filter_map(|(name, config)| {
let (is_enabled, opts) = match config {
McpConfig::Enabled(enabled) => (*enabled, None),
McpConfig::WithOptions(o) => (true, Some(o)),
McpConfig::WithOptions(o) => (o.enabled.unwrap_or(true), Some(o)),
};

if !is_enabled {
Expand Down
2 changes: 1 addition & 1 deletion src/compile/standalone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ pub fn generate_mcpg_config(front_matter: &FrontMatter) -> McpgConfig {

let (is_enabled, options) = match config {
McpConfig::Enabled(enabled) => (*enabled, None),
McpConfig::WithOptions(opts) => (true, Some(opts)),
McpConfig::WithOptions(opts) => (opts.enabled.unwrap_or(true), Some(opts)),
};

if !is_enabled {
Expand Down
3 changes: 3 additions & 0 deletions src/compile/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@ pub enum McpConfig {
/// Detailed MCP options
#[derive(Debug, Deserialize, Clone, Default)]
pub struct McpOptions {
/// Whether this MCP is enabled (default: true)
#[serde(default)]
pub enabled: Option<bool>,
/// Custom command (if present, it's a custom MCP - standalone only)
#[serde(default)]
pub command: Option<String>,
Expand Down
12 changes: 10 additions & 2 deletions src/mcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -942,12 +942,20 @@ pub async fn run_http(
return next.run(req).await;
}

// Check Bearer token with constant-time comparison
// Constant-time comparison to prevent timing side-channels.
// Pad to equal length so ct_eq compares all bytes even when lengths differ.
if let Some(auth) = req.headers().get("authorization") {
if let Ok(auth_str) = auth.to_str() {
let expected_header = format!("Bearer {}", expected);
use subtle::ConstantTimeEq;
if auth_str.as_bytes().ct_eq(expected_header.as_bytes()).into() {
let expected_bytes = expected_header.as_bytes();
let provided_bytes = auth_str.as_bytes();
let len = expected_bytes.len().max(provided_bytes.len());
let mut e = vec![0u8; len];
let mut p = vec![0u8; len];
e[..expected_bytes.len()].copy_from_slice(expected_bytes);
p[..provided_bytes.len()].copy_from_slice(provided_bytes);
if e.ct_eq(&p).into() {
return next.run(req).await;
}
}
Expand Down
Loading