1
0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-12 10:45:38 +02:00
Commit Graph

4511 Commits

Author SHA1 Message Date
Florent Daigniere
86ff5f7b71 Merge remote-tracking branch 'upstream/master' into managesieve-proxy 2023-04-20 18:53:17 +02:00
bors[bot]
1f9cd7db99
Merge #2791
2791: LD_PRELOAD may not be in ENV r=nextgens a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

In front, config.py can be called several times. LD_PRELOAD may have already been removed from ENV

### Related issue(s)
- close #2789 
- #2541

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2023-04-20 16:31:19 +00:00
Florent Daigniere
21982478fb warning is enough 2023-04-20 18:01:16 +02:00
Florent Daigniere
281800d946 Try to do the same for ARM64, log a message if we do 2023-04-20 17:59:14 +02:00
Florent Daigniere
ede331f657 LD_PRELOAD may not be in ENV 2023-04-20 17:46:27 +02:00
Florent Daigniere
d35ed1c400 add tests 2023-04-20 16:14:01 +02:00
Florent Daigniere
107b0ab5ff Implement managesieve support 2023-04-20 15:36:17 +02:00
bors[bot]
91f4ac609f
Merge #2786
2786: adapted to v2 release and a docker change r=mergify[bot] a=elandorr

- v2 changed the path
- docker deprecated/removed the scale command, you have to do it like this now

## What type of PR?
documentation


Co-authored-by: elandorr <56206745+elandorr@users.noreply.github.com>
2023-04-20 11:19:15 +00:00
bors[bot]
6710a29c5e
Merge #2772
2772: Always exempt app-tokens from rate limits r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Always exempt app-tokens from rate limits
Ensure that unsuccessful login attempts against a valid account hit the ip-based rate-limit too

### Related issue(s)


## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2023-04-20 10:12:01 +00:00
bors[bot]
d8f6a53a1e
Merge #2771
2771: Sanitize logs as appropriate r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

- Sanitize logs as appropriate. 
- change the healthcheck of radicale to something less verbose
- disable hardened-malloc if we detect a processor not supporting the AVX extension set

Should we backport something like that? It could be argued it's a bugfix.

### Related issue(s)
- close #2644 
- close #2764
- #2541

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2023-04-20 09:23:25 +00:00
elandorr
c53bf301e9
Update antispam.rst
shorter variant (scale isn't needed as there's only 1 at a time anyway)
2023-04-20 08:38:19 +00:00
elandorr
52bcb24eaa
adapted to v2 release and a docker change
- v2 changed the path
- docker deprecated/removed the scale command, you have to do it like this now
2023-04-20 04:00:30 +00:00
bors[bot]
152a2bf175
Merge #2777
2777: Whitelist all mailso* stream types in snuffleupagus for snappymail r=mergify[bot] a=Nebukadneza

## What type of PR?
bug-fix

## What does this PR do?
For attachment download in snappymail to work, at least mailsoliteral is needed. The additionally used stream types (from looking at the snappymail source) have also been added, to ensure compatability with whatever feature might rely on them ….

### Context
I’m not sure the newly whitelisted stream types other than `mailsoliteral` are actually needed. Would like some input on that, so I’m creating a draft first ….

Also, should this go to `2.0` or both `2.0` and `master`?

### Related issue(s)
- closes #2776

## Prerequisites
- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Dario Ernst <dario.ernst@rommelag.com>
2023-04-17 13:53:10 +00:00
Dario Ernst
b0c71559d0 Whitelist all mailso* stream types in snuffleupagus for snappymail
For attachment download in snappymail to work, at least mailsoliteral is
needed. The additionally used stream types (from looking at the
snappymail source) have also been added, to ensure compatability with
whatever feature might rely on them ….
2023-04-17 14:43:13 +02:00
Florent Daigniere
5a55d1824e Make it happen post-deduplication 2023-04-16 12:57:20 +02:00
Florent Daigniere
21ed7b69a8 ratelimit: ensure we hit the ip-ratelimit on unsuccesful attempts
against a valid account
2023-04-16 11:30:14 +02:00
Florent Daigniere
775033391a doh 2023-04-14 13:56:39 +02:00
Florent Daigniere
c363378005 Always exempt app-tokens from rate limits 2023-04-14 12:51:43 +02:00
Florent Daigniere
b6ed4fd83e fix #2764 2023-04-14 10:09:51 +02:00
Florent Daigniere
7b08232049 Sanitize logs as appropriate 2023-04-13 14:46:12 +02:00
bors[bot]
0dded85c73
Merge #2767
2767: Fix #2720: make letsencrypt work when reverse proxies are misconfigured r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Letsencrypt only works if port 80 is reachable. Users behind reverse-proxies don't read instructions... this makes the common misconfiguration work too.

### Related issue(s)
- closes #2720 
- closes #2766

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2023-04-12 11:47:33 +00:00
Florent Daigniere
b65430b576 Fix #2766 2023-04-12 12:37:17 +02:00
Florent Daigniere
8686e5154f Fix #2720 2023-04-12 12:33:33 +02:00
bors[bot]
1b7de128c9
Merge #2756
2756: POP3 is broken r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Add a test to show it's broken, then fix it.

### Related issue(s)
- close #2754
- close #2757

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2023-04-08 11:33:34 +00:00
Florent Daigniere
a61de6c2e3 Unique exit codes 2023-04-08 13:23:28 +02:00
Florent Daigniere
c008ce6608 review 2023-04-08 12:47:41 +02:00
Florent Daigniere
845eff0055 fix 2757 2023-04-08 12:27:32 +02:00
Florent Daigniere
a72d3cf3ec maybe fix eval 2023-04-08 11:32:46 +02:00
Florent Daigniere
a09c23d8de Fix it 2023-04-08 11:32:46 +02:00
Florent Daigniere
7b46c7bcb6 Add test to show it's broken 2023-04-08 10:22:09 +02:00
bors[bot]
399345e796
Merge #2752
2752: Fix config-import. Config with dkim key could not be imported. r=mergify[bot] a=Diman0

