Skip to content

Commit 3fdf289

Browse files
wesbillmanPrincess Donut
andauthored
fix(desktop): bound remote agent mention authorization (block#6224)
## Summary - add a targeted native `revalidate_relay_agents(pubkeys, channel_id)` command for send-time authorization - scope membership discovery to the destination channel and selected pubkeys before runtime/profile/policy queries - replace full relay-directory rebuilds with targeted checks before agent side effects and again at publication - preserve managed-agent evidence independently and retain internal owner-only filtering ## Security and trust boundary The targeted command reuses the existing authoritative chain: 1. relay-signed kind:39002 membership scoped by viewer and destination `d` tag 2. agent runtime directory event 3. agent-signed owner profile verification 4. owner-signed managed policy 5. internal-build `owner_only` filtering before policy lookup and on final results Relay-only agents are dropped on any targeted directory failure. Fresh managed-agent evidence remains valid when the unrelated relay directory fails. ## Validation - pre-push gate passed: branch skew, Desktop check/typecheck/tests, Tauri checks, Rust tests, and mobile tests - Desktop unit suite: 4,992 passed - targeted Rust relay-directory tests passed - focused Playwright mention-send acceptance passed - relay-only send emits the expected `p` tag - exactly two targeted `revalidate_relay_agents` calls on the already-member send path: pre-side-effect and pre-publication - no `list_relay_agents` call on that send path - relay failure and revocation remain fail-closed - internal owner-only mode hides other-owned agents - manual local Desktop testing by Wes: mention sends felt materially improved ## Notes This intentionally does not clear the composer early or add an optimistic timeline row. Publication still waits for fresh authorization. --------- Signed-off-by: Wes <[email protected]> Co-authored-by: Princess Donut <68157ebd23b3897c1991015c3038658ea916200c67d3a54620b0754d1b92f6e0@buzz.block.builderlab.xyz>
1 parent cc8a8b0 commit 3fdf289

9 files changed

Lines changed: 192 additions & 69 deletions

File tree

‎desktop/src-tauri/src/commands/agent_discovery.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ pub async fn discover_managed_agent_prereqs(
10331033
mod relay_directory;
10341034
#[cfg(test)]
10351035
use relay_directory::advance_relay_cursor;
1036-
pub use relay_directory::list_relay_agents;
1036+
pub use relay_directory::{list_relay_agents, revalidate_relay_agents};
10371037

10381038
#[cfg(test)]
10391039
mod tests {

‎desktop/src-tauri/src/commands/agent_discovery/relay_directory.rs‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ fn retain_verified_owner(
9090

9191
pub(crate) async fn list_relay_agents_for_state(
9292
state: &AppState,
93+
) -> Result<Vec<RelayAgentInfo>, String> {
94+
list_relay_agents_for_selection(state, None, None).await
95+
}
96+
97+
async fn list_relay_agents_for_selection(
98+
state: &AppState,
99+
requested_pubkeys: Option<&std::collections::HashSet<String>>,
100+
channel_id: Option<&str>,
93101
) -> Result<Vec<RelayAgentInfo>, String> {
94102
let viewer_pubkey = current_user_pubkey(state)?;
95103
let owner_only = owner_only_relay_directory();
@@ -100,18 +108,22 @@ pub(crate) async fn list_relay_agents_for_state(
100108
// Membership is the authoritative and bounded candidate source. Only
101109
// channels visible to this identity are read, and only bot-role p-tags can
102110
// drive the downstream managed-policy and owner-profile lookups.
103-
let membership_events = query_all_relay_pages(
104-
state,
105-
serde_json::json!({
106-
"kinds": [39002],
107-
"authors": [&relay_pubkey],
108-
"#p": [&viewer_pubkey],
109-
}),
110-
)
111-
.await
112-
.map_err(|error| format!("relay agent channel-membership query failed: {error}"))?;
113-
let member_agent_channel_ids =
111+
let mut membership_filter = serde_json::json!({
112+
"kinds": [39002],
113+
"authors": [&relay_pubkey],
114+
"#p": [&viewer_pubkey],
115+
});
116+
if let Some(channel_id) = channel_id {
117+
membership_filter["#d"] = serde_json::json!([channel_id]);
118+
}
119+
let membership_events = query_all_relay_pages(state, membership_filter)
120+
.await
121+
.map_err(|error| format!("relay agent channel-membership query failed: {error}"))?;
122+
let mut member_agent_channel_ids =
114123
nostr_convert::member_agent_channel_ids_from_events(&membership_events, &relay_pubkey);
124+
if let Some(requested_pubkeys) = requested_pubkeys {
125+
member_agent_channel_ids.retain(|pubkey, _| requested_pubkeys.contains(pubkey));
126+
}
115127
let candidate_pubkeys: Vec<String> = member_agent_channel_ids.keys().cloned().collect();
116128
if candidate_pubkeys.is_empty() {
117129
return Ok(Vec::new());
@@ -186,6 +198,27 @@ pub async fn list_relay_agents(state: State<'_, AppState>) -> Result<Vec<RelayAg
186198
list_relay_agents_for_state(&state).await
187199
}
188200

201+
/// Revalidate only the selected relay agents in the target channel.
202+
///
203+
/// This preserves the full directory command for autocomplete while keeping
204+
/// send-time authorization bounded by the actual mention set and destination.
205+
#[tauri::command]
206+
pub async fn revalidate_relay_agents(
207+
pubkeys: Vec<String>,
208+
channel_id: Option<String>,
209+
state: State<'_, AppState>,
210+
) -> Result<Vec<RelayAgentInfo>, String> {
211+
let requested_pubkeys = pubkeys
212+
.into_iter()
213+
.filter_map(|pubkey| nostr::PublicKey::from_hex(&pubkey).ok())
214+
.map(|pubkey| pubkey.to_hex())
215+
.collect::<std::collections::HashSet<_>>();
216+
if requested_pubkeys.is_empty() {
217+
return Ok(Vec::new());
218+
}
219+
list_relay_agents_for_selection(&state, Some(&requested_pubkeys), channel_id.as_deref()).await
220+
}
221+
189222
#[cfg(test)]
190223
mod tests {
191224
use super::*;

‎desktop/src-tauri/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ pub fn run() {
146146
if webview.label() != "main" {
147147
return;
148148
}
149-
150149
// Linux/WebKitGTK needs media-stream settings and a
151150
// permission-request handler for getUserMedia; no-op
152151
// on macOS/Windows.
@@ -763,6 +762,7 @@ pub fn run() {
763762
get_relay_self,
764763
resolve_oa_owner,
765764
list_relay_agents,
765+
revalidate_relay_agents,
766766
list_managed_agents,
767767
list_managed_agent_runtimes,
768768
start_managed_agent_runtime,

‎desktop/src/features/messages/lib/agentMentionRevalidation.test.mjs‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,14 @@ function options(refetchOwnerProfiles) {
1919
ownerOnly: true,
2020
ownerPolicyError: null,
2121
refetchManagedAgents: async () => ({ data: [], error: null }),
22-
refetchRelayAgents: async () => ({
23-
data: [
24-
{
25-
pubkey: AGENT,
26-
respondTo: "anyone",
27-
respondToAllowlist: [],
28-
channelIds: ["general"],
29-
},
30-
],
31-
error: null,
32-
}),
22+
fetchRelayAgents: async () => [
23+
{
24+
pubkey: AGENT,
25+
respondTo: "anyone",
26+
respondToAllowlist: [],
27+
channelIds: ["general"],
28+
},
29+
],
3330
refetchOwnerProfiles,
3431
};
3532
}
@@ -61,10 +58,9 @@ test("fresh managed evidence survives unrelated relay authorization errors", asy
6158
data: [{ pubkey: LOCAL_AGENT }],
6259
error: null,
6360
}),
64-
refetchRelayAgents: async () => ({
65-
data: undefined,
66-
error: new Error("relay directory unavailable"),
67-
}),
61+
fetchRelayAgents: async () => {
62+
throw new Error("relay directory unavailable");
63+
},
6864
});
6965

7066
assert.deepEqual(result, [HUMAN, LOCAL_AGENT]);
@@ -76,10 +72,9 @@ test("relay-only agents still fail closed when relay discovery fails", async ()
7672
profiles: { [AGENT]: { ownerPubkey: CURRENT } },
7773
missing: [],
7874
})),
79-
refetchRelayAgents: async () => ({
80-
data: undefined,
81-
error: new Error("relay directory unavailable"),
82-
}),
75+
fetchRelayAgents: async () => {
76+
throw new Error("relay directory unavailable");
77+
},
8378
});
8479

8580
assert.deepEqual(result, [HUMAN]);
@@ -97,10 +92,9 @@ test("mixed evidence preserves only fresh managed agents and humans", async () =
9792
data: [{ pubkey: LOCAL_AGENT }],
9893
error: null,
9994
}),
100-
refetchRelayAgents: async () => ({
101-
data: undefined,
102-
error: new Error("relay directory unavailable"),
103-
}),
95+
fetchRelayAgents: async () => {
96+
throw new Error("relay directory unavailable");
97+
},
10498
});
10599

