Merge pull request #6182 from mailcow/fix/4518

FreddleSpl0it · web-flow · commit 6af907cff079 · 2024-11-20T13:11:34.000+01:00
[Web] allow dots in dkim selectors
diff --git a/data/web/inc/functions.dkim.inc.php b/data/web/inc/functions.dkim.inc.php
@@ -26,7 +26,7 @@ function dkim($_action, $_data = null, $privkey = false) {
           );
           continue;
         }
-        if (!ctype_alnum(str_replace(['-', '_'], '', $dkim_selector))) {
+        if (!ctype_alnum(str_replace(['-', '_', '.'], '', $dkim_selector))) {
           $_SESSION['return'][] = array(
             'type' => 'danger',
             'log' => array(__FUNCTION__, $_action, $_data),
@@ -188,7 +188,7 @@ function dkim($_action, $_data = null, $privkey = false) {
           return false;
         }
       }
-      if (!ctype_alnum($dkim_selector)) {
+      if (!ctype_alnum(str_replace(['-', '_', '.'], '', $dkim_selector))) {
         $_SESSION['return'][] = array(
           'type' => 'danger',
           'log' => array(__FUNCTION__, $_action, $_data),

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function dkim($_action, $_data = null, $privkey = false) {`
`26`	`26`	`);`
`27`	`27`	`continue;`
`28`	`28`	`}`
`29`		`- if (!ctype_alnum(str_replace(['-', '_'], '', $dkim_selector))) {`
	`29`	`+ if (!ctype_alnum(str_replace(['-', '_', '.'], '', $dkim_selector))) {`
`30`	`30`	`$_SESSION['return'][] = array(`
`31`	`31`	`'type' => 'danger',`
`32`	`32`	`'log' => array(__FUNCTION__, $_action, $_data),`
`@@ -188,7 +188,7 @@ function dkim($_action, $_data = null, $privkey = false) {`
`188`	`188`	`return false;`
`189`	`189`	`}`
`190`	`190`	`}`
`191`		`- if (!ctype_alnum($dkim_selector)) {`
	`191`	`+ if (!ctype_alnum(str_replace(['-', '_', '.'], '', $dkim_selector))) {`
`192`	`192`	`$_SESSION['return'][] = array(`
`193`	`193`	`'type' => 'danger',`
`194`	`194`	`'log' => array(__FUNCTION__, $_action, $_data),`