## What type of PR?

bug-fix

## What does this PR do?
Imports with dkim keys failed due to two bugs
- The situation where the DKIM key was included as \<hidden\> in the config.yml was not handled
- An attempt was made to byte encode a value that was already a byte encoded value

This PR fixes both issues. Now config yml's with valid dkim keys and dkim keys with value \<hidden\> can be imported again using config-import.

### Related issue(s)
- #2747 


## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2023-04-07 14:27:47 +00:00
Dimitri Huisman
c54271db32
Fix config-import. Config with dkim key could not be imported. 2023-04-07 14:19:17 +00:00
bors[bot]
60fc2b5679
Merge #2748
2748: Improve ci by using intermediate images r=mergify[bot] a=Diman0

## What type of PR?

enhancement

## What does this PR do?
As discussed in the mailu-dev chat, to improve build times we should
1. First build the base image and push this to ghcr.io
2. Secondly at the same time build the assets images and push this to ghcr.io.
3. Simultanuously build all other images which use the base/assets image from ghcr.io.

I've made these changes to the build_test_deploy.yml file and build-ci.yml file.
https://github.com/Mailu/Mailu/actions/runs/4637399505
In the worst case the build time appears to be around ~13 minutes now.

- build-ci.hcl will be used only by the github workflow. This file is modified to pull the base/assets image from the registry.
- build.hcl is unmodified. This file can be used to build all images locally.

I changed the name of the build jobs to make sure they fit in the overview list when viewing the action on github. You can now actually identify what job is run for what matrix target.

### Related issue(s)

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [n/a ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2023-04-07 11:20:04 +00:00
Dimitri Huisman
c6c4cd71f6
Add release note for PR 2748 2023-04-07 10:41:43 +00:00
Dimitri Huisman
c1e00f1478
Forgot to update the hcl file to the new build-ci.hcl file 2023-04-07 10:18:53 +00:00
Dimitri Huisman
66274ae4cc
Use intermediate images for CI workflow
First the base and assets images are build and pushed to ghcr.io.
After that all main images are build. These images use the previously
build base/assets image by pulling it from ghcr.io.
2023-04-07 10:09:54 +00:00
bors[bot]
bcfe12a6f6
Merge #2745
2745: Fix tag-release step in workflow which prevented github releases from being created automatically r=mergify[bot] a=Diman0

## What does this PR do?
Fix tag-release step in workflow which prevented github releases from being created automatically.

Cause was that a specific method is required for assigning multi-line strings in github workflow files: https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings

On my fork Mailu_Fork
Replicated the issue:
https://github.com/Diman0/Mailu_Fork/actions/runs/4626459175

Fix in action:
https://github.com/Diman0/Mailu_Fork/actions/runs/4626683488/jobs/8183697136
https://github.com/Diman0/Mailu_Fork/releases/tag/1.9.28

## What type of PR?

bug fix

### Related issue(s)
- closes #2744 

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [n/a ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
2023-04-06 11:18:52 +00:00
Dimitri Huisman
410e1d3ec4
Add reminder to configure mta-sts 2023-04-06 10:01:27 +00:00
Florent Daigniere
a15566a303
Update releases.rst 2023-04-06 11:31:42 +02:00
Dimitri Huisman
0faae50302
Improve releases.rst.
Add extra links to relevant sections in documentation.
Add example of using the new override location for rspamd.
Add clarification  in rspamd section for rspamd override change and new autoconfig.* endpoint
2023-04-06 09:04:04 +00:00
Dimitri Huisman
ddcdf8b82a
Fix tag-release step in workflow which prevented github releases from being created automatically.
Cause was that a specific method is required for assigning multi-line strings in github workflow files:
https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
2023-04-06 07:46:28 +00:00
Dimitri Huisman
d65b15abb7
Merge pull request #2742 from Diman0/release-2.0
Newsfragment for releasing Mailu 2.0
2023-04-05 09:33:41 +02:00
Dimitri Huisman
8cd5c15dc7
Newsfragment for releasing Mailu 2.0 2023-04-05 07:32:44 +00:00
bors[bot]
0cc7c2fd05
Merge #2735
2735: Mailu 2.0 release r=mergify[bot] a=Diman0

## What type of PR?

feature

## What does this PR do?
Changes for releasing Mailu 2.0.  I must still proofread the release notes I wrote.

### Related issue(s)
- closes #2215

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2023-04-05 07:03:37 +00:00
Dimitri Huisman
829c53cf75
Further improve releases.rst 2023-04-04 19:46:07 +00:00
bors[bot]
935329a7d2
Merge #2740
2740: Update dependencies with CVEs r=mergify[bot] a=Diman0

## What type of PR?

small bug-fix

## What does this PR do?
As discussed in mailu-dev channel, updates dependencies that have known CVEs.

### Related issue(s)

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2023-04-04 15:27:50 +00:00
Dimitri Huisman
5f14c8ced1
Fix unmet dependency 2023-04-04 12:51:59 +00:00
Dimitri Huisman
a2655e3c79
Update dependencies with CVEs 2023-04-04 12:35:27 +00:00
bors[bot]
d66ddb0f3e
Merge #2738
2738: Make ratelimit exemptions less generous r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

Make ratelimit exemptions less generous, as discussed on #mailu-dev

### Related issue(s)

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2023-04-04 12:17:27 +00:00
Florent Daigniere
94ef62a884 Don't rate-limit port 25, ever. 2023-04-04 12:47:11 +02:00