Fix add-to local delivery resolution using caller's domain instead of… - #33
Merged
Conversation
… the instance's own resolveLocalDelivery decided which newly-added recipients were local by parsing the domain out of the requesting identity, not this webapi instance's own domain. That's correct for Send (the owner is always local to their own home server) but wrong for AddRecipients, where any existing participant — including a federated one on a different domain — may add recipients. When a federated participant added a recipient who actually was local to this instance, resolveLocalDelivery treated them as remote and skipped them, while fmsgd's outbound sender also skips local-domain recipients assuming webapi already handled them. Neither side resolved delivery, leaving it stuck pending indefinitely. Adds a required FMSG_DOMAIN env var carrying this instance's own domain, threaded through MessageHandler as LocalDomain and used at both resolveLocalDelivery call sites instead of parsing it from the caller's identity. fmsg-docker's compose files already pass FMSG_DOMAIN to the fmsg-webapi service, so no deployment changes are needed there. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
markmnl
enabled auto-merge (squash)
August 2, 2026 00:40
markmnl
disabled auto-merge
August 2, 2026 01:00
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
… the instance's own
resolveLocalDelivery decided which newly-added recipients were local by parsing the domain out of the requesting identity, not this webapi instance's own domain. That's correct for Send (the owner is always local to their own home server) but wrong for AddRecipients, where any existing participant — including a federated one on a different domain — may add recipients. When a federated participant added a recipient who actually was local to this instance, resolveLocalDelivery treated them as remote and skipped them, while fmsgd's outbound sender also skips local-domain recipients assuming webapi already handled them. Neither side resolved delivery, leaving it stuck pending indefinitely.
Adds a required FMSG_DOMAIN env var carrying this instance's own domain, threaded through MessageHandler as LocalDomain and used at both resolveLocalDelivery call sites instead of parsing it from the caller's identity. fmsg-docker's compose files already pass FMSG_DOMAIN to the fmsg-webapi service, so no deployment changes are needed there.