CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Revert dnspython to 1.x

Browse Source
This commit is contained in:
Raphael Michel
2022-01-26 16:15:12 +01:00
parent 6f30c347c0
commit 66f75a5614
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/control/views/mailsetup.py
View File

@@ -42,7 +42,8 @@ logger = logging.getLogger(__name__)
def get_spf_record(hostname): def get_spf_record(hostname):
try: try:
for resp in dns.resolver.resolve(hostname, 'TXT'): r = dns.resolver.Resolver()
for resp in r.query(hostname, 'TXT'):
data = b''.join(resp.strings).decode() data = b''.join(resp.strings).decode()
if data.lower().strip().startswith('v=spf1 '): # RFC7208, section 4.5 if data.lower().strip().startswith('v=spf1 '): # RFC7208, section 4.5
return data return data

2
src/setup.py
View File

@@ -190,7 +190,7 @@ setup(
'django-scopes==1.2.*', 'django-scopes==1.2.*',
'django-statici18n==2.1.*', 'django-statici18n==2.1.*',
'djangorestframework==3.12.*', 'djangorestframework==3.12.*',
'dnspython==2.2.*', 'dnspython<2.0', # do not upgrade, causes issues with eventlet / gunicorn 19 and we cannot upgrade gunicorn right now
'drf_ujson2==1.6.*', 'drf_ujson2==1.6.*',
'isoweek', 'isoweek',
'jsonschema', 'jsonschema',