pfSense

diff --git a/src/etc/inc/openvpn.attributes.php b/src/etc/inc/openvpn.attributes.php
index 292c2eea4d..a171fc0274 100644
--- a/src/etc/inc/openvpn.attributes.php
+++ b/src/etc/inc/openvpn.attributes.php
@@ -31,8 +31,10 @@ $rules = parse_cisco_acl($attributes, $dev);
 $filename = "{$g['tmp_path']}/ovpn_{$dev}_{$username}_{$untrusted_port}.rules";
 if (!empty($rules)) {
     @file_put_contents($filename, $rules);
+    file_put_contents('/tmp/_test.txt', "openvpn.attributes.php: Create $filename" . PHP_EOL, FILE_APPEND);
 } else {
     unlink_if_exists($filename);
+    file_put_contents('/tmp/_test.txt', "openvpn.attributes.php: Remove $filename" . PHP_EOL, FILE_APPEND);
 }

 ?>
diff --git a/src/etc/inc/openvpn.auth-user.php b/src/etc/inc/openvpn.auth-user.php
index 436c4e1bf6..dcafc8858b 100644
--- a/src/etc/inc/openvpn.auth-user.php
+++ b/src/etc/inc/openvpn.auth-user.php
@@ -130,6 +130,7 @@ if ($authenticated == false) {

 if (file_exists("/etc/inc/openvpn.attributes.php")) {
     include_once("/etc/inc/openvpn.attributes.php");
+    file_put_contents('/tmp/_test.txt', "openvpn.auth-user.php: Call openvpn.attributes.php" . PHP_EOL, FILE_APPEND);
 }

 $content = "";
@@ -156,6 +157,7 @@ if (isset($attributes['framed_ip'])) {

 if (!empty($content)) {
     @file_put_contents("{$g['tmp_path']}/{$username}", $content);
+    file_put_contents('/tmp/_test.txt', "openvpn.auth-user.php: Create {$g['tmp_path']}/{$username}" . PHP_EOL, FILE_APPEND);
 }

 syslog(LOG_NOTICE, "user '{$username}' authenticated");
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index 8b41dbc39b..b483ae1856 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -824,6 +824,7 @@ function openvpn_add_keyfile(& $data, & $conf, $mode_id, $directive, $opt = "")
     $fpath = "{$g['openvpn_base']}/{$mode_id}/{$directive}";
     openvpn_create_dirs();
     file_put_contents($fpath, base64_decode($data));
+    file_put_contents('/tmp/_test.txt', "openvpn.inc: Create {$fpath} [openvpn_add_keyfile()]" . PHP_EOL, FILE_APPEND);
     //chown($fpath, 'nobody');
     //chgrp($fpath, 'nobody');
     @chmod($fpath, 0600);
@@ -837,6 +838,7 @@ function openvpn_delete_tmp($mode, $id) {
     /* delete temporary files created by connect script */
     if (($mode == "server") && (isset($id))) {
         unlink_if_exists("{$g['tmp_path']}/ovpn_ovpns{$id}_*.rules");
+        file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$g['tmp_path']}/ovpn_ovpns{$id}_*.rules [openvpn_delete_tmp()]" . PHP_EOL, FILE_APPEND);
     }

     /* delete temporary files created by OpenVPN; only delete old files to
@@ -847,6 +849,7 @@ function openvpn_delete_tmp($mode, $id) {
         foreach ($tmpfiles as $tmpfile) {
             if ((time() - filemtime($tmpfile)) > 60) {
                 @unlink_if_exists($tmpfile);
+                file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$g['tmp_path']}/openvpn_cc*.tmp [openvpn_delete_tmp()]" . PHP_EOL, FILE_APPEND);
             }
         }
     }
@@ -1339,6 +1342,7 @@ function openvpn_reconfigure($mode, $settings) {
                 $userpass .= "\n";
             }
             file_put_contents($up_file, $userpass);
+            file_put_contents('/tmp/_test.txt', "openvpn.inc: Create {$up_file} [openvpn_reconfigure()]" . PHP_EOL, FILE_APPEND);
         }

         if ($settings['proxy_addr']) {
@@ -1348,6 +1352,7 @@ function openvpn_reconfigure($mode, $settings) {
                 $proxypas = "{$settings['proxy_user']}\n";
                 $proxypas .= "{$settings['proxy_passwd']}\n";
                 file_put_contents("{$g['openvpn_base']}/{$mode_id}/proxy_auth", $proxypas);
+                file_put_contents('/tmp/_test.txt', "openvpn.inc: Create {$g['openvpn_base']}/{$mode_id}/proxy_auth [openvpn_reconfigure()]" . PHP_EOL, FILE_APPEND);
             }
             $conf .= " \n";
         }
@@ -1385,6 +1390,8 @@ function openvpn_reconfigure($mode, $settings) {
             /* Cleanup old CA/CRL references */
             @unlink_if_exists("{$capath}/*.0");
             @unlink_if_exists("{$capath}/*.r*");
+            file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$capath}/*.0 [openvpn_reconfigure()]" . PHP_EOL, FILE_APPEND);
+            file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$capath}/*.r* [openvpn_reconfigure()]" . PHP_EOL, FILE_APPEND);
             /* Find the CRL listed in the settings */
             if (!empty($settings['crlref'])) {
                 $crl = lookup_crl($settings['crlref']);
@@ -1602,11 +1609,14 @@ function openvpn_reconfigure($mode, $settings) {
     openvpn_create_dirs();
     $fpath = "{$g['openvpn_base']}/{$mode_id}/config.ovpn";
     file_put_contents($fpath, $conf);
+    file_put_contents('/tmp/_test.txt', "openvpn.inc: Create {$fpath} [openvpn_reconfigure()]" . PHP_EOL, FILE_APPEND);
     unset($conf);
     $fpath = "{$g['openvpn_base']}/{$mode_id}/interface";
     file_put_contents($fpath, $interface);
+    file_put_contents('/tmp/_test.txt', "openvpn.inc: Create {$fpath} [openvpn_reconfigure()]" . PHP_EOL, FILE_APPEND);
     $fpath = "{$g['openvpn_base']}/{$mode_id}/connuserlimit";
     file_put_contents($fpath, $connlimit);
+    file_put_contents('/tmp/_test.txt', "openvpn.inc: Create {$fpath} [openvpn_reconfigure()]" . PHP_EOL, FILE_APPEND);
     //chown($fpath, 'nobody');
     //chgrp($fpath, 'nobody');
     @chmod("{$g['openvpn_base']}/{$mode_id}/config.ovpn", 0600);
@@ -1632,6 +1642,7 @@ function openvpn_stop_process($mode, $settings) {
         /* read the pid file */
         $pid = rtrim(file_get_contents($pfile));
         unlink($pfile);
+        file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$pfile} [openvpn_stop_process()]" . PHP_EOL, FILE_APPEND);
         syslog(LOG_INFO, "OpenVPN terminate old pid: {$pid}");

         /* send a term signal to the process */
@@ -1746,6 +1757,8 @@ function openvpn_delete($mode, $settings) {
     /* remove the configuration files */
     unlink_if_exists("{$g['openvpn_base']}/{$mode_id}/*/*");
     unlink_if_exists("{$g['openvpn_base']}/{$mode_id}/*");
+    file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$g['openvpn_base']}/{$mode_id}/*/* [openvpn_delete()]" . PHP_EOL, FILE_APPEND);
+    file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$g['openvpn_base']}/{$mode_id}/* [openvpn_delete()]" . PHP_EOL, FILE_APPEND);
     openvpn_delete_tmp($mode, $vpnid);
     filter_configure();
 }
@@ -1826,6 +1839,7 @@ function openvpn_resync_csc($settings) {
                 }

                 file_put_contents($csc_path, $csc_conf);
+                file_put_contents('/tmp/_test.txt', "openvpn.inc: Create {$csc_path} [openvpn_resync_csc()]" . PHP_EOL, FILE_APPEND);
                 chown($csc_path, 'nobody');
                 chgrp($csc_path, 'nobody');
             }
@@ -1857,6 +1871,7 @@ function openvpn_delete_csc($settings) {
             if ($serversettings['vpnid'] && (empty($csc_server_list) || in_array($serversettings['vpnid'], $csc_server_list))) {
                 $csc_path = "{$g['openvpn_base']}/server{$serversettings['vpnid']}/csc/" . basename($settings['common_name']);
                 unlink_if_exists($csc_path);
+                file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$csc_path} [openvpn_delete_csc()]" . PHP_EOL, FILE_APPEND);
             }
         }
     }
@@ -2327,6 +2342,7 @@ function openvpn_create_dirs() {
             $target = "{$g['openvpn_base']}/{$mode}{$settings['vpnid']}";
             $csctarget = "{$target}/csc/";
             @unlink_if_exists($csctarget);
+            file_put_contents('/tmp/_test.txt', "openvpn.inc: Remove {$csctarget} [openvpn_create_dirs()]" . PHP_EOL, FILE_APPEND);
             @safe_mkdir($target);
             if (in_array($settings['mode'], $openvpn_tls_server_modes)) {
                 @safe_mkdir($csctarget);
diff --git a/src/usr/local/sbin/openvpn.attributes.sh b/src/usr/local/sbin/openvpn.attributes.sh
index e77ad01156..a8d5d59517 100755
--- a/src/usr/local/sbin/openvpn.attributes.sh
+++ b/src/usr/local/sbin/openvpn.attributes.sh
@@ -26,11 +26,14 @@ if [ "${script_type}" = "client-connect" ]; then
     if [ -f /tmp/"${common_name}" ]; then
         /bin/cat /tmp/"${common_name}" > "${client_connect_config_file}" 
         /bin/rm /tmp/"${common_name}" 
+        /bin/echo "openvpn.attributes.sh: Create ${client_connect_config_file} [client-connect]" >> '/tmp/_test.txt'
+        /bin/echo "openvpn.attributes.sh: Remove /tmp/${common_name} [client-connect]" >> '/tmp/_test.txt'
     fi
 fi

 # Handle 'client-connect' and 'client-disconnect'
 /usr/bin/nohup /usr/local/sbin/openvpn.connect_async.sh > /dev/null &
+/bin/echo "openvpn.attributes.sh: Call openvpn.connect_async.sh" >> '/tmp/_test.txt'

 # Signal "deferred handler started OK" for client-connect
 exit 0
diff --git a/src/usr/local/sbin/openvpn.connect_async.sh b/src/usr/local/sbin/openvpn.connect_async.sh
index ce6b1c3cd2..4a8b1158db 100755
--- a/src/usr/local/sbin/openvpn.connect_async.sh
+++ b/src/usr/local/sbin/openvpn.connect_async.sh
@@ -67,11 +67,15 @@ if [ "${script_type}" = "client-disconnect" ]; then
             log_session "Timeout while waiting for lockfile" 
         else
             /usr/bin/touch "${lockfile}" 
+            /bin/echo "openvpn.connect_async.sh: Create ${lockfile} [client-disconnect]" >> '/tmp/_test.txt'
             eval "/sbin/pfctl -a '${anchorname}' -F rules" 
             /bin/rm "${lockfile}" 

             /bin/rm "${rulesfile}" 
             /bin/rm "${routesfile}" 
+            /bin/echo "openvpn.connect_async.sh: Remove ${lockfile} [client-disconnect]" >> '/tmp/_test.txt'
+            /bin/echo "openvpn.connect_async.sh: Remove ${rulesfile} [client-disconnect]" >> '/tmp/_test.txt'
+            /bin/echo "openvpn.connect_async.sh: Remove ${routesfile} [client-disconnect]" >> '/tmp/_test.txt'
         fi
     fi

@@ -97,6 +101,7 @@ elif [ "${script_type}" = "client-connect" ]; then
     if [ ${i} -ge 3 ]; then
         log_session "server write to defer file failed" 
         /bin/echo 0 > "${client_connect_deferred_file}" 
+        /bin/echo "openvpn.connect_async.sh: Create ${client_connect_deferred_file} [client-connect]" >> '/tmp/_test.txt'
         exit 1
     fi

@@ -121,8 +126,10 @@ elif [ "${script_type}" = "client-connect" ]; then
                 if [ "${sessioncount}" -gt "${sessionlimit}" ]; then
                     log_session "active connection limit of '${sessionlimit}' reached" 
                     /bin/echo 0 > "${client_connect_deferred_file}" 
+                    /bin/echo "openvpn.connect_async.sh: Create ${client_connect_deferred_file} [client-connect > connuserlimit]" >> '/tmp/_test.txt'
                     if [ -n "${username}" ]; then
                         /bin/rm "${rulesfile}" 
+                        /bin/echo "openvpn.connect_async.sh: Remove ${rulesfile} [client-connect > connuserlimit]" >> '/tmp/_test.txt'
                     fi
                     exit 1
                 fi
@@ -147,6 +154,7 @@ elif [ "${script_type}" = "client-connect" ]; then
             exit 1
         else
             /usr/bin/touch "${lockfile}" 
+            /bin/echo "openvpn.connect_async.sh: Create ${lockfile} [client-connect]" >> '/tmp/_test.txt'

             # for each of this user's anchors loaded in pf
             # $session :: ovpns3_'user_01'_61468
@@ -166,6 +174,7 @@ elif [ "${script_type}" = "client-connect" ]; then
             fi

             /bin/rm "${lockfile}" 
+            /bin/echo "openvpn.connect_async.sh: Remove ${lockfile} [client-connect]" >> '/tmp/_test.txt'
         fi
     fi

diff --git a/src/usr/local/sbin/ovpn_auth_verify b/src/usr/local/sbin/ovpn_auth_verify
index 2bc39d3c0f..9a74a88619 100755
--- a/src/usr/local/sbin/ovpn_auth_verify
+++ b/src/usr/local/sbin/ovpn_auth_verify
@@ -26,6 +26,7 @@ if [ "$1" = "tls" ]; then
         eval serial="\$tls_serial_${check_depth}" 
         if [ -n "$serial" ]; then
             RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.tls-verify.php -d "servercn=$2&depth=$3&certdepth=$4&certsubject=$5&serial=$serial&config=$config")
+            /bin/echo "ovpn_auth_verify: Call openvpn.tls-verify.php; returned ${RESULT} [tls]" >> '/tmp/_test.txt'
             if [ "${RESULT}" = "FAILED" ]; then
                 exit 1
             fi
@@ -37,6 +38,7 @@ else
     password=$(echo -n "${password}" | openssl enc -base64 | sed -e 's_=_%3D_g;s_+_%2B_g;s_/_%2F_g')
     username=$(echo -n "${username}" | openssl enc -base64 | sed -e 's_=_%3D_g;s_+_%2B_g;s_/_%2F_g')
     RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.auth-user.php -d "username=$username&password=$password&cn=$common_name&strictcn=$3&authcfg=$2&modeid=$4&nas_port=$5")
+    /bin/echo "ovpn_auth_verify: Call openvpn.auth-user.php; returned ${RESULT} [non-tls]" >> '/tmp/_test.txt'
 fi

 if [ "${RESULT}" = "OK" ]; then
diff --git a/src/usr/local/sbin/ovpn_auth_verify_async b/src/usr/local/sbin/ovpn_auth_verify_async
index fec42c36ba..14d7f3d869 100755
--- a/src/usr/local/sbin/ovpn_auth_verify_async
+++ b/src/usr/local/sbin/ovpn_auth_verify_async
@@ -67,6 +67,7 @@ auth_server_2="modeid=${modeid}&nas_port=${nas_port}" 
 auth_args="${auth_credentials}&${auth_server_1}&${auth_server_2}" 

 result=$("${fcgicli}" -f "${auth_user_php}" -d "${auth_args}")
+/bin/echo "ovpn_auth_verify_async: Call openvpn.auth-user.php; returned ${result}" >> '/tmp/_test.txt'

 # ---------- Write the Result