Improve sender checks #633
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Please base the merge against master. |
muhlemmer
requested changes
Oct 15, 2018
There was a problem hiding this comment.
Test environment:
git clone https://github.com/Mailu/Mailu.git
cd Mailu
git remote add kaiyou https://github.com/kaiyou/Mailu.git
git fetch --all
git checkout kaiyou/fix-sender-checks
# Detached head warnings
git merge origin/master
docker-compose -f tests/build.yml
cd ~
docker-compose up -d
Problem: cannot login using webmail or IMAP.
SMTP untested, as I'm unable to create new user accounts in Thunderbird when IMAP login fails.
Log entries from webmail login. Note that docker-compose logs messes up the event order a bit. Probably due to output buffering of the containers.
front_1 | 2018/10/15 13:30:35 [info] 10#10: *84 client 172.24.0.7:32796 connected to 0.0.0.0:10143
admin_1 | [2018-10-15 13:30:35,121] ERROR in app: Exception on /internal/auth/email [GET]
admin_1 | Traceback (most recent call last):
admin_1 | File "/usr/local/lib/python3.7/site-packages/flask/app.py", line 1982, in wsgi_app
admin_1 | response = self.full_dispatch_request()
admin_1 | File "/usr/local/lib/python3.7/site-packages/flask/app.py", line 1614, in full_dispatch_request
admin_1 | rv = self.handle_user_exception(e)
admin_1 | File "/usr/local/lib/python3.7/site-packages/flask/app.py", line 1517, in handle_user_exception
admin_1 | reraise(exc_type, exc_value, tb)
admin_1 | File "/usr/local/lib/python3.7/site-packages/flask/_compat.py", line 33, in reraise
admin_1 | raise value
admin_1 | File "/usr/local/lib/python3.7/site-packages/flask/app.py", line 1612, in full_dispatch_request
admin_1 | rv = self.dispatch_request()
admin_1 | File "/usr/local/lib/python3.7/site-packages/flask/app.py", line 1598, in dispatch_request
admin_1 | return self.view_functions[rule.endpoint](**req.view_args)
admin_1 | File "/usr/local/lib/python3.7/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 17, in nginx_authentication
admin_1 | headers = nginx.handle_authentication(flask.request.headers)
admin_1 | File "/app/mailu/internal/nginx.py", line 40, in handle_authentication
admin_1 | user = models.User.query.get(user_email)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/query.py", line 882, in get
admin_1 | ident, loading.load_on_ident)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/query.py", line 916, in _get_impl
admin_1 | return fallback_fn(self, key)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/loading.py", line 232, in load_on_ident
admin_1 | return q.one()
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/query.py", line 2848, in one
admin_1 | ret = self.one_or_none()
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/query.py", line 2818, in one_or_none
admin_1 | ret = list(self)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/loading.py", line 98, in instances
admin_1 | util.raise_from_cause(err)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/util/compat.py", line 203, in raise_from_cause
admin_1 | reraise(type(exception), exception, tb=exc_tb, cause=cause)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/util/compat.py", line 187, in reraise
admin_1 | raise value
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/loading.py", line 79, in instances
admin_1 | rows = [proc(row) for row in fetch]
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/loading.py", line 79, in <listcomp>
admin_1 | rows = [proc(row) for row in fetch]
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/loading.py", line 493, in _instance
admin_1 | loaded_instance, populate_existing, populators)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/orm/loading.py", line 593, in _populate_full
admin_1 | dict_[key] = getter(row)
admin_1 | File "/usr/local/lib/python3.7/site-packages/sqlalchemy/sql/type_api.py", line 1208, in process
admin_1 | return process_value(value, dialect)
admin_1 | File "/app/mailu/models.py", line 67, in process_result_value
admin_1 | return filter(bool, value.split(","))
admin_1 | AttributeError: 'NoneType' object has no attribute 'split'
admin_1 | 172.24.0.6 - - [15/Oct/2018:13:30:35 +0000] "GET /internal/auth/email HTTP/1.0" 500 291 "-" "-"
front_1 | 127.0.0.1 - - [15/Oct/2018:13:30:35 +0000] "GET /auth/email HTTP/1.0" 500 291 "-" "-"
front_1 | 2018/10/15 13:30:35 [error] 10#10: *84 auth http server 127.0.0.1:8000 did not send server or port while in http auth state, client: 172.24.0.7, server: 0.0.0.0:10143, login: "admin@usrpro.io"
webmail_1 | 172.24.0.6 - - [15/Oct/2018:13:30:35 +0000] "POST /?/Ajax/&q[]=/0/ HTTP/1.0" 200 517 "https://mail.usrpro.io/webmail/" "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0"
front_1 | 188.27.138.94 - - [15/Oct/2018:13:30:36 +0000] "POST /webmail/?/Ajax/&q[]=/0/ HTTP/1.1" 200 107 "https://mail.usrpro.io/webmail/" "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0"
antispam_1 | 2018-10-15 13:30:48 #8(controller) <9peez3>; lua; neural.lua:810: check ANN tRFANNC860F9EA0C1BA360260
antispam_1 | 2018-10-15 13:30:48 #8(controller) <9peez3>; lua; neural.lua:822: no need to learn ANN tRFANNC860F9EA0C1BA360260 0 learn vectors (1000 required)
admin_1 | 172.24.0.4 - - [15/Oct/2018:13:30:54 +0000] "GET /internal/fetch HTTP/1.1" 200 3 "-" "python-requests/2.19.1"
|
This should be fixed now |
|
I've tried to merge this on my test server, after handling the conflict I have all sorts of errors on the models. So probably I didn't do it right. I've been flipping though all kind of PR's the last hours. Different password encryption schemes and everything. I think I messed up somewhere. I'm giving up for today. |
|
Just fixed the merge conflict. I will have to test again, there might be some issues with interfering changes. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
muhlemmer
previously requested changes
Dec 4, 2018
Asterisk results in IDNA error and a 500 return code.
The value of `None` resulted in an error, since a list was expected.
muhlemmer
dismissed
their stale review
Original errors resolved. Started new round of testing
HorayNarea
approved these changes
Dec 5, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #390 and cleans most of the postfix views on top of the database abstraction code