From b563c223bf02f0fd04868cbddbeda1a81762882d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 30 Sep 2024 13:19:26 +0200
Subject: [PATCH] system: closelog() has timing issues

Not sure where this comes from but the concensus is that
closelog() is relatively useless and testing verifies that
it works as expected without it.

Now we just have to make sure that each component using
openlog() will reopen the actual GUI log so that it can
keep logging correctly.
---
 src/etc/inc/config.inc                                   | 2 --
 src/etc/inc/filter.inc                                   | 3 ---
 src/etc/inc/plugins.inc.d/unbound.inc                    | 1 -
 src/etc/inc/plugins.inc.d/wireguard.inc                  | 5 -----
 src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php | 1 -
 src/opnsense/scripts/Wireguard/wg-service-control.php    | 1 -
 src/opnsense/scripts/openvpn/client_connect.php          | 1 -
 src/opnsense/scripts/openvpn/ovpn_service_control.php    | 2 --
 src/opnsense/scripts/openvpn/tls_verify.php              | 6 ++----
 src/opnsense/scripts/openvpn/user_pass_verify.php        | 1 -
 10 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc
index 3de930f13..0eeee3186 100644
--- a/src/etc/inc/config.inc
+++ b/src/etc/inc/config.inc
@@ -84,8 +84,6 @@ function reopenlog()
 
 reopenlog();
 
-register_shutdown_function('closelog');
-
 require_once("xmlparse.inc");
 require_once("legacy_bindings.inc");
 require_once("certs.inc");
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index e103a636b..16cb1c02b 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -267,7 +267,6 @@ function filter_configure_sync($verbose = false, $load_aliases = true)
 
         unset($fobj);
 
-        closelog();
         reopenlog();
 
         service_log("done.\n", $verbose);
@@ -407,7 +406,6 @@ function filter_configure_sync($verbose = false, $load_aliases = true)
 
         unset($fobj);
 
-        closelog();
         reopenlog();
 
         service_log("failed.\n", $verbose);
@@ -442,7 +440,6 @@ function filter_configure_sync($verbose = false, $load_aliases = true)
 
     unset($fobj);
 
-    closelog();
     reopenlog();
 
     service_log("done.\n", $verbose);
diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index 28fa838ee..1a539956d 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -621,6 +621,5 @@ function unbound_add_host_entries($ifconfig_details)
 
     file_put_contents('/var/unbound/host_entries.conf', $unbound_entries);
 
-    closelog();
     reopenlog();
 }
diff --git a/src/etc/inc/plugins.inc.d/wireguard.inc b/src/etc/inc/plugins.inc.d/wireguard.inc
index 0817aa223..4d67bc717 100644
--- a/src/etc/inc/plugins.inc.d/wireguard.inc
+++ b/src/etc/inc/plugins.inc.d/wireguard.inc
@@ -181,14 +181,9 @@ function wireguard_sync($verbose = false)
 
     service_log('Synchronizing WireGuard VPN...', $verbose);
 
-    openlog('wireguard', LOG_ODELAY, LOG_AUTH);
-
     foreach ($instances as $device => $config) {
         mwexecf('/usr/bin/wg syncconf %s %s', [$device, $config]);
     }
 
-    closelog();
-    reopenlog();
-
     service_log("done.\n", $verbose);
 }
diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
index fdae860e7..0189ca669 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
@@ -619,7 +619,6 @@ class OpenVPN extends BaseModel
                             $options[$opt] = str_replace(',', ':', (string)$node->$opt);
                         }
                     }
-
                 }
                 $options['persist-tun'] = null;
                 $options['persist-key'] = null;
diff --git a/src/opnsense/scripts/Wireguard/wg-service-control.php b/src/opnsense/scripts/Wireguard/wg-service-control.php
index 1d070811d..f7929b852 100755
--- a/src/opnsense/scripts/Wireguard/wg-service-control.php
+++ b/src/opnsense/scripts/Wireguard/wg-service-control.php
@@ -337,4 +337,3 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
         configd_run('filter reload');
     }
 }
-closelog();
diff --git a/src/opnsense/scripts/openvpn/client_connect.php b/src/opnsense/scripts/openvpn/client_connect.php
index 83b55216a..f6dcd1bd6 100755
--- a/src/opnsense/scripts/openvpn/client_connect.php
+++ b/src/opnsense/scripts/openvpn/client_connect.php
@@ -52,5 +52,4 @@ if ($server) {
     }
 }
 
-closelog();
 exit(0);
diff --git a/src/opnsense/scripts/openvpn/ovpn_service_control.php b/src/opnsense/scripts/openvpn/ovpn_service_control.php
index 512c45f45..42bcf3e69 100755
--- a/src/opnsense/scripts/openvpn/ovpn_service_control.php
+++ b/src/opnsense/scripts/openvpn/ovpn_service_control.php
@@ -229,6 +229,4 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
             }
         }
     }
-
-    closelog();
 }
diff --git a/src/opnsense/scripts/openvpn/tls_verify.php b/src/opnsense/scripts/openvpn/tls_verify.php
index e655a293c..25cc8678e 100755
--- a/src/opnsense/scripts/openvpn/tls_verify.php
+++ b/src/opnsense/scripts/openvpn/tls_verify.php
@@ -71,9 +71,7 @@ openlog("openvpn", LOG_ODELAY, LOG_AUTH);
 $response = do_verify(getenv('auth_server'));
 if ($response !== true) {
     syslog(LOG_WARNING, "tls-verify : {$response}");
-    closelog();
     exit(1);
-} else {
-    closelog();
-    exit(0);
 }
+
+exit(0);
diff --git a/src/opnsense/scripts/openvpn/user_pass_verify.php b/src/opnsense/scripts/openvpn/user_pass_verify.php
index c0e3ed8cd..24d6e6c94 100755
--- a/src/opnsense/scripts/openvpn/user_pass_verify.php
+++ b/src/opnsense/scripts/openvpn/user_pass_verify.php
@@ -161,7 +161,6 @@ $response = do_auth($parms['common_name'], $parms['auth_server'], $parms['auth_m
 if (is_string($response)) {
     // send failure message to log
     syslog(LOG_WARNING, $response);
-    closelog();
 }
 
 if (!empty($parms['auth_defer'])) {