Skip to content

feature: provide better rspamd suppport#3016

Merged
georglauterbach merged 17 commits intomasterfrom
rspamd/2
Jan 25, 2023
Merged

feature: provide better rspamd suppport#3016
georglauterbach merged 17 commits intomasterfrom
rspamd/2

Conversation

@georglauterbach
Copy link
Copy Markdown
Member

@georglauterbach georglauterbach commented Jan 21, 2023 •
edited
Loading

Description

This PR brings advanced rspamd support to DMS. It features:

  • updated configuration with sane defaults
  • proper documentation
  • initial tests (which can / should be extended in the future)
  • the ability to disable OpenDKIM & OpenDMARC

Type of change

  • Improvement (non-breaking change that does improve existing functionality)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (README.md or the documentation under docs/)
  • If necessary I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

@georglauterbach georglauterbach added priority/high area/features kind/update Update an existing feature, configuration file or the documentation service/security/rspamd labels Jan 21, 2023
@georglauterbach georglauterbach added this to the v12.0.0 milestone Jan 21, 2023
@georglauterbach georglauterbach self-assigned this Jan 21, 2023
@georglauterbach georglauterbach marked this pull request as draft January 21, 2023 16:30
@georglauterbach georglauterbach force-pushed the rspamd/2 branch 2 times, most recently from a5ab982 to c3990b9 Compare January 21, 2023 16:46
@georglauterbach georglauterbach changed the title feature: provide advanced rspamd suppport (still WIP though) feature: provide better rspamd suppport Jan 21, 2023
@georglauterbach georglauterbach marked this pull request as ready for review January 21, 2023 17:01
georglauterbach and others added 9 commits January 22, 2023 01:03
@georglauterbach
added options to toggle OpenDKIM & OpenDMARC
f144ce3 
rspamd can provide DKIM signing and DMARC checking itself, so users
should be able to disable OpenDKIM & OpenDMARC. The default is left at
1, so users have to to opt-in when the want to disable the features.
@georglauterbach
misc small enhancements
88157af
@georglauterbach
adjusted start of rspamd
e2c2a42 
The order of starting redis + rspamd was reversed (now correct) and
rspamd now starts with the correct user.
@georglauterbach
adjusted rspamd core configuration
9d612c2 
The main configuration was revised. This includes AV configuration as
well as worker/proxy/controller configuration used to control the main
rspamd processes.

The configuration is not tested extensively, but well enough that I am
confident to go forward with it until we declare rspamd support as
stable.
@georglauterbach
update & improve the documentation
0e80abc
@georglauterbach
add tests
af7cf6d 
These are some initial tests which test the most basic functionality.
@georglauterbach
tests(refactor): Improve consistency and documentation for test helpe…
91645e0 
…rs (#3012)
@polarathene @georglauterbach
added ALWAYS_RUN target Makefile recipies (#3013)
504b3c5 
This ensures the recipies are always run.

Co-authored-by: georglauterbach <[email protected]>
@georglauterbach
adjusted rspamd test to refactored test helper functions
d49a42c
georglauterbach
georglauterbach commented Jan 22, 2023
View reviewed changes
Comment thread test/tests/parallel/set1/spam_virus/rspamd.bats Outdated
@georglauterbach
Copy link
Copy Markdown
Member Author

georglauterbach commented Jan 22, 2023

I marked this as high priority because I am currently in the process of actually switching from Amavis/SA to Rspamd. I discovered some misconfigurations with my first PR so I need to fix / adjust DMS (fast). Just FYI.

@georglauterbach georglauterbach mentioned this pull request Jan 22, 2023
Closed
8 tasks
polarathene
polarathene requested changes Jan 22, 2023
View reviewed changes
Comment thread docs/content/config/security/rspamd.md Outdated
Comment thread target/rspamd/local.d/worker-controller.inc
Comment thread target/scripts/startup/setup-stack.sh Outdated
Comment thread target/scripts/startup/setup-stack.sh Outdated
Comment thread target/scripts/startup/setup-stack.sh Outdated
Comment thread test/tests/parallel/set1/spam_virus/rspamd.bats Outdated
@georglauterbach
Copy link
Copy Markdown
Member Author

georglauterbach commented Jan 22, 2023

Thanks @polarathene for the quick review ❤️

polarathene
polarathene reviewed Jan 22, 2023
View reviewed changes
Comment thread docs/content/config/security/rspamd.md Outdated
@polarathene

This comment was marked as outdated.

Sign in to view
polarathene
polarathene previously approved these changes Jan 22, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@polarathene polarathene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@georglauterbach georglauterbach mentioned this pull request Jan 23, 2023
Merged
5 tasks
casperklein
casperklein reviewed Jan 24, 2023
View reviewed changes
Comment thread target/scripts/startup/setup-stack.sh
Comment thread target/scripts/startup/setup-stack.sh
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jan 25, 2023

Documentation preview for this PR is ready! 🎉

Built with commit: dd444c1

@georglauterbach georglauterbach merged commit 555fbb7 into master Jan 25, 2023
@georglauterbach georglauterbach deleted the rspamd/2 branch January 25, 2023 09:29
@georglauterbach georglauterbach mentioned this pull request Jan 26, 2023
Closed
georglauterbach added a commit that referenced this pull request Jan 30, 2023
@georglauterbach
rspamd: follow-up of #3016 (#3039)
1a0c2a3
@casperklein casperklein mentioned this pull request Feb 10, 2023
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@casperklein casperklein casperklein approved these changes

@polarathene polarathene polarathene approved these changes

Assignees

@georglauterbach georglauterbach

Labels

area/features kind/update Update an existing feature, configuration file or the documentation priority/high service/security/rspamd

Projects

Rspamd Integration
Archived in project

Milestone

v12.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@georglauterbach @polarathene @casperklein