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

Hotfix/rspamd settings member alias #331

Merged
merged 3 commits into from
Sep 5, 2023

Conversation

EricTRL
Copy link
Contributor

@EricTRL EricTRL commented Sep 2, 2023

  • Fixed an issue where Member.objects.filter_active() returned duplicate members if a member has a membership in multiple active years. Also added a test for this.
  • Fixed an issue where development and production Mailcow items could conflict. Development aliases and Rspamd rules now use a [DEV] prefix
  • Fixed an issue where the current Rspamd rule rejected every mail sent to the listed addresses. Wanted behaviour is now achieved using two separate Rspamd rules with different priorities. Note: If an email matches an Rspamd rule, then no further rules are checked.

Member.objects.filter_active should not return duplicates of members with a membership in multiple active years.
Make sure that Rspamd settings set up during development do not override settings set up in a production environment.
Modified Rspamd configuration because internal messages were being rejected. Now utilises two rules opposed to one.
Modified template, logic, and caching behaviour to account for two rules opposed to one.
@EricTRL EricTRL added bug Something isn't working emails Related to sending and receiving emails core Related to the core application labels Sep 2, 2023
@codecov
Copy link

codecov bot commented Sep 2, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (62923f2) 95.83% compared to head (170f87d) 95.84%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #331   +/-   ##
=======================================
  Coverage   95.83%   95.84%           
=======================================
  Files         161      161           
  Lines        7106     7118   +12     
  Branches     1165     1166    +1     
=======================================
+ Hits         6810     6822   +12     
  Misses        194      194           
  Partials      102      102           
Flag Coverage Δ
unittests 95.84% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
mailcow_integration/admin_status/views.py 95.21% <100.00%> (ø)
mailcow_integration/squire_mailcow.py 100.00% <100.00%> (ø)
membership_file/models.py 98.60% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@EricTRL EricTRL merged commit 308b47e into master Sep 5, 2023
6 checks passed
@EricTRL EricTRL deleted the hotfix/rspamd-settings-member-alias branch September 5, 2023 16:42
@EricTRL EricTRL linked an issue Sep 5, 2023 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working core Related to the core application emails Related to sending and receiving emails
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Members with multiple memberships get included in aliases twice
2 participants