diff options
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 8 | ||||
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 4 | ||||
| -rw-r--r-- | src/usr/local/www/crash_reporter.php | 10 | ||||
| -rw-r--r-- | src/usr/local/www/system_advanced_misc.php | 18 |
4 files changed, 23 insertions, 17 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index c0a083b..2ec4e7e 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1947,8 +1947,8 @@ function download_file($url, $destination, $verify_ssl = true, $connect_timeout curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - if (!isset($config['system']['do_not_send_host_uuid'])) { - curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . get_single_sysctl('kern.hostuuid')); + if (!isset($config['system']['do_not_send_uniqueid'])) { + curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid()); } else { curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']); } @@ -2003,8 +2003,8 @@ function download_file_with_progress_bar($url, $destination, $verify_ssl = true, curl_setopt($ch, CURLOPT_NOPROGRESS, '1'); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $connect_timeout); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); - if (!isset($config['system']['do_not_send_host_uuid'])) { - curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . get_single_sysctl('kern.hostuuid')); + if (!isset($config['system']['do_not_send_uniqueid'])) { + curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid()); } else { curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']); } diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 9d78f71..b88082f 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -78,8 +78,8 @@ function pkg_env($extra_env = array()) { global $config, $g; $user_agent = $g['product_name'] . '/' . $g['product_version']; - if (!isset($config['system']['do_not_send_host_uuid'])) { - $user_agent .= ' : ' . get_single_sysctl('kern.hostuuid'); + if (!isset($config['system']['do_not_send_uniqueid'])) { + $user_agent .= ' : ' . system_get_uniqueid(); } $pkg_env_vars = array( diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index 101939f..9d474ce 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -29,11 +29,13 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("captiveportal.inc"); +require_once("system.inc"); define("FILE_SIZE", 450000); function upload_crash_report($files) { - global $g; + global $g, $config; + $post = array(); $counter = 0; foreach ($files as $file) { @@ -45,7 +47,11 @@ function upload_crash_report($files) { curl_setopt($ch, CURLOPT_VERBOSE, 0); curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']); + if (!isset($config['system']['do_not_send_uniqueid'])) { + curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid()); + } else { + curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']); + } curl_setopt($ch, CURLOPT_URL, $g['crashreporterurl']); curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $post); diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index c2f6be7..6e99285 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -55,7 +55,7 @@ $pconfig['skip_rules_gw_down'] = isset($config['system']['skip_rules_gw_down']); $pconfig['use_mfs_tmpvar'] = isset($config['system']['use_mfs_tmpvar']); $pconfig['use_mfs_tmp_size'] = $config['system']['use_mfs_tmp_size']; $pconfig['use_mfs_var_size'] = $config['system']['use_mfs_var_size']; -$pconfig['do_not_send_host_uuid'] = isset($config['system']['do_not_send_host_uuid']); +$pconfig['do_not_send_uniqueid'] = isset($config['system']['do_not_send_uniqueid']); $pconfig['powerd_ac_mode'] = "hadp"; if (!empty($config['system']['powerd_ac_mode'])) { @@ -184,10 +184,10 @@ if ($_POST) { unset($config['system']['pkg_nochecksig']); } - if ($_POST['do_not_send_host_uuid'] == "yes") { - $config['system']['do_not_send_host_uuid'] = true; + if ($_POST['do_not_send_uniqueid'] == "yes") { + $config['system']['do_not_send_uniqueid'] = true; } else { - unset($config['system']['do_not_send_host_uuid']); + unset($config['system']['do_not_send_uniqueid']); } if ($_POST['powerd_enable'] == "yes") { @@ -584,11 +584,11 @@ $form->add($section); $section = new Form_Section('Installation Feedback'); $section->addInput(new Form_Checkbox( - 'do_not_send_host_uuid', - 'Host UUID', - 'Do NOT send HOST UUID with user agent', - $pconfig['do_not_send_host_uuid'] -))->setHelp('Enable this option to not send HOST UUID to pfSense as part of User-Agent header.'); + 'do_not_send_uniqueid', + 'Netgate Device ID', + 'Do NOT send Netgate Device ID with user agent', + $pconfig['do_not_send_uniqueid'] +))->setHelp('Enable this option to not send Netgate Device ID to pfSense as part of User-Agent header.'); $form->add($section); |
