Merge 513f3556e7 into 09be5d45d5

extensions/googlechat/src/channel.ts

@@ -398,7 +398,17 @@ export const googlechatPlugin: ChannelPlugin<ResolvedGoogleChatAccount> = {
             ),
           };
         }
-        return { ok: true, to: normalized };
+        const hasWildcard = allowListRaw.includes("*");
+        if (hasWildcard || allowList.length === 0 || allowList.includes(normalized)) {
+          return { ok: true, to: normalized };
+        }
+        if (mode === "implicit" || mode === "heartbeat") {
+          return { ok: true, to: allowList[0] };
+        }
+        return {
+          ok: false,
+          error: new Error(`Google Chat target ${trimmed} is not in the allowFrom list.`),
+        };
       }
 
       if (allowList.length > 0) {

extensions/twitch/src/outbound.ts

@@ -51,25 +51,19 @@ export const twitchOutbound: ChannelOutboundAdapter = {
       .map((entry: string) => normalizeTwitchChannel(entry))
       .filter((entry): entry is string => entry.length > 0);
 
-    // If target is provided, normalize and validate it
     if (trimmed) {
       const normalizedTo = normalizeTwitchChannel(trimmed);
-
+      if (hasWildcard || allowList.length === 0 || allowList.includes(normalizedTo)) {
-      // For implicit/heartbeat modes with allowList, check against allowlist
+        return { ok: true, to: normalizedTo };
+      }
       if (mode === "implicit" || mode === "heartbeat") {
-        if (hasWildcard || allowList.length === 0) {
-          return { ok: true, to: normalizedTo };
-        }
-        if (allowList.includes(normalizedTo)) {
-          return { ok: true, to: normalizedTo };
-        }
-        // Fallback to first allowFrom entry
         // biome-ignore lint/style/noNonNullAssertion: length > 0 check ensures element exists
         return { ok: true, to: allowList[0]! };
       }
-
+      return {
-      // For explicit mode, accept any valid channel name
+        ok: false,
-      return { ok: true, to: normalizedTo };
+        error: new Error(`Twitch target ${trimmed} is not in the allowFrom list.`),
+      };
     }
 
     // No target provided, use allowFrom fallback

extensions/whatsapp/src/channel.ts

@@ -303,18 +303,24 @@ export const whatsappPlugin: ChannelPlugin<ResolvedWhatsAppAccount> = {
           };
         }
         if (isWhatsAppGroupJid(normalizedTo)) {
+          if (hasWildcard || allowList.length === 0 || allowList.includes(normalizedTo)) {
+            return { ok: true, to: normalizedTo };
+          }
+          return {
+            ok: false,
+            error: new Error(`WhatsApp group ${trimmed} is not in the allowFrom list.`),
+          };
+        }
+        if (hasWildcard || allowList.length === 0 || allowList.includes(normalizedTo)) {
           return { ok: true, to: normalizedTo };
         }
         if (mode === "implicit" || mode === "heartbeat") {
-          if (hasWildcard || allowList.length === 0) {
-            return { ok: true, to: normalizedTo };
-          }
-          if (allowList.includes(normalizedTo)) {
-            return { ok: true, to: normalizedTo };
-          }
           return { ok: true, to: allowList[0] };
         }
-        return { ok: true, to: normalizedTo };
+        return {
+          ok: false,
+          error: new Error(`WhatsApp target ${trimmed} is not in the allowFrom list.`),
+        };
       }
 
       if (allowList.length > 0) {

src/channels/plugins/outbound/whatsapp.ts

@@ -35,18 +35,31 @@ export const whatsappOutbound: ChannelOutboundAdapter = {
         };
       }
       if (isWhatsAppGroupJid(normalizedTo)) {
+        // Groups also restricted to allowlist when configured
+        if (hasWildcard || allowList.length === 0 || allowList.includes(normalizedTo)) {
+          return { ok: true, to: normalizedTo };
+        }
+        return {
+          ok: false,
+          error: new Error(`WhatsApp group ${trimmed} is not in the allowFrom list.`),
+        };
+      }
+      if (hasWildcard || allowList.length === 0) {
         return { ok: true, to: normalizedTo };
       }
+      if (allowList.includes(normalizedTo)) {
+        return { ok: true, to: normalizedTo };
+      }
+      // Target not in allowlist — fallback for implicit, reject for explicit
       if (mode === "implicit" || mode === "heartbeat") {
-        if (hasWildcard || allowList.length === 0) {
-          return { ok: true, to: normalizedTo };
-        }
-        if (allowList.includes(normalizedTo)) {
-          return { ok: true, to: normalizedTo };
-        }
         return { ok: true, to: allowList[0] };
       }
-      return { ok: true, to: normalizedTo };
+      return {
+        ok: false,
+        error: new Error(
+          `WhatsApp target ${trimmed} is not in the allowFrom list. Allowed: ${allowListRaw.join(", ")}`,
+        ),
+      };
     }
 
     if (allowList.length > 0) {

src/infra/outbound/targets.ts

@@ -162,6 +162,16 @@ export function resolveOutboundTarget(params: {
 
   const trimmed = params.to?.trim();
   if (trimmed) {
+    const mode = params.mode ?? "explicit";
+    if (allowFrom && allowFrom.length > 0 && !allowFrom.includes("*")) {
+      const list = allowFrom.map((e) => String(e).trim()).filter(Boolean);
+      if (list.includes(trimmed)) return { ok: true, to: trimmed };
+      if (mode === "implicit" || mode === "heartbeat") {
+        const fallback = list[0];
+        if (fallback) return { ok: true, to: fallback };
+      }
+      return { ok: false, error: new Error(`Target ${trimmed} is not in the allowFrom list.`) };
+    }
     return { ok: true, to: trimmed };
   }
   const hint = plugin.messaging?.targetResolver?.hint;