From 39555fc3269a2d42dffbb389e7761c28f07b8bd9 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 9 Mar 2021 14:42:07 +0100
Subject: [PATCH] Remove any non-printable characters from the
logging.processname
---
lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php | 3 ++-
lib/SimpleSAML/Logger/FileLoggingHandler.php | 4 +++-
lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php | 3 ++-
lib/SimpleSAML/Logger/SyslogLoggingHandler.php | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php b/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
index 5d5f6cafe..77ef47087 100644
--- a/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
@@ -48,7 +48,8 @@ class ErrorLogLoggingHandler implements LoggingHandlerInterface
*/
public function __construct(Configuration $config)
{
- $this->processname = $config->getString('logging.processname', 'SimpleSAMLphp');
+ // Remove any non-printable characters before storing
+ $this->processname = preg_replace('/[\x00-\x1F\x7F\xA0]/u', '', $config->getString('logging.processname', 'SimpleSAMLphp'));
}
diff --git a/lib/SimpleSAML/Logger/FileLoggingHandler.php b/lib/SimpleSAML/Logger/FileLoggingHandler.php
index 745a1ed6a..c07ec21fe 100644
--- a/lib/SimpleSAML/Logger/FileLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/FileLoggingHandler.php
@@ -57,7 +57,9 @@ class FileLoggingHandler implements LoggingHandlerInterface
// get the metadata handler option from the configuration
$this->logFile = $config->getPathValue('loggingdir', 'log/') .
$config->getString('logging.logfile', 'simplesamlphp.log');
- $this->processname = $config->getString('logging.processname', 'SimpleSAMLphp');
+
+ // Remove any non-printable characters before storing
+ $this->processname = preg_replace('/[\x00-\x1F\x7F\xA0]/u', '', $config->getString('logging.processname', 'SimpleSAMLphp'));
if (@file_exists($this->logFile)) {
if (!@is_writeable($this->logFile)) {
diff --git a/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php b/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php
index 02b31eab8..9a803d1f2 100644
--- a/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php
@@ -23,7 +23,8 @@ class StandardErrorLoggingHandler extends FileLoggingHandler
*/
public function __construct(Configuration $config)
{
- $this->processname = $config->getString('logging.processname', 'SimpleSAMLphp');
+ // Remove any non-printable characters before storing
+ $this->processname = preg_replace('/[\x00-\x1F\x7F\xA0]/u', '', $config->getString('logging.processname', 'SimpleSAMLphp'));
$this->logFile = 'php://stderr';
}
}
diff --git a/lib/SimpleSAML/Logger/SyslogLoggingHandler.php b/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
index 49da62d82..34383c066 100644
--- a/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
@@ -31,7 +31,8 @@ class SyslogLoggingHandler implements LoggingHandlerInterface
{
$facility = $config->getInteger('logging.facility', defined('LOG_LOCAL5') ? constant('LOG_LOCAL5') : LOG_USER);
- $processname = $config->getString('logging.processname', 'SimpleSAMLphp');
+ // Remove any non-printable characters before storing
+ $processname = preg_replace('/[\x00-\x1F\x7F\xA0]/u', '', $config->getString('logging.processname', 'SimpleSAMLphp'));
// Setting facility to LOG_USER (only valid in Windows), enable log level rewrite on windows systems
if (Utils\System::getOS() === Utils\System::WINDOWS) {
--
GitLab