5202 Commits

Author SHA1 Message Date
OutBackDingo
de66bd687d updated and merge conflicts fixed for mailu master 2025-05-23 08:45:00 +07:00
bors-mailu[bot]
4fc4237e23 Merge #3839
3839: fix #3836: healthcheck of clamav r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Fix the healthcheck of clamav

### Related issue(s)
- closes #3836 
- closes #3823
- closes #3741

## 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>
2025-05-08 13:07:59 +00:00
Florent Daigniere
8c2420d8cb fix #3836: healthcheck of clamav 2025-05-08 13:54:56 +02:00
Encotric
3c8c08af73 Merge branch 'master' of github.com:heviat/Mailu-OIDC 2025-04-04 18:17:54 +02:00
Encotric
b886dfda41 Add release notes 2025-04-04 18:17:10 +02:00
Sebastian
edd5fd7082 Merge pull request #68 from heviat/oidc-remove-redirect-url-env
Remove OIDC_REDIRECT_URL
2025-04-04 15:57:56 +00:00
Encotric
b43600dfca Remove OIDC_REDIRECT_URL 2025-04-04 17:47:55 +02:00
Sebastian
27c49c1c57 Merge pull request #67 from pbence/fix-default-value-evaluation
fix: correcly fallback to DOMAIN when OIDC_USER_DOMAIN is empty/none
2025-04-04 15:44:08 +00:00
Sebastian
7a6aac032d Merge pull request #66 from pbence/option-to-control-automatic-user-creation
Option to control automatic user creation
2025-04-04 15:42:26 +00:00
Encotric
c66333d510 Merge remote-tracking branch 'origin/master' into pr/pbence/66 2025-04-04 17:39:50 +02:00
Encotric
1a079a2d22 Try to fix CI secrets 2025-04-04 17:34:17 +02:00
Pőcze Bence
7931d2f634 correcly fallback to DOMAIN when OIDC_USER_DOMAIN is empty/none 2025-03-31 02:00:32 +02:00
Pőcze Bence
c1ec64084e add new option to readme 2025-03-31 01:57:40 +02:00
Pőcze Bence
7693b0ad39 add option to control automatic user creation 2025-03-31 01:57:40 +02:00
Encotric
4214a65d1a Add release notes 2025-03-30 19:46:56 +02:00
Encotric
8fc042d21a Update CI for master branch 2025-03-30 19:33:35 +02:00
Sebastian
3c7680622a Merge pull request #64 from pbence/allow-configure-username-and-domain
Allow configure username and domain
2025-03-30 17:14:30 +00:00
Encotric
eb6c3e47c8 fix: add default config values 2025-03-30 19:07:25 +02:00
Sebastian
15c9e1dcdd Merge branch 'master' into allow-configure-username-and-domain 2025-03-30 18:12:48 +02:00
Encotric
c7b1571f8a Merge branch 'master' into pr/pbence/64
Co-authored-by: Pőcze Bence <bence@pocze.ch>
2025-03-30 18:11:07 +02:00
Encotric
8e1d9d0476 Merge remote-tracking branch 'origin/oidc' 2025-03-30 18:02:24 +02:00
Pőcze Bence
d6de68e91b document the new config variables 2025-03-29 00:55:29 +01:00
Pőcze Bence
2a46097f04 allow configure domain if username is not an email address 2025-03-29 00:32:51 +01:00
Pőcze Bence
55e95a24cf allow configure username claim 2025-03-29 00:32:17 +01:00
Sebastian
c5576ba126 Merge pull request #63 from heviat/oidc-readme-patch
Remove OIDC_REDIRECT_URL
2025-03-27 18:02:11 +00:00
Sebastian Wilke
4ff17e272a Merge branch 'oidc-readme-patch' into oidc 2025-03-27 19:00:18 +01:00
Sebastian Wilke
6a7b4d50d0 Remove OIDC_REDIRECT_URL 2025-03-27 18:59:42 +01:00
Encotric
e5e46126de Cleanup: imports in oidc.py 2025-03-16 21:23:22 +01:00
Encotric
9ed141c761 Fir: Redirect to request hostname instead of first hostname
Redirects the user to the same hostname the request was made to if the hostname is in the list of allowed hostnames (`HOSTNAMES` env variable)

