self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-08-10 22:31:47 +02:00
Code Issues Releases Activity

Update rspamd.py

Browse Source 
Ensure we IDNA encode DKIM/ARC domains and their alternatives
This commit is contained in:
Florent Daigniere
2025-02-16 11:02:35 +01:00
committed by GitHub
parent cc7f94d5f6
commit 1f7a1fa727
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/admin/mailu/internal/views/rspamd.py
View File

@@ -25,8 +25,6 @@ def rspamd_dkim_key(domain_name):
'selector': flask.current_app.config.get('DKIM_SELECTOR', 'dkim'), 'selector': flask.current_app.config.get('DKIM_SELECTOR', 'dkim'),
} }
) )
<<<<<<< HEAD
=======
elif domain := models.Alternative.query.get(domain_name): elif domain := models.Alternative.query.get(domain_name):
if key := domain.domain.dkim_key: if key := domain.domain.dkim_key:
selectors.append( selectors.append(
@@ -36,7 +34,6 @@ def rspamd_dkim_key(domain_name):
'selector': flask.current_app.config.get('DKIM_SELECTOR', 'dkim'), 'selector': flask.current_app.config.get('DKIM_SELECTOR', 'dkim'),
} }
) )
>>>>>>> 35ffcb07 (added idna function to perform puny encoding on IDN domains)
return flask.jsonify({'data': {'selectors': selectors}}) return flask.jsonify({'data': {'selectors': selectors}})
@internal.route("/rspamd/local_domains", methods=['GET']) @internal.route("/rspamd/local_domains", methods=['GET'])