fix(memory): prevent autosave key collisions across runtime flows

Fixes #221 - SQLite Memory Override bug.

This PR resolves memory overwrite behavior in autosave paths by replacing fixed memory keys with unique keys, and improves short-horizon recall quality in channel runtime.

**Root Cause**
SQLite memory uses a unique constraint on `memories.key` and writes with `ON CONFLICT(key) DO UPDATE`.
Several autosave paths reused fixed keys (or sender-stable keys), so newer messages overwrote earlier conversation entries.

**Changes**
- Channel runtime: autosave key changed from `channel_sender` to `channel_sender_messageId`
- Added memory-context injection before provider calls (aligned with agent loop behavior)
- Agent loop: autosave keys changed from fixed `user_msg`/`assistant_resp` to UUID-suffixed keys
- Gateway: Webhook/WhatsApp autosave keys changed to UUID-suffixed keys

All CI checks passing.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Chummy 2026-02-16 11:55:52 +08:00 committed by GitHub
parent 7b9ba5be6c
commit b442a07530
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 381 additions and 61 deletions

View file

@ -28,6 +28,7 @@ use std::sync::{Arc, Mutex};
use std::time::{Duration, Instant};
use tower_http::limit::RequestBodyLimitLayer;
use tower_http::timeout::TimeoutLayer;
use uuid::Uuid;
/// Maximum request body size (64KB) — prevents memory exhaustion
pub const MAX_BODY_SIZE: usize = 65_536;
@ -36,6 +37,14 @@ pub const REQUEST_TIMEOUT_SECS: u64 = 30;
/// Sliding window used by gateway rate limiting.
pub const RATE_LIMIT_WINDOW_SECS: u64 = 60;
fn webhook_memory_key() -> String {
format!("webhook_msg_{}", Uuid::new_v4())
}
fn whatsapp_memory_key(msg: &crate::channels::traits::ChannelMessage) -> String {
format!("whatsapp_{}_{}", msg.sender, msg.id)
}
#[derive(Debug)]
struct SlidingWindowRateLimiter {
limit_per_window: u32,
@ -475,9 +484,10 @@ async fn handle_webhook(
let message = &webhook_body.message;
if state.auto_save {
let key = webhook_memory_key();
let _ = state
.mem
.store("webhook_msg", message, MemoryCategory::Conversation)
.store(&key, message, MemoryCategory::Conversation)
.await;
}
@ -627,13 +637,10 @@ async fn handle_whatsapp_message(
// Auto-save to memory
if state.auto_save {
let key = whatsapp_memory_key(msg);
let _ = state
.mem
.store(
&format!("whatsapp_{}", msg.sender),
&msg.content,
MemoryCategory::Conversation,
)
.store(&key, &msg.content, MemoryCategory::Conversation)
.await;
}
@ -668,6 +675,7 @@ async fn handle_whatsapp_message(
#[cfg(test)]
mod tests {
use super::*;
use crate::channels::traits::ChannelMessage;
use crate::memory::{Memory, MemoryCategory, MemoryEntry};
use crate::providers::Provider;
use async_trait::async_trait;
@ -675,6 +683,7 @@ mod tests {
use axum::response::IntoResponse;
use http_body_util::BodyExt;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Mutex;
#[test]
fn security_body_limit_is_64kb() {
@ -730,6 +739,30 @@ mod tests {
assert!(store.record_if_new("req-2"));
}
#[test]
fn webhook_memory_key_is_unique() {
let key1 = webhook_memory_key();
let key2 = webhook_memory_key();
assert!(key1.starts_with("webhook_msg_"));
assert!(key2.starts_with("webhook_msg_"));
assert_ne!(key1, key2);
}
#[test]
fn whatsapp_memory_key_includes_sender_and_message_id() {
let msg = ChannelMessage {
id: "wamid-123".into(),
sender: "+1234567890".into(),
content: "hello".into(),
channel: "whatsapp".into(),
timestamp: 1,
};
let key = whatsapp_memory_key(&msg);
assert_eq!(key, "whatsapp_+1234567890_wamid-123");
}
#[derive(Default)]
struct MockMemory;
@ -795,6 +828,63 @@ mod tests {
}
}
#[derive(Default)]
struct TrackingMemory {
keys: Mutex<Vec<String>>,
}
#[async_trait]
impl Memory for TrackingMemory {
fn name(&self) -> &str {
"tracking"
}
async fn store(
&self,
key: &str,
_content: &str,
_category: MemoryCategory,
) -> anyhow::Result<()> {
self.keys
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner)
.push(key.to_string());
Ok(())
}
async fn recall(&self, _query: &str, _limit: usize) -> anyhow::Result<Vec<MemoryEntry>> {
Ok(Vec::new())
}
async fn get(&self, _key: &str) -> anyhow::Result<Option<MemoryEntry>> {
Ok(None)
}
async fn list(
&self,
_category: Option<&MemoryCategory>,
) -> anyhow::Result<Vec<MemoryEntry>> {
Ok(Vec::new())
}
async fn forget(&self, _key: &str) -> anyhow::Result<bool> {
Ok(false)
}
async fn count(&self) -> anyhow::Result<usize> {
let size = self
.keys
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner)
.len();
Ok(size)
}
async fn health_check(&self) -> bool {
true
}
}
#[tokio::test]
async fn webhook_idempotency_skips_duplicate_provider_calls() {
let provider_impl = Arc::new(MockProvider::default());
@ -841,6 +931,58 @@ mod tests {
assert_eq!(provider_impl.calls.load(Ordering::SeqCst), 1);
}
#[tokio::test]
async fn webhook_autosave_stores_distinct_keys_per_request() {
let provider_impl = Arc::new(MockProvider::default());
let provider: Arc<dyn Provider> = provider_impl.clone();
let tracking_impl = Arc::new(TrackingMemory::default());
let memory: Arc<dyn Memory> = tracking_impl.clone();
let state = AppState {
provider,
model: "test-model".into(),
temperature: 0.0,
mem: memory,
auto_save: true,
webhook_secret: None,
pairing: Arc::new(PairingGuard::new(false, &[])),
rate_limiter: Arc::new(GatewayRateLimiter::new(100, 100)),
idempotency_store: Arc::new(IdempotencyStore::new(Duration::from_secs(300))),
whatsapp: None,
whatsapp_app_secret: None,
};
let headers = HeaderMap::new();
let body1 = Ok(Json(WebhookBody {
message: "hello one".into(),
}));
let first = handle_webhook(State(state.clone()), headers.clone(), body1)
.await
.into_response();
assert_eq!(first.status(), StatusCode::OK);
let body2 = Ok(Json(WebhookBody {
message: "hello two".into(),
}));
let second = handle_webhook(State(state), headers, body2)
.await
.into_response();
assert_eq!(second.status(), StatusCode::OK);
let keys = tracking_impl
.keys
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner)
.clone();
assert_eq!(keys.len(), 2);
assert_ne!(keys[0], keys[1]);
assert!(keys[0].starts_with("webhook_msg_"));
assert!(keys[1].starts_with("webhook_msg_"));
assert_eq!(provider_impl.calls.load(Ordering::SeqCst), 2);
}
// ══════════════════════════════════════════════════════════
// WhatsApp Signature Verification Tests (CWE-345 Prevention)
// ══════════════════════════════════════════════════════════