- also rename $section arg to $section_name in some functions to clarify

- also robustify parsing for <tagname> and bulletproof the handling of
  certain errors

2 files changed, 45 insertions, 27 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index e2620fa..146b81e 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -489,55 +489,70 @@ function reverse_strrchr($haystack, $needle) {
  *  backup_config_section($section): returns as an xml file string of
  *                                   the configuration section
  */
-function backup_config_section($section) {
+function backup_config_section($section_name) {
 	global $config;
-	$new_section = &$config[$section];
+	$new_section = &$config[$section_name];
 	/* generate configuration XML */
-	$xmlconfig = dump_xml_config($new_section, $section);
+	$xmlconfig = dump_xml_config($new_section, $section_name);
 	$xmlconfig = str_replace("<?xml version=\"1.0\"?>", "", $xmlconfig);
 	return $xmlconfig;
 }
 
 /*
- *  restore_config_section($section, new_contents): restore a configuration section,
+ *  restore_config_section($section_name, new_contents): restore a configuration section,
  *                                                  and write the configuration out
  *                                                  to disk/cf.
  */
-function restore_config_section($section, $new_contents) {
+function restore_config_section($section_name, $new_contents) {
 	global $config, $g;
 	conf_mount_rw();
 	$fout = fopen("{$g['tmp_path']}/tmpxml","w");
 	fwrite($fout, $new_contents);
 	fclose($fout);
-	$section_xml = parse_xml_config($g['tmp_path'] . "/tmpxml", $section);
-	if ($section_xml != -1)
-		$config[$section] = &$section_xml;
+
+	$xml = parse_xml_config($g['tmp_path'] . "/tmpxml", null);
+	if ($xml['pfsense']) {
+		$xml = $xml['pfsense'];
+	}
+	else if ($xml['m0n0wall']) {
+		$xml = $xml['m0n0wall'];
+	}
+	if ($xml[$section_name]) {
+		$section_xml = $xml[$section_name];
+	} else {
+		$section_xml = -1;
+	}
+
 	@unlink($g['tmp_path'] . "/tmpxml");
+	if ($section_xml === -1) {
+		return false;
+	}
+	$config[$section_name] = &$section_xml;
 	if(file_exists("{$g['tmp_path']}/config.cache"))
 		unlink("{$g['tmp_path']}/config.cache");
-	write_config(sprintf(gettext("Restored %s of config file (maybe from CARP partner)"), $section));
+	write_config(sprintf(gettext("Restored %s of config file (maybe from CARP partner)"), $section_name));
 	disable_security_checks();
 	conf_mount_ro();
-	return;
+	return true;
 }
 
 /*
- *  merge_config_section($section, new_contents):   restore a configuration section,
+ *  merge_config_section($section_name, new_contents):   restore a configuration section,
  *                                                  and write the configuration out
  *                                                  to disk/cf.  But preserve the prior
  * 													structure if needed
  */
-function merge_config_section($section, $new_contents) {
+function merge_config_section($section_name, $new_contents) {
 	global $config;
 	conf_mount_rw();
 	$fname = get_tmp_filename();
 	$fout = fopen($fname, "w");
 	fwrite($fout, $new_contents);
 	fclose($fout);
-	$section_xml = parse_xml_config($fname, $section);
-	$config[$section] = $section_xml;
+	$section_xml = parse_xml_config($fname, $section_name);
+	$config[$section_name] = $section_xml;
 	unlink($fname);
-	write_config(sprintf(gettext("Restored %s of config file (maybe from CARP partner)"), $section));
+	write_config(sprintf(gettext("Restored %s of config file (maybe from CARP partner)"), $section_name));
 	disable_security_checks();
 	conf_mount_ro();
 	return;
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 09f599b..a413ccf 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -373,21 +373,24 @@ if ($_POST) {
 					}
 					if($_POST['restorearea']) {
 						/* restore a specific area of the configuration */
-						if(!stristr($data, $_POST['restorearea'])) {
+						if(!stristr($data, "<" . $_POST['restorearea'] . ">")) {
 							$input_errors[] = gettext("You have selected to restore an area but we could not locate the correct xml tag.");
 						} else {
-							restore_config_section($_POST['restorearea'], $data);
-							if ($config['rrddata']) {
-								restore_rrddata();
-								unset($config['rrddata']);
-								unlink_if_exists("{$g['tmp_path']}/config.cache");
-								write_config();
-								add_base_packages_menu_items();
-								convert_config();
-								conf_mount_ro();
+							if (!restore_config_section($_POST['restorearea'], $data)) {
+								$input_errors[] = gettext("You have selected to restore an area but we could not locate the correct xml tag.");
+							} else {
+								if ($config['rrddata']) {
+									restore_rrddata();
+									unset($config['rrddata']);
+									unlink_if_exists("{$g['tmp_path']}/config.cache");
+									write_config();
+									add_base_packages_menu_items();
+									convert_config();
+									conf_mount_ro();
+								}
+								filter_configure();
+								$savemsg = gettext("The configuration area has been restored.  You may need to reboot the firewall.");
 							}
-							filter_configure();
-							$savemsg = gettext("The configuration area has been restored.  You may need to reboot the firewall.");
 						}
 					} else {
 						if(!stristr($data, "<" . $g['xml_rootobj'] . ">")) {