scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-01 02:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

added idna function to perform puny encoding on IDN domains

Browse Source 
(cherry picked from commit 35ffcb070d)

# Conflicts:
#	core/admin/mailu/internal/views/rspamd.py
This commit is contained in:
Jumper78
2025-02-14 16:19:20 +00:00
committed by Mergify
parent 6cead18ca2
commit 9db8ee4c98
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ from mailu import models
from mailu.internal import internal from mailu.internal import internal
import flask import flask
import idna
def vault_error(*messages, status=404): def vault_error(*messages, status=404):
return flask.make_response(flask.jsonify({'errors':messages}), status) return flask.make_response(flask.jsonify({'errors':messages}), status)
@@ -19,11 +20,23 @@ def rspamd_dkim_key(domain_name):
if key := domain.dkim_key: if key := domain.dkim_key:
selectors.append( selectors.append(
{ {
'domain' : domain.name, 'domain' : idna.encode(domain.name.lower()).decode('ascii'),
'key' : key.decode('utf8'), 'key' : key.decode('utf8'),
'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):
if key := domain.domain.dkim_key:
selectors.append(
{
'domain' : idna.encode(domain.name.lower()).decode('ascii'),
'key' : key.decode('utf8'),
'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'])