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

4394 Commits

Author SHA1 Message Date
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
Florent Daigniere
83ce32f73e Clarify 2023-04-04 11:57:37 +02:00
Florent Daigniere
ab7b82d05b Clarify 2023-04-04 11:33:34 +02:00
Florent Daigniere
040dd82d3e fix bug 2023-04-04 11:30:59 +02:00
Florent Daigniere
deb1893870 doh 2023-04-04 11:01:03 +02:00
Dimitri Huisman
ee252224b5
Process latest towncrier entries into changelog.md 2023-04-04 08:03:49 +00:00
Dimitri Huisman
e88fa6a1f5
Merge branch 'master' into new-release-mailu 2023-04-04 08:00:25 +00:00
Florent Daigniere
63ab4938c9 Fix doc 2023-04-04 09:21:24 +02:00
bors[bot]
b68e132369
Merge #2733
2733: Ensure we always ask for the existing password before allowing a change r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

Ensure we always ask for the existing password before allowing a change.

### 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-04 07:11:56 +00:00
bors[bot]
cae01a36b4
Merge #2732
2732: Only account for distinct attempts in rate limits r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

Only account for distinct attempts in rate limits. This is solving the problem related to users changing their passwords and having their client hammer the old credentials.

Reduce the default to 50 distinct passwords per day

### 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.

- [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: Florent Daigniere <nextgens@freenetproject.org>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
2023-04-03 20:40:10 +00:00
bors[bot]
61a41349b5
Merge #2734
2734: Fix setup r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Remove LOG_DRIVER which never worked and replace it with journald by default
Fix a bug where front may get attached to networks that don't exist (#2725 was incomplete)

### Related issue(s)
- #2725

## 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>
Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2023-04-03 17:30:12 +00:00
Dimitri Huisman
2ac8ba24b6
Make the journald container tag changes consistent 2023-04-03 17:27:30 +00:00
Florent Daigniere
96211df0c3
Update releases.rst 2023-04-03 18:02:03 +02:00
Florent Daigniere
353a7d4241
Update releases.rst 2023-04-03 17:47:39 +02:00
Dimitri Huisman
453acad21f
Initial changes for Mailu 2.0 release 2023-04-02 16:45:42 +00:00
Florent Daigniere
c0f1f58f55 No need for that 2023-04-02 18:03:44 +02:00
Florent Daigniere
3b6e1a0304 s/docker-/mailu-/g 2023-04-02 17:24:34 +02:00
Florent Daigniere
7dc2912770
Update core/admin/mailu/limiter.py
Co-authored-by: Dimitri Huisman <52963853+Diman0@users.noreply.github.com>
2023-04-02 17:11:16 +02:00