From 1f7a1fa727560f407773eced4b40fcd7db7816f7 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Sun, 16 Feb 2025 11:02:35 +0100 Subject: [PATCH] Update rspamd.py Ensure we IDNA encode DKIM/ARC domains and their alternatives --- core/admin/mailu/internal/views/rspamd.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/admin/mailu/internal/views/rspamd.py b/core/admin/mailu/internal/views/rspamd.py index ea54ae29..a513a113 100644 --- a/core/admin/mailu/internal/views/rspamd.py +++ b/core/admin/mailu/internal/views/rspamd.py @@ -25,8 +25,6 @@ def rspamd_dkim_key(domain_name): '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( @@ -36,7 +34,6 @@ def rspamd_dkim_key(domain_name): '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'])