From 76c747041dcbe9f502d35efca808ba776c710ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Wed, 25 Jul 2018 00:54:37 +0200 Subject: [PATCH] [Web] DNS check: only look for v=dkim1, k=rsa and p=key --- data/web/inc/ajax/dns_diagnostics.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/web/inc/ajax/dns_diagnostics.php b/data/web/inc/ajax/dns_diagnostics.php index 23d99041..45ff07e2 100644 --- a/data/web/inc/ajax/dns_diagnostics.php +++ b/data/web/inc/ajax/dns_diagnostics.php @@ -368,8 +368,9 @@ foreach ($records as $record) { elseif ($current['type'] == 'TXT' && stripos($current['txt'], 'v=dkim') === 0 && stripos($record[2], 'v=dkim') === 0) { - $current['txt'] = str_replace(' ', '', $current['txt']); - if ($current[$data_field[$current['type']]] == $record[2]) { + preg_match('/v=DKIM1;.*k=rsa;.*p=(.*)/i', $current[$data_field[$current['type']]], $dkim_matches_current); + preg_match('/v=DKIM1;.*k=rsa;.*p=(.*)/i', $record[2], $dkim_matches_good); + if ($dkim_matches_current[1] == $dkim_matches_good[1]) { $state = state_good; } }