mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-04 12:33:08 +00:00
The opt-in WHATSAPP_FORWARD_OWNER_MESSAGES path in bot mode marks
fromMe inbound messages as fromOwner: true and forwards them to the
Python adapter so plugins can detect "owner just typed in this chat"
and trigger handover / sliding TTL flows. The previous implementation
bypassed the allowlist for that path: the existing allowlist gate at
the bottom of the dispatch loop is guarded by !msg.key.fromMe, so any
chat the operator happened to reply to was forwarded — even ones not
on WHATSAPP_ALLOWED_USERS.
Concretely, on a deployment with a single allowlisted customer, an
owner reply in any other chat would still wake Hermes and let the
gateway-policy plugin's owner-implicit branch create a stray handover
row keyed by the non-allowlisted chatId.
Fix: extract the bot-mode fromMe gate into a small pure helper
(`owner_message_gate.js`) that returns one of
{drop_echo, drop_disabled, drop_allowlist, forward_owner, pass} so the
new allowlist branch can be unit-tested without spinning up Baileys.
The check runs against the customer chatId (not senderId, which is
the owner's own number/LID and won't be on the allowlist by
construction). matchesAllowedUser already short-circuits true on an
empty allowlist or "*", so deployments without an allowlist see no
behavior change.
Self-chat mode is untouched — its existing isSelfChat pin is the
correct guard there.
Tests: scripts/whatsapp-bridge/owner_message_gate.test.mjs covers
echo drop, disabled drop, the new allowlist drop, the forward path,
the open-allowlist short-circuit, and the precedence of echo/disabled
checks over the allowlist check (so logs stay honest).
126 lines
4.2 KiB
JavaScript
126 lines
4.2 KiB
JavaScript
import test from 'node:test';
|
|
import assert from 'node:assert/strict';
|
|
|
|
import { classifyOwnerMessageGate } from './owner_message_gate.js';
|
|
|
|
function makeRecentlySent(ids = []) {
|
|
const set = new Set(ids);
|
|
return { has: (id) => set.has(id) };
|
|
}
|
|
|
|
function makeAllowlist(allowedChatIds) {
|
|
if (allowedChatIds === '*') {
|
|
return () => true;
|
|
}
|
|
const set = new Set(allowedChatIds);
|
|
return (id) => set.has(id);
|
|
}
|
|
|
|
test('non-fromMe messages always pass through', () => {
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: false,
|
|
fromOwnerEnabled: true,
|
|
recentlySent: makeRecentlySent(),
|
|
allowlistMatches: makeAllowlist([]),
|
|
messageId: 'M1',
|
|
chatId: '6281234567890@s.whatsapp.net',
|
|
});
|
|
assert.deepEqual(decision, { action: 'pass' });
|
|
});
|
|
|
|
test('fromMe echo of our own /send is dropped', () => {
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: true,
|
|
fromOwnerEnabled: true,
|
|
recentlySent: makeRecentlySent(['M-OWN-1']),
|
|
allowlistMatches: makeAllowlist('*'),
|
|
messageId: 'M-OWN-1',
|
|
chatId: '6281234567890@s.whatsapp.net',
|
|
});
|
|
assert.deepEqual(decision, { action: 'drop_echo' });
|
|
});
|
|
|
|
test('fromMe is dropped when forwarding is disabled', () => {
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: true,
|
|
fromOwnerEnabled: false,
|
|
recentlySent: makeRecentlySent(),
|
|
allowlistMatches: makeAllowlist('*'),
|
|
messageId: 'M-OWN-2',
|
|
chatId: '6281234567890@s.whatsapp.net',
|
|
});
|
|
assert.deepEqual(decision, { action: 'drop_disabled' });
|
|
});
|
|
|
|
test('fromMe is dropped when chatId is not on the allowlist (regression)', () => {
|
|
// This is the bug. Before the fix, an owner reply in a non-allowlisted
|
|
// chat was still forwarded with fromOwner: true, which made the
|
|
// gateway-policy owner-implicit branch create stray handover rows for
|
|
// the non-allowlisted contact.
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: true,
|
|
fromOwnerEnabled: true,
|
|
recentlySent: makeRecentlySent(),
|
|
allowlistMatches: makeAllowlist(['6281234567890@s.whatsapp.net']),
|
|
messageId: 'M-OWN-3',
|
|
chatId: '111600547700784@lid',
|
|
});
|
|
assert.deepEqual(decision, { action: 'drop_allowlist' });
|
|
});
|
|
|
|
test('fromMe is forwarded as owner when chatId is allowlisted', () => {
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: true,
|
|
fromOwnerEnabled: true,
|
|
recentlySent: makeRecentlySent(),
|
|
allowlistMatches: makeAllowlist(['6281234567890@s.whatsapp.net']),
|
|
messageId: 'M-OWN-4',
|
|
chatId: '6281234567890@s.whatsapp.net',
|
|
});
|
|
assert.deepEqual(decision, { action: 'forward_owner' });
|
|
});
|
|
|
|
test('open-allowlist (matchesAllowedUser short-circuits true) forwards as owner', () => {
|
|
// matchesAllowedUser returns true on empty allowlist or "*"; the gate
|
|
// must respect that so deployments without an allowlist are unaffected
|
|
// by the new check.
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: true,
|
|
fromOwnerEnabled: true,
|
|
recentlySent: makeRecentlySent(),
|
|
allowlistMatches: () => true,
|
|
messageId: 'M-OWN-5',
|
|
chatId: '111600547700784@lid',
|
|
});
|
|
assert.deepEqual(decision, { action: 'forward_owner' });
|
|
});
|
|
|
|
test('echo check fires before allowlist check', () => {
|
|
// A bot-API echo whose chatId happens to be off-allowlist should still
|
|
// be dropped as drop_echo, not drop_allowlist, so logging stays
|
|
// honest about the actual reason.
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: true,
|
|
fromOwnerEnabled: true,
|
|
recentlySent: makeRecentlySent(['M-ECHO-1']),
|
|
allowlistMatches: makeAllowlist([]),
|
|
messageId: 'M-ECHO-1',
|
|
chatId: '111600547700784@lid',
|
|
});
|
|
assert.deepEqual(decision, { action: 'drop_echo' });
|
|
});
|
|
|
|
test('disabled flag fires before allowlist check', () => {
|
|
// Pre-existing deployments with WHATSAPP_FORWARD_OWNER_MESSAGES unset
|
|
// must see drop_disabled regardless of allowlist state, otherwise
|
|
// every fromMe message would log a misleading allowlist_mismatch.
|
|
const decision = classifyOwnerMessageGate({
|
|
fromMe: true,
|
|
fromOwnerEnabled: false,
|
|
recentlySent: makeRecentlySent(),
|
|
allowlistMatches: makeAllowlist([]),
|
|
messageId: 'M-OWN-6',
|
|
chatId: '111600547700784@lid',
|
|
});
|
|
assert.deepEqual(decision, { action: 'drop_disabled' });
|
|
});
|