From 188cebfc80605676a65fb5198dec30393f2e9eda Mon Sep 17 00:00:00 2001
From: Jose <joserprg@gmail.com>
Date: Thu, 19 Dec 2019 13:30:36 -0400
Subject: [PATCH] Improved fstab utility, don't allow blank fields

---
 CHANGELOG                     |  1 +
 gui/bastille_manager_util.php | 43 +++++++++++++++++++----------------
 version                       |  2 +-
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a367e77..23cc245 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.27......Improved fstab utility, don't allow blank fields. 
 1.0.26......Improved jail IP search during import.
 1.0.25......Add foreign jail import support, improved fstab utility.
 1.0.24......Improved Thick container upgrade process.
diff --git a/gui/bastille_manager_util.php b/gui/bastille_manager_util.php
index 1011e4e..25af08c 100644
--- a/gui/bastille_manager_util.php
+++ b/gui/bastille_manager_util.php
@@ -244,32 +244,35 @@ if($_POST):
 						$dir_mode = "rw";
 					endif;
 
-					if (!$paths_exist):
-						$cmd = ("/bin/echo	\"{$sourcedir}    {$targetdir}    nullfs    {$dir_mode}    0    0\" >> {$rootfolder}/jails/{$item}/fstab");
-						unset($output,$retval);mwexec2($cmd,$output,$retval);
-						if($retval == 0):
+					if ((!$sourcedir) || (!$targetdir)): 
+						$errormsg .= gtext("Soure/Target directory can't be left blank.");
+					else:
+						if (!$paths_exist):
+							$cmd = ("/bin/echo	\"{$sourcedir}    {$targetdir}    nullfs    {$dir_mode}    0    0\" >> {$rootfolder}/jails/{$item}/fstab");
+							unset($output,$retval);mwexec2($cmd,$output,$retval);
+							if($retval == 0):
 
-							if ($_POST['createdir']):
-								if (!is_dir("{$targetdir}")):
-									mkdir("$targetdir");
-								endif;
-								if ($_POST['automount']):
-									if ($is_running):
-										exec("/sbin/mount_nullfs -o {$dir_mode} {$sourcedir} {$targetdir}");
+								if ($_POST['createdir']):
+									if (!is_dir("{$targetdir}")):
+										mkdir("$targetdir");
+									endif;
+									if ($_POST['automount']):
+										if ($is_running):
+											exec("/sbin/mount_nullfs -o {$dir_mode} {$sourcedir} {$targetdir}");
+										endif;
 									endif;
 								endif;
+
+								$savemsg .= gtext("Edited the fstab successfully.");
+								//header('Location: bastille_manager_gui.php');
+								//exit;
+							else:
+								$errormsg .= gtext("Failed to edit the fstab.");
 							endif;
-
-							$savemsg .= gtext("Edited the fstab successfully.");
-							//header('Location: bastille_manager_gui.php');
-							//exit;
 						else:
-							$errormsg .= gtext("Failed to edit the fstab.");
+							$savemsg .= gtext("Directories already exist in the fstab.");
 						endif;
-					else:
-						$savemsg .= gtext("Directories already exist in the fstab.");
 					endif;
-
 				endif;
 				break;
 
@@ -431,7 +434,7 @@ $document->render();
 					$current_release = "-";
 				endif;
 			endif;
-			$pconfig['source_path'] = "/mnt";
+			$pconfig['source_path'] = "";
 			$pconfig['target_path'] = "{$rootfolder}/jails/{$pconfig['jailname']}/root/mnt/";
 			html_text2('jailname',gettext('Container name:'),htmlspecialchars($pconfig['jailname']));
 			$a_action = [
diff --git a/version b/version
index 8955a01..adb7b04 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.26
+1.0.27