mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-25 14:53:34 +00:00
fix: scan inbound messages for leaked secrets (#433)
* fix: scan inbound messages for leaked secrets before LLM processing (#393) Add scan_inbound_for_secrets() to SafetyLayer that reuses the existing leak detector on user input. Wire it into thread_ops.rs after the policy check so messages containing API keys or tokens are rejected early, preventing the LLM from echoing them back and triggering outbound leak-detection error loops. Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: unify inbound secret scan warning messages Both the detected-secret and error branches now show the same actionable message guiding users to remove secrets and use the config system instead. Addresses Gemini review feedback on PR #433. Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 4.6
parent
dbf3406bf5
commit
1f2e8c3b72
@@ -176,6 +176,18 @@ impl Agent {
|
||||
return Ok(SubmissionResult::error("Input rejected by safety policy."));
|
||||
}
|
||||
|
||||
// Scan inbound messages for secrets (API keys, tokens).
|
||||
// Catching them here prevents the LLM from echoing them back, which
|
||||
// would trigger the outbound leak detector and create error loops.
|
||||
if let Some(warning) = self.safety().scan_inbound_for_secrets(content) {
|
||||
tracing::warn!(
|
||||
user = %message.user_id,
|
||||
channel = %message.channel,
|
||||
"Inbound message blocked: contains leaked secret"
|
||||
);
|
||||
return Ok(SubmissionResult::error(warning));
|
||||
}
|
||||
|
||||
// Handle explicit commands (starting with /) directly
|
||||
// Everything else goes through the normal agentic loop with tools
|
||||
let temp_message = IncomingMessage {
|
||||
|
||||
@@ -126,6 +126,22 @@ impl SafetyLayer {
|
||||
self.validator.validate(input)
|
||||
}
|
||||
|
||||
/// Scan user input for leaked secrets (API keys, tokens, etc.).
|
||||
///
|
||||
/// Returns `Some(warning)` if the input contains what looks like a secret,
|
||||
/// so the caller can reject the message early instead of sending it to the
|
||||
/// LLM (which might echo it back and trigger an outbound block loop).
|
||||
pub fn scan_inbound_for_secrets(&self, input: &str) -> Option<String> {
|
||||
let warning = "Your message appears to contain a secret (API key, token, or credential). \
|
||||
For security, it was not sent to the AI. Please remove the secret and try again. \
|
||||
To store credentials, use the setup form or `ironclaw config set <name> <value>`.";
|
||||
match self.leak_detector.scan_and_clean(input) {
|
||||
Ok(cleaned) if cleaned != input => Some(warning.to_string()),
|
||||
Err(_) => Some(warning.to_string()),
|
||||
_ => None, // Clean input
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if content violates any policy rules.
|
||||
pub fn check_policy(&self, content: &str) -> Vec<&PolicyRule> {
|
||||
self.policy.check(content)
|
||||
|
||||
Reference in New Issue
Block a user