Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quarantine mail for relayed domains. #6262

Open
wants to merge 3 commits into
base: staging
Choose a base branch
from

Conversation

pquan
Copy link

@pquan pquan commented Jan 24, 2025

Contribution Guidelines

What does this PR include?

Short Description

This PR enables saving the quarantine history(queue) for domains that are only relayed and have no local mailboxes. The admin or the domain admin can manage the quarantine and release / delete etc. messages.

This is an implementation of the enhancement request #5325

As a side note, it fixes a typo in a SQL query in pipe.php (no change of funcionality there).

Affected Containers

  • rspamd (for metadata export)
  • web (for the functions.inc.php) mods.

Did you run tests?

Yes. Using it live.

What did you tested?

Queue comes up. The admin can do all operations. Also a domain admin can do all operation.

What were the final results? (Awaited, got)

It works as expected.

@pquan pquan changed the base branch from master to staging January 27, 2025 10:13
@pquan
Copy link
Author

pquan commented Jan 31, 2025

@FreddleSpl0it : I changed the branch from master to staging. Seems fine and I've been using this patch in production for 10 days now. If you need more info or some tweaks, don't hesitate. I wish this could could be merged so that I don't have to patch all my local installs every time I update. Thank you.

PS: The commit states that the quarantine mail is inserted under the "administrator" name. In reality, the destination mailbox is kept in the database, but since we can't authenticate this user against mailcow's db, only the administrator or a user with domain-admin ACL can access it, hence the explanation of the comment.

@p-krupl
Copy link

p-krupl commented Feb 17, 2025

Maybe a bit late to the party. Wouldn't it be useful if an optional quarantine notification could be sent to the intended receiver ? That way the intended receiver can release or delete mail without requiring administrator intervention.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants