Skip to content

O
OpnSense
Commit e7a233b5 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

crash reporter: create new reports when necessary; closes #241 

Also adds a custom user agent to make it easier to filter by version
and moves the crash reporter to a more visible location in the system
category.  :)
parent b2a5b917
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View file @ e7a233b5
...@@ -10,18 +10,15 @@ ...@@ -10,18 +10,15 @@
<CertificateAuthority VisibleName="Certificate Authority" url="/system_camanager.php*"/> <CertificateAuthority VisibleName="Certificate Authority" url="/system_camanager.php*"/>
<CertificationRevocation VisibleName="Certification Revocation" url="/system_crlmanager.php*"/> <CertificationRevocation VisibleName="Certification Revocation" url="/system_crlmanager.php*"/>
</Certificates> </Certificates>
<CrashReporter VisibleName="Crash Reporter" url="/crash_reporter.php"/>
<Firmware url="/ui/core/firmware/"/> <Firmware url="/ui/core/firmware/"/>
<HighAvailSync VisibleName="High Availability" url="/system_hasync.php"/> <HighAvailSync VisibleName="High Availability" url="/system_hasync.php"/>
<Routing url="/system_gateways.php"> <Routing url="/system_gateways.php">
<Routes url="/system_routes.php"/> <Routes url="/system_routes.php"/>
<RoutesEdit url="/system_routes_edit.php*"/> <RoutesEdit url="/system_routes_edit.php*"/>
<GatewayGroups url="/system_gateway_groups.php"/> <GatewayGroups url="/system_gateway_groups.php"/>
<GatewayGroupsEdit url="/system_gateway_groups_edit.php*"/> <GatewayGroupsEdit url="/system_gateway_groups_edit.php*"/>
</Routing> </Routing>
<Settings url="/system_general.php"> <Settings url="/system_general.php">
<General VisibleName="General" url="/system_general.php"/> <General VisibleName="General" url="/system_general.php"/>
<Admin_Access VisibleName="Admin Access" url="/system_advanced_admin.php"/> <Admin_Access VisibleName="Admin Access" url="/system_advanced_admin.php"/>
...@@ -31,18 +28,14 @@ ...@@ -31,18 +28,14 @@
<System_Tunables VisibleName="System Tunables" url="/system_advanced_sysctl.php"/> <System_Tunables VisibleName="System Tunables" url="/system_advanced_sysctl.php"/>
<Notifications url="/system_advanced_notifications.php"/> <Notifications url="/system_advanced_notifications.php"/>
</Settings> </Settings>
<SetupWizard VisibleName="Setup Wizard" url="/wizard.php?xml=setup_wizard.xml"/> <SetupWizard VisibleName="Setup Wizard" url="/wizard.php?xml=setup_wizard.xml"/>
<UserManager VisibleName="User Manager" url="/system_usermanager.php"> <UserManager VisibleName="User Manager" url="/system_usermanager.php">
<Users url="/system_usermanager.php"/> <Users url="/system_usermanager.php"/>
<Groups url="/system_groupmanager.php"/> <Groups url="/system_groupmanager.php"/>
<Settings url="/system_usermanager_settings.php"/> <Settings url="/system_usermanager_settings.php"/>
<Servers url="/system_authservers.php*"/> <Servers url="/system_authservers.php*"/>
</UserManager> </UserManager>
</System> </System>
<Interfaces order="2" cssClass="glyphicon glyphicon-wrench"> <Interfaces order="2" cssClass="glyphicon glyphicon-wrench">
<Assign VisibleName="(Assign)" order="999" url="/interfaces_assign.php"> <Assign VisibleName="(Assign)" order="999" url="/interfaces_assign.php">
<InterfaceAssignments VisibleName="Interface Addignments" url="/interfaces_assign.php"/> <InterfaceAssignments VisibleName="Interface Addignments" url="/interfaces_assign.php"/>
...@@ -243,7 +236,6 @@ ...@@ -243,7 +236,6 @@
<BackupRestore VisibleName="Backup &amp; Restore" url="/diag_backup.php"> <BackupRestore VisibleName="Backup &amp; Restore" url="/diag_backup.php">
<History url="/diag_confbak.php"/> <History url="/diag_confbak.php"/>
</BackupRestore> </BackupRestore>
<CrashReporter VisibleName="Crash Reporter" url="/crash_reporter.php"/>
<DNSLookup VisibleName="DNS Lookup" url="/diag_dns.php"/> <DNSLookup VisibleName="DNS Lookup" url="/diag_dns.php"/>
<FactoryDefaults VisibleName="Factory Defaults" url="/diag_defaults.php"/> <FactoryDefaults VisibleName="Factory Defaults" url="/diag_defaults.php"/>
<HaltSystem VisibleName="Halt System" url="/diag_halt.php"/> <HaltSystem VisibleName="Halt System" url="/diag_halt.php"/>
......
src/www/crash_reporter.php
View file @ e7a233b5
...@@ -33,7 +33,7 @@ require_once("captiveportal.inc"); ...@@ -33,7 +33,7 @@ require_once("captiveportal.inc");
define("FILE_SIZE", 450000); define("FILE_SIZE", 450000);
function upload_crash_report($files) function upload_crash_report($files, $agent)
{ {
global $g; global $g;
...@@ -53,7 +53,7 @@ function upload_crash_report($files) ...@@ -53,7 +53,7 @@ function upload_crash_report($files)
curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_VERBOSE, false); curl_setopt($ch, CURLOPT_VERBOSE, false);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible;)'); curl_setopt($ch, CURLOPT_USERAGENT, $agent);
curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true); curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $post); curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
...@@ -64,7 +64,7 @@ function upload_crash_report($files) ...@@ -64,7 +64,7 @@ function upload_crash_report($files)
return !$response; return !$response;
} }
$pgtitle = array(gettext("Diagnostics"),gettext("Crash Reporter")); $pgtitle = array(gettext('System'), gettext('Crash Reporter'));
include('head.inc'); include('head.inc');
$last_version = '/usr/local/opnsense/version/opnsense.last'; $last_version = '/usr/local/opnsense/version/opnsense.last';
...@@ -79,6 +79,9 @@ $crash_report_header = sprintf( ...@@ -79,6 +79,9 @@ $crash_report_header = sprintf(
shell_exec('/sbin/sysctl -b kern.hostuuid') shell_exec('/sbin/sysctl -b kern.hostuuid')
); );
$pkgver = explode('-', trim(file_get_contents('/usr/local/opnsense/version/opnsense')));
$user_agent = $g['product_name'] . '/' . $pkgver[0];
?> ?>
<body> <body>
...@@ -116,7 +119,7 @@ $crash_report_header = sprintf( ...@@ -116,7 +119,7 @@ $crash_report_header = sprintf(
$files_to_upload = glob('/var/crash/*'); $files_to_upload = glob('/var/crash/*');
echo gettext('ok') . '<br/>' . gettext('Uploading...'); echo gettext('ok') . '<br/>' . gettext('Uploading...');
flush(); flush();
$resp = upload_crash_report($files_to_upload); $resp = upload_crash_report($files_to_upload, $user_agent);
echo ($resp ? gettext('ok') : gettext('failed')) . '</p>'; echo ($resp ? gettext('ok') : gettext('failed')) . '</p>';
array_map('unlink', $files_to_upload); array_map('unlink', $files_to_upload);
} elseif (isset($_POST['Submit']) && $_POST['Submit'] == 'no') { } elseif (isset($_POST['Submit']) && $_POST['Submit'] == 'no') {
...@@ -124,17 +127,7 @@ $crash_report_header = sprintf( ...@@ -124,17 +127,7 @@ $crash_report_header = sprintf(
@unlink('/tmp/PHP_errors.log'); @unlink('/tmp/PHP_errors.log');
} }
if (get_crash_report(true) == '') { if (get_crash_report(true) != '' || (isset($_POST['Submit']) && $_POST['Submit'] == 'new')) {
echo '<br/><p><strong>';
if (isset($_POST['Submit']) && $_POST['Submit'] == 'yes') {
echo gettext('Thank you for submitting this crash report.');
} elseif ($_POST['Submit'] == 'no') {
echo gettext('Please consider submitting a crash report if the error persists.');
} else {
echo gettext('Luckily we have not detected a programming bug.');
}
echo '</strong></p>';
} else {
$crash_files = glob("/var/crash/*"); $crash_files = glob("/var/crash/*");
$crash_reports['System Information'] = trim($crash_report_header); $crash_reports['System Information'] = trim($crash_report_header);
$php_errors = @file_get_contents('/tmp/PHP_errors.log'); $php_errors = @file_get_contents('/tmp/PHP_errors.log');
...@@ -161,6 +154,19 @@ $crash_report_header = sprintf( ...@@ -161,6 +154,19 @@ $crash_report_header = sprintf(
foreach ($crash_reports as $report => $content) { foreach ($crash_reports as $report => $content) {
echo "<p>{$report}:<br/><pre>{$content}</pre></p>"; echo "<p>{$report}:<br/><pre>{$content}</pre></p>";
} }
} else {
if (isset($_POST['Submit']) && $_POST['Submit'] == 'yes') {
echo '<br/><p><strong>';
echo gettext('Thank you for submitting this crash report.');
echo '</strong></p><br/>';
} elseif ($_POST['Submit'] == 'no') {
echo '<br/><p><strong>';
echo gettext('Please consider submitting a crash report if the error persists.');
echo '</strong></p><br/>';
} else {
echo '<br/><button name="Submit" type="submit" class="btn btn-primary pull-right" value="new">' . gettext('Report an issue') . '</button>';
echo '<p><strong>' . gettext('Luckily we have not detected a programming bug.') . '</strong></p><br/>';
}
} }
?> ?>
</div> </div>
......
src/www/guiconfig.inc
View file @ e7a233b5
...@@ -625,10 +625,12 @@ date_default_timezone_set($timezone); ...@@ -625,10 +625,12 @@ date_default_timezone_set($timezone);
function get_crash_report($pedantic = false) function get_crash_report($pedantic = false)
{ {
global $g; $savemsg = sprintf(
gettext('A problem was detected. Click %shere%s for more information.'),
$savemsg = "{$g['product_name']} has detected a crash report or programming bug. Click <a href='crash_reporter.php'>here</a> for more information."; '<a href="/crash_reporter.php">',
$skip_files = array('.', '..', 'minfree', ''); '</a>'
);
$skip_files = array('.', '..', 'minfree', 'bounds', '');
$count = 0; $count = 0;
if (file_exists('/tmp/PHP_errors.log')) { if (file_exists('/tmp/PHP_errors.log')) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023