diff options
author | Ermal <eri@pfsense.org> | 2010-03-24 17:00:39 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-03-24 17:00:39 +0000 |
commit | a0116247ddcb7ac1ffc37a2d1ac967952171f4f3 (patch) | |
tree | 17a673652afd1608efe5467c4fb97189a2b62fe0 /usr/local/www/system_firmware_auto.php | |
parent | 7554ab8ca355952a3048a8ee64c54810949cad7f (diff) | |
download | pfsense-a0116247ddcb7ac1ffc37a2d1ac967952171f4f3.zip pfsense-a0116247ddcb7ac1ffc37a2d1ac967952171f4f3.tar.gz |
Ticket #318. Add an option to updater settings to allow updates for images with no signature. This makes auto-updater work and will not display an confirmation message during manual update.
Diffstat (limited to 'usr/local/www/system_firmware_auto.php')
-rwxr-xr-x | usr/local/www/system_firmware_auto.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index a777d18..938f5b0 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -178,8 +178,13 @@ if ($sigchk == 1) $sig_warning = "The digital signature on this image is invalid."; else if ($sigchk == 2) $sig_warning = "This image is not digitally signed."; -else if (($sigchk == 3) || ($sigchk == 4)) +else if (($sigchk >= 3)) { $sig_warning = "There has been an error verifying the signature on this image."; + update_status($sig_warning); + update_output_window("Update cannot continue"); + require("fend.inc"); + exit; +} if (!verify_gzip_file("{$g['upload_path']}/latest.tgz")) { update_status("The image file is corrupt."); @@ -193,7 +198,9 @@ if (!verify_gzip_file("{$g['upload_path']}/latest.tgz")) { exit; } -if ($sigchk) { +if ($sigchk == 2 && isset($config['system']['firmware']['allowinvalidsig'])) + update_output_window("\nrImage has no signature but the system configured to allow unsigned images.\n"); +else if ($sigchk) { update_status($sig_warning); update_output_window("Update cannot continue"); if (file_exists("{$g['upload_path']}/latest.tgz")) { |