fix(federation): add strict origin enforcement for user attribution (FED-010)
Prevent malicious peers from forging events attributed to users on other instances. Every relay event processor now verifies the acting user's homeInstance (from payload) matches X-Federation-Origin (from HMAC-verified header) via verifyAttribution(), normalized to bare domain. - Add verifyAttribution() helper using extractDomain normalization - Guard all 13 event processors before any user resolution or DB writes - Add homeInstance to FederationRelayReaction type + outbound payloads - Replace unnormalized string equality in friend handlers - Log mismatched values on rejection for debugging
This commit is contained in:
@@ -780,9 +780,9 @@ export async function federationRoutes(app: FastifyInstance): Promise<void> {
|
||||
if (mutationType === 'reaction_add' || mutationType === 'reaction_remove') {
|
||||
// Use the stored payload from the mutation log
|
||||
if (mutation.payload) {
|
||||
let reactionData: { userId: string; homeUserId: string; emoji: string; createdAt?: number } | null = null;
|
||||
let reactionData: { userId: string; homeUserId: string; homeInstance?: string; emoji: string; createdAt?: number } | null = null;
|
||||
try {
|
||||
reactionData = JSON.parse(mutation.payload) as { userId: string; homeUserId: string; emoji: string; createdAt?: number };
|
||||
reactionData = JSON.parse(mutation.payload) as { userId: string; homeUserId: string; homeInstance?: string; emoji: string; createdAt?: number };
|
||||
} catch {
|
||||
// Skip malformed payload
|
||||
continue;
|
||||
@@ -797,6 +797,7 @@ export async function federationRoutes(app: FastifyInstance): Promise<void> {
|
||||
reaction: {
|
||||
userId: reactionData.userId,
|
||||
homeUserId: reactionData.homeUserId,
|
||||
homeInstance: reactionData.homeInstance || getOurOrigin(),
|
||||
emoji: reactionData.emoji,
|
||||
createdAt: reactionData.createdAt ?? mutation.mutated_at,
|
||||
},
|
||||
@@ -992,6 +993,15 @@ export function extractDomain(homeInstance: string): string {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify that an acting user's homeInstance matches the source instance (X-Federation-Origin).
|
||||
* In direct S2S federation, a peer should only send events for its own users.
|
||||
* Both sides are normalized to bare domain before comparison.
|
||||
*/
|
||||
export function verifyAttribution(actingUserHomeInstance: string, sourceInstance: string): boolean {
|
||||
return extractDomain(actingUserHomeInstance) === extractDomain(sourceInstance);
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve a home user ID to a local user.
|
||||
* Matches users where home_user_id = homeUserId, or where
|
||||
@@ -1301,6 +1311,13 @@ function processCreateEvent(
|
||||
return;
|
||||
}
|
||||
|
||||
// Attribution: message author must belong to source instance (FED-010)
|
||||
if (!verifyAttribution(event.message.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in create: message homeInstance=${extractDomain(event.message.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
// Dedup: check for existing message with same source
|
||||
const existingMsg = db
|
||||
.select()
|
||||
@@ -1494,6 +1511,13 @@ function processUpdateEvent(
|
||||
accepted: string[],
|
||||
rejected: Array<{ messageId: string; reason: string }>,
|
||||
): void {
|
||||
// Attribution: if homeInstance present, verify it matches source (FED-010)
|
||||
if (event.message?.homeInstance && !verifyAttribution(event.message.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in update: message homeInstance=${extractDomain(event.message.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
const localMsg = db
|
||||
.select()
|
||||
.from(schema.dmMessages)
|
||||
@@ -1590,6 +1614,7 @@ function processDeleteEvent(
|
||||
accepted: string[],
|
||||
rejected: Array<{ messageId: string; reason: string }>,
|
||||
): void {
|
||||
// FED-010: delete is safe by design — lookup scoped to sourceInstance+sourceMessageId
|
||||
const localMsg = db
|
||||
.select()
|
||||
.from(schema.dmMessages)
|
||||
@@ -1689,6 +1714,13 @@ function processReactionAddEvent(
|
||||
return;
|
||||
}
|
||||
|
||||
// Attribution: reacting user must belong to source instance (FED-010)
|
||||
if (!event.reaction.homeInstance || !verifyAttribution(event.reaction.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in reaction_add: reaction homeInstance=${event.reaction.homeInstance ? extractDomain(event.reaction.homeInstance) : 'missing'} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
const canonicalMessageId = event.reaction.messageId ?? event.messageId;
|
||||
const localMsg = resolveLocalDmMessage(
|
||||
canonicalMessageId,
|
||||
@@ -1770,6 +1802,13 @@ function processReactionRemoveEvent(
|
||||
return;
|
||||
}
|
||||
|
||||
// Attribution: reacting user must belong to source instance (FED-010)
|
||||
if (!event.reaction.homeInstance || !verifyAttribution(event.reaction.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in reaction_remove: reaction homeInstance=${event.reaction.homeInstance ? extractDomain(event.reaction.homeInstance) : 'missing'} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
const canonicalMessageId = event.reaction.messageId ?? event.messageId;
|
||||
const localMsg = resolveLocalDmMessage(
|
||||
canonicalMessageId,
|
||||
@@ -1838,6 +1877,13 @@ function processMemberAddEvent(
|
||||
|
||||
// Bootstrap: channel doesn't exist yet — create from group metadata
|
||||
if (!channel && event.group) {
|
||||
// Attribution: only the owner's instance can bootstrap a group (FED-010)
|
||||
if (event.group.owner && !verifyAttribution(event.group.owner.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in member_add bootstrap: owner homeInstance=${extractDomain(event.group.owner.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
const channelId = generateSnowflake();
|
||||
const now = Date.now();
|
||||
|
||||
@@ -1929,6 +1975,13 @@ function processMemberAddEvent(
|
||||
return;
|
||||
}
|
||||
|
||||
// Attribution: adder must belong to source instance (FED-010)
|
||||
if (event.membership.addedBy && !verifyAttribution(event.membership.addedBy.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in member_add: addedBy homeInstance=${extractDomain(event.membership.addedBy.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
// Cancel soft-delete if channel was pending GC
|
||||
if (channel.deletedAt) {
|
||||
db.update(schema.dmChannels)
|
||||
@@ -2035,6 +2088,13 @@ function processMemberRemoveEvent(
|
||||
return;
|
||||
}
|
||||
|
||||
// Attribution: for self-leave, user must belong to source instance (FED-010)
|
||||
if (event.membership.reason === 'leave' && !verifyAttribution(event.membership.user.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in member_remove: user homeInstance=${extractDomain(event.membership.user.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
const channel = db
|
||||
.select()
|
||||
.from(schema.dmChannels)
|
||||
@@ -2148,6 +2208,13 @@ function processOwnershipTransferEvent(
|
||||
return;
|
||||
}
|
||||
|
||||
// Attribution: previous owner must belong to source instance (FED-010)
|
||||
if (event.ownership.previousOwner && !verifyAttribution(event.ownership.previousOwner.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in ownership_transfer: previousOwner homeInstance=${extractDomain(event.ownership.previousOwner.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
const channel = db
|
||||
.select()
|
||||
.from(schema.dmChannels)
|
||||
@@ -2295,9 +2362,10 @@ function processFriendRequestCreateEvent(
|
||||
|
||||
const { from, to } = event.friendship;
|
||||
|
||||
// Authority check: the sender's home instance must be the source
|
||||
if (from.homeInstance !== sourceInstance) {
|
||||
rejected.push({ messageId: event.messageId, reason: 'unauthorized_source' });
|
||||
// Attribution: sender must belong to source instance (FED-010)
|
||||
if (!verifyAttribution(from.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in friend_request_create: from homeInstance=${extractDomain(from.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2391,9 +2459,10 @@ function processFriendRequestUpdateEvent(
|
||||
|
||||
const { from, to, status } = event.friendship;
|
||||
|
||||
// Authority check: the recipient's instance accepts/declines
|
||||
if (to.homeInstance !== sourceInstance) {
|
||||
rejected.push({ messageId: event.messageId, reason: 'unauthorized_source' });
|
||||
// Attribution: recipient (acceptor/decliner) must belong to source instance (FED-010)
|
||||
if (!verifyAttribution(to.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in friend_request_update: to homeInstance=${extractDomain(to.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2467,9 +2536,10 @@ function processFriendRequestCancelEvent(
|
||||
|
||||
const { from, to } = event.friendship;
|
||||
|
||||
// Authority check: the sender cancels their own request
|
||||
if (from.homeInstance !== sourceInstance) {
|
||||
rejected.push({ messageId: event.messageId, reason: 'unauthorized_source' });
|
||||
// Attribution: sender must belong to source instance (FED-010)
|
||||
if (!verifyAttribution(from.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in friend_request_cancel: from homeInstance=${extractDomain(from.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2531,9 +2601,10 @@ function processFriendAddEvent(
|
||||
|
||||
const { from, to } = event.friendship;
|
||||
|
||||
// Authority check: the recipient's instance creates the friendship
|
||||
if (to.homeInstance !== sourceInstance) {
|
||||
rejected.push({ messageId: event.messageId, reason: 'unauthorized_source' });
|
||||
// Attribution: acceptor must belong to source instance (FED-010)
|
||||
if (!verifyAttribution(to.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in friend_add: to homeInstance=${extractDomain(to.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2617,9 +2688,10 @@ function processFriendRemoveEvent(
|
||||
|
||||
const { from, to } = event.friendship;
|
||||
|
||||
// Authority check: either side can unfriend
|
||||
if (from.homeInstance !== sourceInstance && to.homeInstance !== sourceInstance) {
|
||||
rejected.push({ messageId: event.messageId, reason: 'unauthorized_source' });
|
||||
// Attribution: at least one side must belong to source instance (FED-010)
|
||||
if (!verifyAttribution(from.homeInstance, sourceInstance) && !verifyAttribution(to.homeInstance, sourceInstance)) {
|
||||
console.warn(`[federation] Attribution mismatch in friend_remove: from homeInstance=${extractDomain(from.homeInstance)} to homeInstance=${extractDomain(to.homeInstance)} source=${extractDomain(sourceInstance)}`);
|
||||
rejected.push({ messageId: event.messageId, reason: 'attribution_mismatch' });
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2664,6 +2736,7 @@ function processFileRejectedEvent(
|
||||
accepted: string[],
|
||||
rejected: Array<{ messageId: string; reason: string }>,
|
||||
): void {
|
||||
// FED-010: file_rejected is a system event from the rejecting peer — no user attribution to verify
|
||||
if (!event.attachmentId || !event.rejectionReason) {
|
||||
rejected.push({ messageId: event.messageId, reason: 'missing_file_rejected_payload' });
|
||||
return;
|
||||
|
||||
@@ -1134,6 +1134,7 @@ function handleReactionAdd(event: Record<string, unknown>, userId: string): void
|
||||
appendMutationLog(messageId, dmMsg.dmChannelId, 'reaction_add', JSON.stringify({
|
||||
userId,
|
||||
homeUserId: reactionUser?.homeUserId || userId,
|
||||
homeInstance: reactionUser?.homeInstance || getOurOrigin(),
|
||||
emoji,
|
||||
createdAt: now,
|
||||
}));
|
||||
@@ -1144,6 +1145,7 @@ function handleReactionAdd(event: Record<string, unknown>, userId: string): void
|
||||
messageHomeInstance,
|
||||
userId,
|
||||
homeUserId: reactionUser?.homeUserId || userId,
|
||||
homeInstance: reactionUser?.homeInstance || getOurOrigin(),
|
||||
emoji,
|
||||
createdAt: now,
|
||||
},
|
||||
@@ -1213,6 +1215,7 @@ function handleReactionRemove(event: Record<string, unknown>, userId: string): v
|
||||
appendMutationLog(messageId, dmMsg.dmChannelId, 'reaction_remove', JSON.stringify({
|
||||
userId,
|
||||
homeUserId: removingUser?.homeUserId || userId,
|
||||
homeInstance: removingUser?.homeInstance || getOurOrigin(),
|
||||
emoji,
|
||||
}));
|
||||
const reactionRemoveTargetOrigins = getGroupDmTargetOrigins(dmMsg.dmChannelId);
|
||||
@@ -1226,6 +1229,7 @@ function handleReactionRemove(event: Record<string, unknown>, userId: string): v
|
||||
messageHomeInstance,
|
||||
userId,
|
||||
homeUserId: removingUser?.homeUserId || userId,
|
||||
homeInstance: removingUser?.homeInstance || getOurOrigin(),
|
||||
emoji,
|
||||
},
|
||||
}),
|
||||
|
||||
Reference in New Issue
Block a user