106100
assert.deepEqual(result, [HUMAN, LOCAL_AGENT]);

‎desktop/src/features/messages/lib/agentMentionRevalidation.ts‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
} from "@/features/agents/lib/agentAutocompleteEligibility";
77
import { evictUsersBatchEntries } from "@/features/profile/hooks";
88
import { getUsersBatch } from "@/shared/api/tauriProfiles";
9+
import { revalidateRelayAgents } from "@/shared/api/tauriRelayAgents";
910
import type {
1011
ManagedAgent,
1112
RelayAgent,
@@ -29,7 +30,7 @@ export async function revalidateAgentMentionPubkeys({
2930
ownerOnly,
3031
ownerPolicyError,
3132
refetchManagedAgents,
32-
refetchRelayAgents,
33+
fetchRelayAgents,
3334
refetchOwnerProfiles,
3435
}: {
3536
pubkeys: readonly string[];
@@ -40,7 +41,7 @@ export async function revalidateAgentMentionPubkeys({
4041
ownerOnly: boolean | undefined;
4142
ownerPolicyError: Error | null;
4243
refetchManagedAgents: () => Promise<DirectoryResult<ManagedAgent[]>>;
43-
refetchRelayAgents: () => Promise<DirectoryResult<RelayAgent[]>>;
44+
fetchRelayAgents: (pubkeys: string[]) => Promise<RelayAgent[]>;
4445
refetchOwnerProfiles: (pubkeys: string[]) => Promise<UsersBatchResponse>;
4546
}) {
4647
const requestedAgentPubkeys = new Set(
@@ -50,15 +51,14 @@ export async function revalidateAgentMentionPubkeys({
5051
return [...pubkeys];
5152
}
5253

53-
const [managedResult, relayResult, ownerProfiles] = await Promise.all([
54+
const [managedResult, relayAgents, ownerProfiles] = await Promise.all([
5455
refetchManagedAgents(),
55-
refetchRelayAgents(),
56+
fetchRelayAgents([...requestedAgentPubkeys]).catch(() => null),
5657
ownerOnly
5758
? refetchOwnerProfiles([...requestedAgentPubkeys]).catch(() => null)
5859
: Promise.resolve(null),
5960
]);
60-
const relayDirectoryReady =
61-
relayResult.error === null && relayResult.data !== undefined;
61+
const relayDirectoryReady = relayAgents !== null;
6262
if (
6363
ownerOnly === undefined ||
6464
ownerPolicyError !== null ||
@@ -75,7 +75,7 @@ export async function revalidateAgentMentionPubkeys({
7575
currentPubkey,
7676
eligibilityScope,
7777
managedAgentPubkeys: managedPubkeys,
78-
relayAgents: relayDirectoryReady ? relayResult.data : [],
78+
relayAgents: relayDirectoryReady ? relayAgents : [],
7979
sharedChannelIds,
8080
});
8181
const admittedPubkeys = new Set(
@@ -110,7 +110,6 @@ export function useAgentMentionRevalidation({
110110
ownerOnly,
111111
ownerPolicyError,
112112
refetchManagedAgents,
113-
refetchRelayAgents,
114113
}: {
115114
agentPubkeys: ReadonlySet<string>;
116115
getSelectedAgentPubkeys: () => ReadonlySet<string>;
@@ -120,7 +119,6 @@ export function useAgentMentionRevalidation({
120119
ownerOnly: boolean | undefined;
121120
ownerPolicyError: Error | null;
122121
refetchManagedAgents: () => Promise<DirectoryResult<ManagedAgent[]>>;
123-
refetchRelayAgents: () => Promise<DirectoryResult<RelayAgent[]>>;
124122
}) {
125123
const queryClient = useQueryClient();
126124
const refetchOwnerProfiles = React.useCallback(
@@ -141,7 +139,13 @@ export function useAgentMentionRevalidation({
141139
ownerOnly,
142140
ownerPolicyError,
143141
refetchManagedAgents,
144-
refetchRelayAgents,
142+
fetchRelayAgents: (requestedPubkeys) =>
143+
revalidateRelayAgents(
144+
requestedPubkeys,
145+
eligibilityScope.type === "channel"
146+
? eligibilityScope.channelId
147+
: undefined,
148+
),
145149
refetchOwnerProfiles,
146150
}),
147151
[
@@ -153,7 +157,6 @@ export function useAgentMentionRevalidation({
153157
ownerPolicyError,
154158
refetchManagedAgents,
155159
refetchOwnerProfiles,
156-
refetchRelayAgents,
157160
sharedChannelIds,
158161
],
159162
);

‎desktop/src/features/messages/lib/useMentions.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,6 @@ export function useMentions(
827827
ownerOnly: agentAccessOwnerOnlyQuery.data,
828828
ownerPolicyError: agentAccessOwnerOnlyQuery.error,
829829
refetchManagedAgents: managedAgentsQuery.refetch,
830-
refetchRelayAgents: relayAgentsQuery.refetch,
831830
});
832831

833832
const extractMentionPersonas = React.useCallback(
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { invokeTauri } from "@/shared/api/tauri";
2+
import type { RelayAgent } from "@/shared/api/types";
3+
4+
type RawRelayAgent = {
5+
pubkey: string;
6+
owner_pubkey?: string | null;
7+
name: string;
8+
agent_type: string;
9+
channels: string[];
10+
channel_ids: string[];
11+
capabilities: string[];
12+
status: RelayAgent["status"];
13+
respond_to?: RelayAgent["respondTo"];
14+
respond_to_allowlist?: string[];
15+
};
16+
17+
export async function revalidateRelayAgents(
18+
pubkeys: string[],
19+
channelId?: string,
20+
): Promise<RelayAgent[]> {
21+
const agents = await invokeTauri<RawRelayAgent[]>("revalidate_relay_agents", {
22+
pubkeys,
23+
channelId,
24+
});
25+
return agents.map((agent) => ({
26+
pubkey: agent.pubkey,
27+
ownerPubkey: agent.owner_pubkey ?? null,
28+
name: agent.name,
29+
agentType: agent.agent_type,
30+
channels: agent.channels,
31+
channelIds: agent.channel_ids ?? [],
32+
capabilities: agent.capabilities,
33+
status: agent.status,
34+
respondTo: agent.respond_to ?? null,
35+
respondToAllowlist: agent.respond_to_allowlist ?? [],
36+
}));
37+
}

‎desktop/src/testing/e2eBridge.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ type E2eConfig = {
298298
relayAgents?: MockRelayAgentSeed[];
299299
/** Reject successive relay-agent directory reads, then resume. */
300300
relayAgentListErrors?: (string | null)[];
301+
/** Pubkeys omitted only from targeted send-time authorization checks. */
302+
relayAgentRevalidationRevokedPubkeys?: string[];
301303
/** Native-like huddle state seeded from authoritative role-bearing membership. */
302304
huddle?: MockHuddleSeed;
303305
agentListDelayMs?: number;
@@ -12213,6 +12215,27 @@ export function maybeInstallE2eTauriMocks() {
1221312215
);
1221412216
case "list_relay_agents":
1221512217
return handleListRelayAgents(activeConfig);
12218+
case "revalidate_relay_agents": {
12219+
const agents = await handleListRelayAgents(activeConfig);
12220+
const { pubkeys, channelId } = payload as {
12221+
pubkeys: string[];
12222+
channelId?: string;
12223+
};
12224+
const requested = new Set(
12225+
pubkeys.map((pubkey) => pubkey.toLowerCase()),
12226+
);
12227+
const revoked = new Set(
12228+
(activeConfig?.mock?.relayAgentRevalidationRevokedPubkeys ?? []).map(
12229+
(pubkey) => pubkey.toLowerCase(),
12230+
),
12231+
);
12232+
return agents.filter(
12233+
(agent) =>
12234+
requested.has(agent.pubkey.toLowerCase()) &&
12235+
!revoked.has(agent.pubkey.toLowerCase()) &&
12236+
(!channelId || agent.channel_ids.includes(channelId)),
12237+
);
12238+
}
1221612239
case "list_personas":
1221712240
return handleListPersonas();
1221812241
case "create_persona":

0 commit comments

Comments
 (0)