瀏覽代碼

[Web] Allow to split DKIM every 255 chars via vars.inc.php (fixes #3473)

andryyy 5 年之前
父節點
當前提交
1e9c5baab5
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 7 1
      data/web/inc/functions.dkim.inc.php
  2. 1 2
      data/web/inc/vars.inc.php

+ 7 - 1
data/web/inc/functions.dkim.inc.php

@@ -245,7 +245,13 @@ function dkim($_action, $_data = null) {
         else {
           $dkimdata['length'] = ">= 8192";
         }
-        $dkimdata['dkim_txt'] = 'v=DKIM1;k=rsa;t=s;s=email;p=' . $redis_dkim_key_data;
+        if ($GLOBALS['SPLIT_DKIM_255'] === true) {
+          $dkim_txt_tmp = str_split('v=DKIM1;k=rsa;t=s;s=email;p=' . $redis_dkim_key_data, 255);
+          $dkimdata['dkim_txt'] = sprintf('"%s"', implode('" "', $dkim_txt_tmp ) );
+        }
+        else {
+          $dkimdata['dkim_txt'] = 'v=DKIM1;k=rsa;t=s;s=email;p=' . $redis_dkim_key_data;
+        }
         $dkimdata['dkim_selector'] = $redis->hGet('DKIM_SELECTORS', $_data);
         if ($GLOBALS['SHOW_DKIM_PRIV_KEYS']) {
           $dkimdata['privkey'] = base64_encode($redis->hGet('DKIM_PRIV_KEYS', $dkimdata['dkim_selector'] . '.' . $_data));

+ 1 - 2
data/web/inc/vars.inc.php

@@ -130,8 +130,7 @@ $DOCKER_TIMEOUT = 60;
 $ANONYMIZE_IPS = true;
 
 // Split DKIM key notation (bind format)
-$SPLIT_DKIM_255 = true;
-
+$SPLIT_DKIM_255 = false;
 
 // OAuth2 settings
 $REFRESH_TOKEN_LIFETIME = 2678400;