Bump main to v0.0.4_2

* Sets the tunnel enabled button to readonly if interface is assigned

* Fixed syntax error with changes to enabled checkbox

* Fix some oo symantics

* Another syntax fix

* Fixes a css style issue with placeholder text on secrets when blurred

* Another attempt to fix cosmetic issue with placeholder text

* Adds a new function to check if any wg tunnels are assigned interfaces

* Fixes a syntax error in is_wg_assigned()

* Working on package cleanup settings

* Fixed some syntax bugs

* Fixed some syntax errors in vpn_wg_settings.php

* Correctly change keep_extras preferring interface assignment, but defaulting to no on fresh installs.

* Fixed syntax error in previous commit

* Working on settings page

* Third times a charm

* Bump revision to v0.0.4_2

Author: rcmcdonald91

src/Makefile

@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-WireGuard
-PORTVERSION=	0.0.5
-PORREVISION=	0
+PORTVERSION=	0.0.4
+PORREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

src/files/usr/local/pkg/wireguard/wg_api.inc

@@ -108,7 +108,7 @@ function exec_wg_quick_action($tunnel, $action, $verbose = false) {
 	$wg_ifname = $tunnel;
 
 	// Looks like we have a tunnel structure
-	if (is_array($tunnel)) {
+	if (is_array($tunnel) && isset($tunnel['name'])) {
 
 		$wg_ifname = $tunnel['name'];
 

src/files/usr/local/pkg/wireguard/wg_globals.inc

@@ -23,20 +23,26 @@
 
 global $wgg;
 
+$pkg_name                       = "wireguard";
+
 $wgg = array(
         'wg'                    => '/usr/local/bin/wg',
         'wg_quick'              => '/usr/local/bin/wg-quick',
-        'conf_path'             => '/etc/wireguard',
         'ifconfig'              => '/sbin/ifconfig',
         'kldstat'               => '/sbin/kldstat',
         'pkg'                   => '/usr/sbin/pkg',
+        
+        'conf_path'             => '/etc/wireguard',
+        
         'if_prefix'             => 'wg',
         'if_group'              => 'WireGuard',
         'default_mtu'           => 1420,
+
         'script_path'           => '/usr/local/etc',
         'earlyshellcmds'        => array('/usr/local/etc/rc.bootstrap_wireguard', '/usr/local/etc/rc.reload_wireguard'),
         'pkg_scripts'           => array('/usr/local/etc/rc.reload_wireguard'),
         'extra_scripts'         => array('/usr/local/pkg/wireguard/etc/rc.bootstrap_wireguard'),
+
         'verbose'               => false
 );
 

src/files/usr/local/pkg/wireguard/wg_validate.inc

@@ -179,31 +179,62 @@ function is_wg_tunnel_assigned($tunnel, $disabled = true) {
 	$wg_ifname = $tunnel;
 
 	// Looks like we have a tunnel structure
-	if (is_array($tunnel)) {
+	if (is_array($tunnel) && isset($tunnel['name'])) {
 
 		$wg_ifname = $tunnel['name'];
 
 	}
 
 	$if_list = get_configured_interface_list_by_realif($disabled);
 
-	$if_assigned = array_key_exists($wg_ifname, $if_list);
+	$is_assigned = array_key_exists($wg_ifname, $if_list);
 
-	return $if_assigned;
+	return $is_assigned;
 
 }
 
+// Check if at least one tunnel is assigned
+function is_wg_assigned($disabled = true) {
+	global $wgg;
+
+	// Assume that no tunnels are assigned
+	$is_assigned = false;
+
+	$if_list = get_configured_interface_list_by_realif($disabled);
+
+	foreach ($if_list as $realif => $name) {
+
+		// We found one, no need to keep checking
+		if (substr($realif, 0, strlen($wgg['if_prefix'])) == $wgg['if_prefix']) {
+	
+			$is_assigned = true;
+
+			break;
+	
+		}
+	    
+	    }
+
+	return $is_assigned;
+
+}
+
 // Check if at least one tunnel is enabled
 function is_wg_enabled() {
 	global $config;
 
 	init_config_arr(array('installedpackages', 'wireguard', 'tunnel'));
 
 	foreach ($config['installedpackages']['wireguard']['tunnel'] as $tunnel) {
+
 		if (empty($tunnel['enabled'])) {
+
 			continue;
+
 		}
+
 		return true;
+
 	}
 
 	return false;

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

@@ -35,12 +35,12 @@
 // WireGuard includes
 require_once("/usr/local/pkg/wireguard/wg.inc");
 
-init_config_arr(array('installedpackages', 'wireguard', 'tunnel'));
-$tunnels = &$config['installedpackages']['wireguard']['tunnel'];
-
 init_config_arr(array('installedpackages', 'wireguard', 'config', 0));
 $wg_config = &$config['installedpackages']['wireguard']['config'][0];
 
+init_config_arr(array('installedpackages', 'wireguard', 'tunnel'));
+$tunnels = &$config['installedpackages']['wireguard']['tunnel'];
+
 if (is_numericint($_REQUEST['index'])) {
 	$index = $_REQUEST['index'];
 }
@@ -143,13 +143,24 @@
 	$index
 ));
 
-$section->addInput(new Form_Checkbox(
+$enabled_button = new Form_Checkbox(
 	'enabled',
 	'Tunnel Enabled',
 	gettext('Enable'),
 	$pconfig['enabled'] == 'yes'
-))->setHelp('<span class="text-danger">Note: </span>'
-		. 'Tunnel must be enabled in order to be assigned to an interface');
+);
+
+$enabled_button->setHelp('<span class="text-danger">Note: </span>Tunnel must be <b>enabled</b> in order to be assigned to an interface');	
+
+// Disable the tunnel enabled button if interface is assigned
+if (is_wg_tunnel_assigned($pconfig)) {
+
+	$enabled_button->setDisabled();
+	$enabled_button->setHelp('<span class="text-danger">Note: </span>Tunnel cannot be <b>disabled</b> when assigned to an interface');
+
+}
+
+$section->addInput($enabled_button);
 
 $section->addInput(new Form_Input(
 	'descr',
@@ -431,10 +442,13 @@
 	// Eliminate ghost lines in modal
 	$('.form-group').css({"border-bottom-width" : "0"});
 
+	// Eliminates blurred placeholder text
+	$('body').append('<style>::placeholder{color:revert;text-shadow:none;}</style>');
+
 	// Blurs secrets
 	if (wg_config['blur_secrets'] == 'yes') {
 
-		var blur = {"color" : "transparent", "text-shadow" : "0 0 5px rgba(0,0,0,0.5)"};
+		var blur = {"color" : "transparent", "text-shadow" : "0 0 5px rgba(0,0,0,0.5)"}
 
 		$("#privatekey").css(blur);
 

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

@@ -46,19 +46,32 @@
 			$pconfig = $_POST;
 
 			$wg_config['keep_conf'] = $pconfig['keep_conf'];
+
+			$wg_config['keep_extras'] = $pconfig['keep_extras'];
 
 			$wg_config['blur_secrets'] = $pconfig['blur_secrets'];
 
-			write_config('[WireGuard] Save general settings');
+			write_config('[WireGuard] Save WireGuard settings');
 
-			wg_resync();
+			//wg_resync();
 
 			header("Location: /wg/vpn_wg_settings.php");
 
 		}
 
 	}
 
+} else {
+
+	// Default to yes
+	$pconfig['keep_conf'] = isset($wg_config['keep_conf']) ? $wg_config['keep_conf'] : 'yes';
+
+	// Default to no, unless there are interfaces already assigned
+	$pconfig['keep_extras'] = isset($wg_config['keep_conf']) ? $wg_config['keep_extras'] : 'no';
+	$pconfig['keep_extras'] = is_wg_assigned() ? 'yes' : $pconfig['keep_extras'];
+
+	$pconfig['blur_secrets'] = $wg_config['blur_secrets'];
+
 }
 
 $pgtitle = array(gettext("VPN"), gettext("WireGuard"), gettext("Settings"));
@@ -88,21 +101,48 @@
 	'keep_conf',
 	'Keep Configuration',
     	gettext('Enable'),
-    	$wg_config['keep_conf']
+    	$pconfig['keep_conf'] == 'yes'
 ))->setHelp('<span class="text-danger">Note: </span>'
 		. 'With \'Keep Configurations\' enabled (default), all tunnel configurations and package settings will persist on install/de-install.'
 );
 
+$keep_extras_btn = new Form_Checkbox(
+	'keep_extras',
+	'Keep Extra Scripts',
+    	gettext('Enable'),
+    	$pconfig['keep_extras'] == 'yes'
+);
+
+// Check if any WireGuard tunnel is assigned to an interface
+if (is_wg_assigned()) {
+
+	// Prevent removal of extra scripts 
+	$keep_extras_btn->setDisabled();
+	$keep_extras_btn->setHelp('<span class="text-danger">Note: </span>'
+					. 'Extra scripts <b>cannot be removed</b> with any tunnels assigned to interfaces.');
+
+} else {
+
+	$keep_extras_btn->setHelp('<span class="text-danger">Note: </span>'
+				. 'With \'Keep Extra Scripts\' enabled, any extra scripts installed by the package will persist on install/de-install.');
+
+}
+
+$section->addInput($keep_extras_btn);
+
+$form->add($section);
+
+$section = new Form_Section("User Interface Settings");
+
 $section->addInput(new Form_Checkbox(
 	'blur_secrets',
 	'Blur Secrets',
     	gettext('Enable'),
-    	$wg_config['blur_secrets']
+    	$pconfig['blur_secrets'] == 'yes'
 ))->setHelp('<span class="text-danger">Note: </span>'
 		. 'With \'Blur Secrets\' enabled, all secrets (private and pre-shared keys) are blurred in the user interface.'
 );
 
-
 $form->add($section);
 
 print($form);