From de09fb4f36051f7d6868b4ecaceb828c1059ef4f Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 26 May 2021 15:16:22 +0200 Subject: [PATCH] Trust - Distinguished name - Organisation validations, cleanup https://github.com/opnsense/core/pull/5010 --- src/www/system_camanager.php | 4 ++-- src/www/system_certmanager.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/www/system_camanager.php b/src/www/system_camanager.php index 8f4812d6a..9558a118d 100644 --- a/src/www/system_camanager.php +++ b/src/www/system_camanager.php @@ -323,9 +323,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } } elseif ($reqdfields[$i] == "dn_organization") { if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\"\']/", $pconfig["dn_organization"])) { - $input_errors[] = gettext("The field 'Distinguished name Organization' contains invalid characters."); + $input_errors[] = sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i]); } - } elseif (($reqdfields[$i] != "descr" && $reqdfields[$i] != "dn_organization") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig["$reqdfields[$i]"])) { + } elseif ($reqdfields[$i] != "descr" && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig["$reqdfields[$i]"])) { $input_errors[] = sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i]); } } diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php index b7b7b7587..86fe83bfe 100644 --- a/src/www/system_certmanager.php +++ b/src/www/system_certmanager.php @@ -581,7 +581,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\"\']/", $pconfig[$reqdfields[$i]])) { $input_errors[] = sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i]); } - } elseif (($reqdfields[$i] != "descr" && $reqdfields[$i] != "csr" && $reqdfields[$i] != "csr_dn_organization" && $reqdfields[$i] != "dn_organization") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig[$reqdfields[$i]])) { + } elseif ($reqdfields[$i] != "descr" && $reqdfields[$i] != "csr" && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig[$reqdfields[$i]])) { $input_errors[] = sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i]); } }