Co-authored-by: Wombosvideo <luca.bosin@heviat.com>
2025-03-16 21:17:10 +01:00
bors-mailu[bot]
1c362b4af0 Merge #3790
3790: Replace marshmallow missing with load_default r=mergify[bot] a=DjVinnii

## What type of PR?

Enhancement

## What does this PR do?
Replace the `missing` parameter with `load_default`. This changed in version 3.13.0 of marshmallow (Mailu currently uses 3.21.2) and `missing` will be removed in marshmallow 4.

## 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: Vincent Kling <vkling@vinniict.nl>
2025-03-16 12:29:34 +00:00
Vincent Kling
29f42ed4eb Replace missing with load_default 2025-03-14 08:49:58 +01:00
Encotric
31b734b170 Merge branch 'oidc' of https://github.com/heviat/Mailu-OIDC into oidc 2025-03-11 23:22:22 +01:00
Encotric
4247ff7909 Add release notes 2025-03-11 23:22:19 +01:00
Sebastian
9b999e13e0 Merge branch '2024.06' into oidc 2025-03-11 23:21:04 +01:00
Encotric
d238a308ac Fix permission wrapper 2025-03-11 23:18:20 +01:00
Encotric
1a3efba7be Fix #54 2025-03-11 23:18:10 +01:00
Encotric
d31aee9bce 2025-03-11 22:48:57 +01:00
Encotric
3a61d6afbc Add EICAR test 2024.06.14 2025-03-11 21:36:38 +01:00
Sebastian
5ddf773db4 Merge pull request #58 from heviat/oidc
Refactor OIDC client + Fix user info request
2025-03-11 21:25:01 +01:00
Encotric
217afcf48e Fix SonarCloud issues 2025-03-11 21:23:35 +01:00
Encotric
35046ad4e4 Add release notes 2025-03-11 21:14:17 +01:00
Encotric
4fb34cb0ba Fix token parameter naming in user info request (#50) 2025-03-11 21:02:04 +01:00
bors-mailu[bot]
8924846a7c Merge #3729
3729: Allow setting collation via env variable and add uvloop r=mergify[bot] a=Grennith

## What type of PR?

Enhancement / Bugfix

## What does this PR do?

As of https://github.com/Mailu/Mailu/pull/3701, the collation shall be set by overwriting `SQLALCHEMY_DATABASE_URI` to contain the collation of the related DB. However, this is currently not possible in the Helm chart of Mailu at all. It's statically set there and would also require not setting DB_NAME etc. to not have it overwritten, see https://github.com/Mailu/Mailu/blob/master/core/admin/mailu/configuration.py#L144

Additionally, uvloop is added to the prod requirements of which postfix-mta-sts-resolver makes use of.

### Related issue(s)
- Mention an issue like: #3449 

## 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
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Till Skrodzki <till@mueskro.de>
2025-02-28 23:33:12 +00:00
Till Skrodzki
ebd3459738 Add towncrier entry for PR #3729 2025-02-24 21:05:38 +01:00
Encotric
e77a5d09c0 Add lazy provider info retrival 2025-02-24 18:33:57 +01:00
Encotric
4be260091b Fix example 2025-02-24 18:33:01 +01:00
Sebastian
7e2d7b706b Merge pull request #55 from heviat/oidc-readme-patch
Update README.md
2025-02-20 13:22:43 +00:00
Sebastian
7c32a1f882 Update README.md 2025-02-20 14:22:18 +01:00
Encotric
36ada96bae Merge remote-tracking branch 'origin/2024.06' into oidc 2025-02-20 12:19:40 +01:00
Encotric
cd93f19b08 Merge branch '2024.06' into oidc 2025-02-20 12:18:39 +01:00