From f670a8074a45e0c9fe9cacaab30580389e9b1966 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 8 Sep 2023 08:31:41 -0500
Subject: [PATCH] Fix .env quoting issue (#15298)

Triggered when password contains # and .env file uses windows line returns.

Friends don't let friends use windows line returns
---
 LibreNMS/Util/EnvHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LibreNMS/Util/EnvHelper.php b/LibreNMS/Util/EnvHelper.php
index e70d46b10d..4e9510aeb5 100644
--- a/LibreNMS/Util/EnvHelper.php
+++ b/LibreNMS/Util/EnvHelper.php
@@ -163,7 +163,7 @@ class EnvHelper
             $parts = explode('=', $line, 2);
             if (isset($parts[1])
                 && preg_match('/(?<!\s)#/', $parts[1]) // number symbol without a space before it
-                && ! preg_match('/^(".*"|\'.*\')$/', $parts[1]) // not already quoted
+                && ! preg_match('/^(".*"|\'.*\')$/', trim($parts[1])) // not already quoted
             ) {
                 return trim($parts[0]) . '="' . trim($parts[1]) . '"';
             }