public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[Web] Allow to split DKIM every 255 chars via vars.inc.php (fixes #3473)
1e9c5baa
data/web/inc/functions.dkim.inc.php | 8 +++++++-
data/web/inc/vars.inc.php | 3 +--
2 files changed, 8 insertions(+), 3 deletions(-)Diff
diff --git a/data/web/inc/functions.dkim.inc.php b/data/web/inc/functions.dkim.inc.php
index 61ec54d6..24f296c8 100644
--- a/data/web/inc/functions.dkim.inc.php
+++ b/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));
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 0f8cf259..698d4252 100644
--- a/data/web/inc/vars.inc.php
+++ b/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;