You've already forked Mailu
mirror of
https://github.com/Mailu/Mailu.git
synced 2025-08-10 22:31:47 +02:00
added idna function to perform puny encoding on IDN domains
(cherry picked from commit 35ffcb070d
)
# Conflicts:
# core/admin/mailu/internal/views/rspamd.py
This commit is contained in:
@@ -2,6 +2,7 @@ from mailu import models
|
||||
from mailu.internal import internal
|
||||
|
||||
import flask
|
||||
import idna
|
||||
|
||||
def vault_error(*messages, status=404):
|
||||
return flask.make_response(flask.jsonify({'errors':messages}), status)
|
||||
@@ -19,11 +20,23 @@ def rspamd_dkim_key(domain_name):
|
||||
if key := domain.dkim_key:
|
||||
selectors.append(
|
||||
{
|
||||
'domain' : domain.name,
|
||||
'domain' : idna.encode(domain.name.lower()).decode('ascii'),
|
||||
'key' : key.decode('utf8'),
|
||||
'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}})
|
||||
|
||||
@internal.route("/rspamd/local_domains", methods=['GET'])
|
||||
|
Reference in New Issue
Block a user