Tim Möhlmann
a2a9512afa
Enable mergify strict mode
...
In the past we had strict mode in branch protection. This didn't really work as it broke mergify. Now mergify supports this options and takes care of the merging automatically. Let's see how it goes ;)
Reason is the recent build failures we had on master, during a busy merge day. This could have been prevented if sequential PR's where re-merging with master.
More info: https://doc.mergify.io/strict-workflow.html
2018-12-07 11:53:43 +02:00
Tim Möhlmann
f0906073e3
Merge remote-tracking branch 'upstream/master' into feat-subnet2
2018-12-07 11:08:28 +02:00
mergify[bot]
a634c7b72d
Merge pull request #725 from usrpro/fix-outlook2019-smtp
...
Add login method to smtp_auth under ssl
2018-12-06 16:02:35 +00:00
Tim Möhlmann
38eb266c25
Merge pull request #728 from usrpro/fix-autobuild
...
Fix autobuild
2018-12-06 17:41:43 +02:00
Tim Möhlmann
c0972face6
Correct subnetting functionality for the tests and setup
2018-12-06 16:44:12 +02:00
Ionut Filip
35be1710a6
Changed user creation command
2018-12-06 12:36:56 +02:00
Ionut Filip
8acf9451fa
Changed admin and user creation command
2018-12-06 12:34:56 +02:00
Tim Möhlmann
8172f3eab8
Move the Mailu Docker network to a fixed subnet.
...
This will make network configuration and host based authentication
more robust, across different deployment platforms.
The options `RELAYNETS` and`POD_ADDRESS_RANGE` are kept for compatibility.
However, their usage have become optional.
2018-12-06 12:08:22 +02:00
kaiyou
3d98124bcd
Merge pull request #670 from kaiyou/refactor-config
...
Refactor the admin architecture and configuration management
2018-12-06 10:56:42 +01:00
Tim Möhlmann
fee52e87ed
Don't allow for 1 review when review/need2 label is set
2018-12-06 11:34:28 +02:00
kaiyou
b6aaf57be1
Merge branch 'refactor-config' of github.com:kaiyou/mailu into refactor-config
2018-12-06 10:33:21 +01:00
kaiyou
d0f07984b0
Merge remote-tracking branch 'upstream/master' into refactor-config
2018-12-06 10:23:43 +01:00
kaiyou
07b1e8d765
Merge pull request #722 from usrpro/update-mergify
...
Update .mergify.yml
2018-12-06 10:19:07 +01:00
Tim Möhlmann
9dd447e23b
Add login method to smtp_auth under ssl
...
Fixes #704
2018-12-06 01:00:16 +02:00
Patrick Georgi
eac4d553a9
nginx: Allow extending config with overrides
...
To facilitate this, the default redirect at / can be disabled, even if
the default remains at redirecting to the webmailer.
The extensions are within the host scope and are read from
$ROOT/overrides/nginx/*.conf.
2018-12-05 23:54:52 +01:00
mergify[bot]
c25c646909
Merge pull request #702 from dani909/feat-image-prefix
...
Add docker image prefix
2018-12-05 19:24:07 +00:00
hoellen
02367d1447
Merge branch 'master' into feat-image-prefix
2018-12-05 19:48:51 +01:00
mergify[bot]
2d4bac03ad
Merge pull request #723 from usrpro/clean-healthcheck-logs
...
Admin: Prevent redirects during health checking
2018-12-05 18:09:14 +00:00
mergify[bot]
a382f74680
Merge pull request #705 from usrpro/fix-recaptcha
...
Fix recaptcha
2018-12-05 18:05:22 +00:00
mergify[bot]
ca86090011
Merge pull request #682 from usrpro/feat-setup
...
Further improve setup and neccesary re-write of the test suite
2018-12-05 17:57:41 +00:00
mergify[bot]
37027cfce7
Merge pull request #633 from kaiyou/fix-sender-checks
...
Improve sender checks
2018-12-05 16:03:24 +00:00
Tim Möhlmann
d18cf7cb25
Prevent redirects during health checking
2018-12-05 17:43:42 +02:00
Tim Möhlmann
d84254ccd8
Update user creation to python3
2018-12-05 16:23:16 +02:00
mergify[bot]
161b27a204
Merge pull request #719 from davidrothera/master
...
Query alternative table for domain matches
2018-12-05 12:37:13 +00:00
Tim Möhlmann
b564b879aa
Update .mergify.yml
...
- New syntax for mergify engine v. 2
- Relax review rules for trusted users
2018-12-05 12:38:06 +02:00
Tim Möhlmann
c9df311a0d
Set forward_destination to an empty list
...
The value of `None` resulted in an error, since a list was expected.
2018-12-04 16:22:18 +02:00
Tim Möhlmann
eff6c34632
Catch asterisk before resolve_domain
...
Asterisk results in IDNA error and a 500 return code.
2018-12-04 15:40:07 +02:00
David Rothera
88c174fb7a
Query alternative table for domain matches
...
At present postfix checks this view for matches in the domain table and is used to accept/deny messages sent into it however it never checks for matches in the alternative table.
Fixes #718
2018-12-02 11:21:42 +00:00
Tim Möhlmann
2b6f5ea3d0
Update setup's own docker-compose.yml file
2018-12-01 02:37:34 +02:00
Tim Möhlmann
eccadeca16
Merge pull request #8 from usrpro/feat-email-test
...
Feat email test
2018-11-09 12:58:32 +02:00
Ionut Filip
fed7146873
Captcha check on signup form
2018-11-09 12:30:49 +02:00
Tim Möhlmann
4783e61693
Fix password context
...
Fixes the following error:
```
admin_1 | [2018-11-09 09:44:10,533] ERROR in app: Exception on /internal/auth/email [GET]
admin_1 | Traceback (most recent call last):
admin_1 | File "/usr/lib/python3.6/site-packages/flask/app.py", line 2292, in wsgi_app
admin_1 | response = self.full_dispatch_request()
admin_1 | File "/usr/lib/python3.6/site-packages/flask/app.py", line 1815, in full_dispatch_request
admin_1 | rv = self.handle_user_exception(e)
admin_1 | File "/usr/lib/python3.6/site-packages/flask/app.py", line 1718, in handle_user_exception
admin_1 | reraise(exc_type, exc_value, tb)
admin_1 | File "/usr/lib/python3.6/site-packages/flask/_compat.py", line 35, in reraise
admin_1 | raise value
admin_1 | File "/usr/lib/python3.6/site-packages/flask/app.py", line 1813, in full_dispatch_request
admin_1 | rv = self.dispatch_request()
admin_1 | File "/usr/lib/python3.6/site-packages/flask/app.py", line 1799, in dispatch_request
admin_1 | return self.view_functions[rule.endpoint](**req.view_args)
admin_1 | File "/usr/lib/python3.6/site-packages/flask_limiter/extension.py", line 544, in __inner
admin_1 | return obj(*a, **k)
admin_1 | File "/app/mailu/internal/views/auth.py", line 18, in nginx_authentication
admin_1 | headers = nginx.handle_authentication(flask.request.headers)
admin_1 | File "/app/mailu/internal/nginx.py", line 48, in handle_authentication
admin_1 | if user.check_password(password):
admin_1 | File "/app/mailu/models.py", line 333, in check_password
admin_1 | context = User.pw_context
admin_1 | AttributeError: type object 'User' has no attribute 'pw_context'
```
2018-11-09 11:45:08 +02:00
kaiyou
72e1b444ca
Merge alembic migrations
2018-11-08 21:55:39 +01:00
kaiyou
5b769e23da
Merge branch 'master' into refactor-config
2018-11-08 21:43:05 +01:00
kaiyou
30716b8bdf
Update docs with the new flask command
2018-11-08 21:35:41 +01:00
kaiyou
02995f0a15
Add a mailu command line to flask
2018-11-08 21:29:30 +01:00
kaiyou
f9e30bd87c
Update the dockerfile and upgrade dependencies
2018-11-08 21:29:11 +01:00
kaiyou
4a7eb1eb6c
Explicitely declare flask migrate
2018-11-08 20:32:23 +01:00
kaiyou
2a8808bdec
Add the configuration table migration
2018-11-08 20:32:06 +01:00
kaiyou
f57d4859f3
Provide an in-context wrapper for getting users
2018-11-08 20:30:41 +01:00
kaiyou
f6013aa29f
Fix an old migration that was reading configuration before migrating
2018-11-08 20:30:20 +01:00
kaiyou
206cce0b47
Finish the configuration bits
2018-11-08 20:29:52 +01:00
mergify[bot]
5c24390114
Merge pull request #697 from HorayNarea/fix-missing-dkim
...
allow DKIM-signing if From-Header and Auth-User mismatch - fix #462
2018-11-08 17:24:51 +00:00
Ionut Filip
2a76451a98
Moved scripts to an external js file
2018-11-07 16:41:11 +02:00
Ionut Filip
1bbf3f235d
Using a new class when captcha is enabled
2018-11-07 09:58:49 +02:00
mergify[bot]
12689965bd
Merge pull request #699 from usrpro/fix-admin-bug
...
Fixed admin_1 errors in the logs
2018-11-06 18:10:52 +00:00
hoellen
680ad4b67a
Catching only ValueError
...
Co-Authored-By: ionutfilip <ionut.philip@gmail.com>
2018-11-05 19:36:28 +02:00
Ionut Filip
76d9fc3865
Rewrite of email test script and added eicar virus file
2018-11-05 17:28:40 +02:00
Ionut Filip
4032e7128d
Calling email test as hook with msg as arg
2018-11-05 12:34:52 +02:00
Ionut Filip
fca3dc4e70
Flushing stream before calling subprocess
2018-11-03 19:34:47 +02:00
