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

3237 Commits

Author SHA1 Message Date
bors[bot]
65d905fe62
Merge #2099
2099: update Dockerfile to alpine 3.14.3 r=mergify[bot] a=willofr

## What type of PR?
Security fix

## What does this PR do?
Updated the Dockerfile to use the latest alpine version 3.14.3 where several CVEs have been fixed: https://alpinelinux.org/posts/Alpine-3.14.3-released.html
New images successfully built on my test env.

### Related issue(s)
None

## 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: Will <will@packer-output-c8fcfb40-3d93-4475-8f87-e14a9dd683b6>
Co-authored-by: willofr <willofr@users.noreply.github.com>
2021-12-31 12:06:53 +00:00
bors[bot]
3eca813182
Merge #2116
2116: fix 2114: redirect old path r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Old paths may still be cached in browsers, it's easy enough to redirect them

### Related issue(s)
- close #2114


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2021-12-30 15:24:51 +00:00
bors[bot]
4e358e91e1
Merge #2111
2111: Preparations for 1.9 release r=mergify[bot] a=Diman0

## What type of PR?

Preparations for 1.9 release.

## What does this PR do?
All changes required for the 1.9 release. This PR does not trigger the 1.9 release yet. For that we only have to create a 1.9 branch after this PR has been merged.

Please double check all the documentation. Feel free to directly commit to this branch any spelling errors you see.

After this is merged, I only have to create the 1.9 branch and update the infra project to release 1.9.

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

## 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@freenetproject.org>
Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>
2021-12-30 15:05:29 +00:00
bors[bot]
0bdb508824
Merge #2115
2115: Update AUTHORS.md r=mergify[bot] a=ghostwheel42

Update AUTHORS.md

Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>
2021-12-30 14:32:11 +00:00
Florent Daigniere
c4675e6e75 fix 2114: redirect old path 2021-12-30 15:29:56 +01:00
Alexander Graf
d29afea5ba
Update AUTHORS.md 2021-12-30 15:28:24 +01:00
Alexander Graf
9d904d1db9
changed semver example to 1.9.x 2021-12-30 15:21:22 +01:00
Florent Daigniere
0298d51003 my edits 2021-12-30 13:00:22 +01:00
Dimitri Huisman
cfd6e91c29 Forgot to mention that Mailu PostgreSQL is deprecated. 2021-12-29 15:17:48 +00:00
Dimitri Huisman
b4d3d4b3c9 Preparations for 1.9 release. 2021-12-29 14:40:45 +00:00
bors[bot]
14177c3f98
Merge #2097
2097: The DB_PORT and ROUNDCUBE_DB_PORT env vars were not used r=mergify[bot] a=Diman0

## What type of PR?

Bug fix

## What does this PR do?
The DB_PORT and ROUNDCUBE_DB_PORT env vars were not used and are not required. 
This PR removes these not used environment variables from the documentation.
The documentation and setup utility are enhanced with instructions how to specify a different port for the database url.

### Related issue(s)
- See #2073


## 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>
2021-12-28 12:56:54 +00:00
bors[bot]
a2b3b44947
Merge #2109
2109: Update AUTHORS.md r=mergify[bot] a=nextgens

Update AUTHORS.md

Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
2021-12-28 10:32:11 +00:00
Florent Daigniere
6afdd4d000
Update AUTHORS.md 2021-12-25 17:12:14 +01:00
bors[bot]
23537b513d
Merge #2108
2108: Fix build dependencies pycares r=mergify[bot] a=Erriez

## What type of PR?

Fix missing build dependencies `postfix-mta-sts-resolver` for `pycares` which requires `py3-wheel` and `libffi-dev` packages.
Restore virtual build in single RUN line.

## What does this PR do?

### Related issue(s)
- Mention an issue like: #2106
- Auto close an issue like: closes #2106

Co-authored-by: Erriez <Erriez@users.noreply.github.com>
2021-12-24 15:03:24 +00:00
Erriez
4b0694705c Fix build dependencies pycares 2021-12-24 12:17:57 +01:00
bors[bot]
3be34eaa3e
Merge #2107
2107: Remove weblate from documentation r=mergify[bot] a=Diman0

## What type of PR?

documentation

## What does this PR do?
See #1869. The weblate instance is not available anymore. Therefore this not available weblate instance should not be mentioned in the documentation anymore.

This PR removes it from the documentation

### Related issue(s)
- #1869

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



Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2021-12-24 10:07:30 +00:00
Dimitri Huisman
c957911220 Remove weblate option from documentation since it is not available anymore. 2021-12-24 07:46:55 +00:00
bors[bot]
081d443d66
Merge #2101
2101: Fix documentation  INITIAL_ADMIN_* variables r=mergify[bot] a=Erriez

## What type of PR?

Fix `master` documentation `INITIAL_ADMIN_*` environment variables:
- `setup.rst`
- `configuration.rst`

## What does this PR do?

Fix documentation `Docker Compose setup` and `Web settings | Admin account`.

### Related issue(s)
- Mention an issue like: #2092
- Auto close an issue like: closes #2092

## 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: Erriez <Erriez@users.noreply.github.com>
2021-12-23 10:58:05 +00:00
bors[bot]
cd8479414e
Merge #2103
2103: Fix issue 2102 (bug introduced in 2098) r=mergify[bot] a=Diman0

## What type of PR?

Bug-fix

## What does this PR do?
The changes to session management introduced in #2094 #2098 introduced new bugs. This PR addresses these.

