Merge latest devel code to main (#24)

* Fixes some more interface handling bits

* Fixes an MTU war between pfSense and wg-quick. wg-quick will now always honor pfSense for assigned interfaces, and only fall back to the default 1420 for unassigned interfaces

* Syntax bug

* Created a new global variable to generalize more things

* Subtle improvements to bootstrapper

* Working on package logging facility

* Reverting some code removal that broke UI layout

* Testing layout bug

Author: rcmcdonald91

src/files/usr/local/pkg/wireguard/etc/rc.bootstrap_wireguard

@@ -20,11 +20,18 @@
  * limitations under the License.
  */
 
+/*
+ * This file absolutely cannot be dependent on the package! It must standalone,
+ * and only depend on pfSense includes. This script protects the firewall from
+ * being unable to boot in the event that the package is removed with wg
+ * interfaces assigned to pfSenses interfaces.
+ */
+
 // pfSense includes
 require_once('globals.inc');
 require_once('config.inc');
 
-// This file absolutely cannot be dependent on the package! It must standalone and only depend on pfSense includes
+$ifconfig = '/sbin/ifconfig';
 
 // This is a hack to get text onto the console during booting from a php-cgi script
 function print_message($message) {
@@ -39,19 +46,17 @@ function print_message($message) {
 }
 
 // Nice to have some output when running manually after system startup for testing purposes
-$run_verbose = true;
+$verbose = !(platform_booting());
 
 if (platform_booting()) {
 
-	$run_verbose = false;
-
 	print_message("Bootstrapping WireGuard interfaces... \n");
 
 }
 
-$verbose_pipe = ($run_verbose ? "" : " > /dev/null 2>&1");
+$verbose_pipe = ($verbose ? "" : " > /dev/null 2>&1");
 
-$if_list = get_configured_interface_list_by_realif($disabled);
+$if_list = get_configured_interface_list_by_realif(true);
 
 foreach ($if_list as $realif => $name) {
 
@@ -60,10 +65,10 @@ foreach ($if_list as $realif => $name) {
 	if (substr($realif, 0, 2) == "wg") {
 
 		// Let's create temporary lo loopback interfaces just to be safe 
-		exec("(/sbin/ifconfig {$ifname} || /sbin/ifconfig lo create name {$ifname})" . $verbose_pipe);
+		exec("({$ifconfig} {$ifname} || {$ifconfig} lo create name {$ifname})" . $verbose_pipe);
 
 		// Add them to the 'wg' group so wg-quick(8) can tear them down later
-		exec("/sbin/ifconfig {$ifname} group wg" . $verbose_pipe);
+		exec("{$ifconfig} {$ifname} group wg" . $verbose_pipe);
 
 	}
 

src/files/usr/local/share/pfSense-pkg-WireGuard/info.xml

@@ -17,5 +17,9 @@
 		<pkginfolink>https://github.com/theonemcdonald/pfSense-pkg-WireGuard</pkginfolink>
 		<version>%%PKGVERSION%%</version>
 		<configurationfile>wireguard.xml</configurationfile>
+		<logging>
+			<facilityname>wireguard</facilityname>
+			<logfilename>wireguard.log</logfilename>
+		</logging>
 	</package>
 </pfsensepkgs>

src/files/usr/local/www/wg/vpn_wg.php

@@ -169,25 +169,26 @@
 								</tbody>
 							</table>
 						</td>
-<?php
+						<?php
 			else:
 				print('<td colspan="6">' . gettext("No peers have been configured") . '</td>');
 			endif;
 ?>
 					</tr>
 <?php
 			$i++;
-
-		endforeach;
-
-	endif;
-	
+		endforeach;	 // $tunnelsa
 ?>
 				</tbody>
 			</table>
 		</div>
 	</div>
 
+
+<?php
+	endif;
+?>
+
 	<nav class="action-buttons">
 		<a href="#" class="btn btn-info btn-sm" id="showpeers">
 			<i class="fa fa-info icon-embed-btn"></i>