From 304a48b2311181ad2a78a5abab49579207427b96 Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Sat, 17 Oct 2026 19:07:04 +0200 Subject: [PATCH] exclude .onion domains from dkim feature --- www/admin.php | 56 +++++++++++++++++++++------------------- www/rspamd_dkim_keys.php | 4 +-- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/www/admin.php b/www/admin.php index bb9d90c..19b5ada 100644 --- a/www/admin.php +++ b/www/admin.php @@ -872,38 +872,40 @@ function send_edit_domain(): void value="1"> - -
-
-
-
- -
-
-
- - -
-
- + + +
+
+
+
+ +
+
+
+ + +
+
+ +
+
+ +
+
+
- -
-
- -
-
- -
+
diff --git a/www/rspamd_dkim_keys.php b/www/rspamd_dkim_keys.php index c235161..1821813 100644 --- a/www/rspamd_dkim_keys.php +++ b/www/rspamd_dkim_keys.php @@ -14,8 +14,8 @@ if ( ! in_array( $_SERVER[ 'REQUEST_METHOD' ], [ 'GET', 'HEAD' ], true ) || ! ha $stmt = get_db_instance()->query( "SELECT domain, dkim_key, dkim_selector FROM domain WHERE active = 1 ORDER BY domain;" ); $map_entries = []; while ( $domain = $stmt->fetch( PDO::FETCH_ASSOC ) ) { - if(empty($domain['dkim_key'])) { - continue; // Skip domains without DKIM keys + if(empty($domain['dkim_key']) || str_ends_with($domain['domain'], '.onion')) { + continue; // Skip domains without DKIM keys or onion domains } $ascii_domain = idn_to_ascii( $domain[ 'domain' ], IDNA_NONTRANSITIONAL_TO_ASCII ); $key = get_rsa_dkim_private_key_base64_der( $domain[ 'dkim_key' ] );