### Related issue(s)
- Auto close an issue like: closes #2102

## 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>
2021-12-22 18:39:15 +00:00
Erriez
10756cef7b Fix typo configuration.rst 2021-12-22 19:38:46 +01:00
Dimitri Huisman
51d94b8d14 Fix issue 2102 2021-12-22 17:40:51 +00:00
Erriez
4c52cf1d6a Rewording INITIAL_ADMIN_MODE documentation 2021-12-22 18:18:15 +01:00
Erriez
83d9a81f0f Fix documentation INITIAL_ADMIN_* variables 2021-12-22 15:00:39 +01:00
bors[bot]
ee5fc81b07
Merge #2098
2098: Sessions tweaks2 r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Additional tweaks suggested by `@ghostwheel42:`
- fix cleanup_sessions (important)
- ensure we delete tokens on delete()

Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2021-12-22 13:02:07 +00:00
willofr
83bd3b27aa
Create 2099.bugfix 2021-12-22 11:17:13 +01:00
Will
b2abbc8856 update Dockerfile to alpine 3.14.3 2021-12-22 09:19:44 +00:00
Florent Daigniere
bee6e980e3 doh 2021-12-21 16:23:27 +01:00
Florent Daigniere
6d5926ef29 prettify 2021-12-21 16:06:34 +01:00
Florent Daigniere
58d0faff7f ensure we clear the token on delete() 2021-12-21 15:59:00 +01:00
Florent Daigniere
2b29cfb3f0 fix cleanup_sessions() 2021-12-21 15:55:59 +01:00
Florent Daigniere
f0247a2faf Use self where appropriate 2021-12-21 15:45:05 +01:00
Florent Daigniere
c161a2c987 syntax 2021-12-21 15:42:12 +01:00
Dimitri Huisman
f9efbeb7c6 Remove not-used DB_PORT/ROUNDCUBE_DB_PORT environment variables. Document how to specify port for DB URL 2021-12-21 14:02:13 +00:00
bors[bot]
18865bf03b
Merge #2094
2094: Sessions tweaks r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

- Make all sessions permanent, introduce SESSION_TIMEOUT and PERMANENT_SESSION_LIFETIME.
- Prevent the creation of a session before there is a login attempt
- Ensure that webmail tokens are in sync with sessions

### Related issue(s)
- close #2080 

## 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: Dimitri Huisman <diman@huisman.xyz>
2021-12-21 13:08:48 +00:00
bors[bot]
3e123f7de5
Merge #2096
2096: Fix missing edit buttons in alias, relay and fetchmail lists in admin. r=mergify[bot] a=Diman0

## What type of PR?

bug fix

## What does this PR do?
With the upgrade to the new AdminLTE version, we forgot to update a couple classes from fa-pencil to fa-pencil-alt. As a result the edit button was missing in a couple of list views:
- Alias
- Fetched accounts 
- Relayed domains

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

## 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] 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>
2021-12-21 12:46:33 +00:00
Dimitri Huisman
d40be05117 Fix missing edit buttons in alias, relay and fetchmail lists in admin. 2021-12-21 12:10:04 +00:00
Florent Daigniere
a28c7f903e do it once 2021-12-21 09:50:01 +01:00
Dimitri Huisman
385cb28bf2 Correctly calculate and set SESSION_TIMEOUT in roundcube 2021-12-20 22:13:18 +00:00
Dimitri Huisman
ab80316df6 Fix error in roundcube config 2021-12-20 21:24:03 +00:00
Dimitri Huisman
f88daa1e77 Add missing cast to int 2021-12-20 21:07:25 +00:00
Florent Daigniere
3a46ee073c Make roundcube use SESSION_TIMEOUT 2021-12-20 11:36:56 +01:00
Florent Daigniere
5f313310d4 regenerate() shouldn't extend lifetime 2021-12-20 09:37:11 +01:00
Florent Daigniere
5fe5c80064 Merge remote-tracking branch 'upstream/master' into sessions-tweaks 2021-12-19 23:31:58 +01:00
Florent Daigniere
dc275db482 towncrier 2021-12-19 23:28:10 +01:00
Florent Daigniere
fe18cf9743 Fix 2080
Ensure that webmail tokens are in sync with sessions
2021-12-19 23:24:44 +01:00
Florent Daigniere
c6aefd8e04 towncrier 2021-12-19 20:57:52 +01:00
Florent Daigniere
02c93c44f2 Tweak sessions
simplify:
- make all sessions permanent by default
- update the TTL of sessions on access (save always)
- fix session-expiry, modulo 8byte precision
2021-12-19 20:52:51 +01:00
Florent Daigniere
ea96a68eb4 don't create a session if we don't have to 2021-12-19 20:48:29 +01:00
bors[bot]
c5966b29db
Merge #2035
2035: updated roundcube to 1.5.1 and carddav to 4.3.0 r=mergify[bot] a=ghostwheel42

## What type of PR?

enhancement

## What does this PR do?

updated roundcube to 1.5 and carddav to 4.2.2
also runs cleanup cronjob _once_ at startup

### Related issue(s)

- closes #2031 
- runs cleanup job mentioned in #1702 at startup

## 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: Alexander Graf <ghostwheel42@users.noreply.github.com>
2021-12-19 16:19:05 +00:00
Alexander Graf
698f91de95
Merge remote-tracking branch 'upstream/master' into update_roundcube 2021-12-18 18:03:11 +01:00