diff options
author | Colin Smith <colin@pfsense.org> | 2005-05-04 01:50:21 +0000 |
---|---|---|
committer | Colin Smith <colin@pfsense.org> | 2005-05-04 01:50:21 +0000 |
commit | 3958d63bb2907b86be887d9abbc8818b85d29982 (patch) | |
tree | e01da097b602963a95233970f142b54479e1e50d /usr/local | |
parent | 79020a5ecee4e6e35901dcbfc0876fd747ff28d6 (diff) | |
download | pfsense-3958d63bb2907b86be887d9abbc8818b85d29982.zip pfsense-3958d63bb2907b86be887d9abbc8818b85d29982.tar.gz |
Commit new versionchecker code. Please test manual update and take a look at the interface.
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/system_firmware.php | 294 |
1 files changed, 162 insertions, 132 deletions
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index af8140f..493fa1f 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -2,102 +2,101 @@ <?php /* $Id$ */ /* - system_firmware.php - part of m0n0wall (http://m0n0.ch/wall) - - Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + system_firmware.php + Copyright (C) 2004, 2005 Scott Ullrich and Colin Smith + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ -$d_isfwfile = 1; require("guiconfig.inc"); -//require("xmlrpc_client.inc"); +require("xmlparse_pkg.inc"); +require("xmlrpc.inc"); +$d_isfwfile = 1; /* Handle manual upgrade */ if ($_POST && !file_exists($d_firmwarelock_path)) { - unset($input_errors); - unset($sig_warning); - - if (stristr($_POST['Submit'], "Enable")) - $mode = "enable"; - else if (stristr($_POST['Submit'], "Disable")) - $mode = "disable"; - else if (stristr($_POST['Submit'], "Upgrade") || $_POST['sig_override']) - $mode = "upgrade"; - else if ($_POST['sig_no']) { - if(file_exists("{$g['tmp_path']}/firmware.tgz")) - unlink("{$g['tmp_path']}/firmware.tgz"); - } - if ($mode) { - if ($mode == "enable") { - exec_rc_script("/etc/rc.firmware enable"); - touch($d_fwupenabled_path); - } else if ($mode == "disable") { - exec_rc_script("/etc/rc.firmware disable"); - if (file_exists($d_fwupenabled_path)) - unlink($d_fwupenabled_path); - } else if ($mode == "upgrade") { - if (is_uploaded_file($_FILES['ulfile']['tmp_name'])) { - /* verify firmware image(s) */ - if (!stristr($_FILES['ulfile']['name'], $g['platform']) && !$_POST['sig_override']) - $input_errors[] = "The uploaded image file is not for this platfom ({$g['platform']})."; - else if (!file_exists($_FILES['ulfile']['tmp_name'])) { - /* probably out of memory for the MFS */ - $input_errors[] = "Image upload failed (out of memory?)"; - exec_rc_script("/etc/rc.firmware disable"); - if (file_exists($d_fwupenabled_path)) - unlink($d_fwupenabled_path); - } else { - /* move the image so PHP won't delete it */ - rename($_FILES['ulfile']['tmp_name'], "{$g['tmp_path']}/firmware.tgz"); - - /* check digital signature */ - $sigchk = verify_digital_signature("{$g['tmp_path']}/firmware.tgz"); - - 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)) - $sig_warning = "There has been an error verifying the signature on this image."; - - if (!verify_gzip_file("{$g['tmp_path']}/firmware.tgz")) { - $input_errors[] = "The image file is corrupt."; - unlink("{$g['tmp_path']}/firmware.tgz"); - } - } - } - - if (!$input_errors && !file_exists($d_firmwarelock_path) && (!$sig_warning || $_POST['sig_override'])) { - /* fire up the update script in the background */ - touch($d_firmwarelock_path); - exec_rc_script_async("/etc/rc.firmware pfSenseupgrade {$g['tmp_path']}/firmware.tgz"); - $savemsg = "The firmware is now being installed. The firewall will reboot automatically."; - } - } - } + unset($input_errors); + unset($sig_warning); + + if (stristr($_POST['Submit'], "Enable")) + $mode = "enable"; + else if (stristr($_POST['Submit'], "Disable")) + $mode = "disable"; + else if (stristr($_POST['Submit'], "Upgrade") || $_POST['sig_override']) + $mode = "upgrade"; + else if ($_POST['sig_no']) { + if(file_exists("{$g['tmp_path']}/firmware.tgz")) + unlink("{$g['tmp_path']}/firmware.tgz"); + } + if ($mode) { + if ($mode == "enable") { + exec_rc_script("/etc/rc.firmware enable"); + touch($d_fwupenabled_path); + } else if ($mode == "disable") { + exec_rc_script("/etc/rc.firmware disable"); + if (file_exists($d_fwupenabled_path)) + unlink($d_fwupenabled_path); + } else if ($mode == "upgrade") { + if (is_uploaded_file($_FILES['ulfile']['tmp_name'])) { + /* verify firmware image(s) */ + if (!stristr($_FILES['ulfile']['name'], $g['platform']) && !$_POST['sig_override']) + $input_errors[] = "The uploaded image file is not for this platfom ({$g['platform']})."; + else if (!file_exists($_FILES['ulfile']['tmp_name'])) { + /* probably out of memory for the MFS */ + $input_errors[] = "Image upload failed (out of memory?)"; + exec_rc_script("/etc/rc.firmware disable"); + if (file_exists($d_fwupenabled_path)) + unlink($d_fwupenabled_path); + } else { + /* move the image so PHP won't delete it */ + rename($_FILES['ulfile']['tmp_name'], "{$g['tmp_path']}/firmware.tgz"); + + /* check digital signature */ + $sigchk = verify_digital_signature("{$g['tmp_path']}/firmware.tgz"); + + 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)) + $sig_warning = "There has been an error verifying the signature on this image."; + + if (!verify_gzip_file("{$g['tmp_path']}/firmware.tgz")) { + $input_errors[] = "The image file is corrupt."; + unlink("{$g['tmp_path']}/firmware.tgz"); + } + } + } + + if (!$input_errors && !file_exists($d_firmwarelock_path) && (!$sig_warning || $_POST['sig_override'])) { + /* fire up the update script in the background */ + touch($d_firmwarelock_path); + exec_rc_script_async("/etc/rc.firmware pfSenseupgrade {$g['tmp_path']}/firmware.tgz"); + $savemsg = "The firmware is now being installed. The firewall will reboot automatically."; + } + } + } } /* upload progress bar id */ @@ -109,31 +108,20 @@ $dir = ini_get('upload_progress_meter.file.filename_template'); <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("System: Firmware");?></title> +<title><?=gentitle("System: Firmware Update");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> </head> -<!-- -generated new UPLOAD_IDENTIFIER = <?=$id?> -php-config.upload_progress_meter.store_method = <?=$mth?> -php-config.upload_progress_meter.file.filename_template = <?=$dir?> ---> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<?php include("fbegin.inc"); ?> -<p class="pgtitle">System: Firmware</p> -<?php if ($input_errors) print_input_errors($input_errors); ?> -<?php if ($savemsg) print_info_box($savemsg); ?> -<?php if ($fwinfo <> "") print_info_box($fwinfo); ?> <?php if (!in_array($g['platform'], $fwupplatforms)): ?> <p><strong>Firmware uploading is not supported on this platform.</strong></p> <?php elseif ($sig_warning && !$input_errors): ?> <form action="system_firmware.php" method="post"> <?php $sig_warning = "<strong>" . $sig_warning . "</strong><br>This means that the image you uploaded " . - "is not an official/supported image and may lead to unexpected behavior or security " . - "compromises. Only install images that come from sources that you trust, and make sure ". - "that the image has not been tampered with.<br><br>". - "Do you want to install this image anyway (on your own risk)?"; + "is not an official/supported image and may lead to unexpected behavior or security " . + "compromises. Only install images that come from sources that you trust, and make sure ". + "that the image has not been tampered with.<br><br>". + "Do you want to install this image anyway (on your own risk)?"; print_info_box($sig_warning); ?> <input name="sig_override" type="submit" class="formbtn" id="sig_override" value=" Yes "> @@ -142,43 +130,86 @@ print_info_box($sig_warning); <?php else: ?> <?php if (!file_exists($d_firmwarelock_path)): ?> <form action="system_firmware.php" method="post" enctype="multipart/form-data"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td> - <ul id="tabnav"> - <li class="tabinact"><a href="system_firmware_check.php">Auto Update</a></li> - <li class="tabact">Firmware Update</a></li> - </ul> - </td> - </tr> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php +include("fbegin.inc"); +?> +<p class="pgtitle">System: Firmware Update</p> +<br> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> + <ul id="tabnav"> + <li class="tabact">Firmware Update</a></li> + <li class="tabinact"><a href="pkg_mgr_installed.php">Auto Update</a></li> + </ul> + </td></tr> <tr> <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table align="center" width="50%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="10%" class="listhdrr">Act</td> + <td width="30%" class="listhdrr">Category</td> + <td width="30%" class="listhdrr">Installed</td> + <td width="30%" class="listhdrr">Current<td> + </tr> + + <?php + $versions = check_firmware_version(); + foreach($versions as $key => $version) { + if($key == "current") continue; + if($version == 1) { + $img = "pass.gif"; + } else { + $currentver = array_pop($version); + $img = "block.gif"; + } + ?> + + <tr valign="top"> + <td class="listlr" nowrap><img src="<?=$img;?>" width="11" height="11" align="absmiddle"></td> + <td class="listlr"><?= ucfirst($key) ?></td> + <td class="listlr"><?= $versions['current'][$key]['version'] ?></td> + <?php + if($version == 1) { + ?> + <td class="listlr"><?= $versions['current'][$key]['version'] ?></td> + <?php + } else { + ?> + <td class="listbg"><font color="#FFFFFFF"><?= $currentver['version'] ?></td> + </tr> + <?php + } + } + ?> + </table> + <br> + <table width="100%" align="center" border="0" cellpadding="6" cellspacing="0"> <tr> - <td colspan="2" class="listtopic">Invoke pfSense Manual Upgrade</td> - </tr> - <td width="22%" valign="baseline" class="vncell"> </td> + <td colspan="2" class="listtopic">Invoke pfSense Manual Upgrade</td> + </tr> + <td width="22%" valign="baseline" class="vncell"> </td> <td width="78%" class="vtable"> <p>Click "Enable firmware upload" below, then choose the image file (<?=$g['platform'];?>-*.tgz) - to be uploaded.<br>Click "Upgrade firmware" + to be uploaded.<br>Click "Upgrade firmware" to start the upgrade process.</p> <?php if (!file_exists($d_sysrebootreqd_path)): ?> <?php if (!file_exists($d_fwupenabled_path)): ?> <input name="Submit" type="submit" class="formbtn" value="Enable firmware upload"> - <?php else: ?> - <input name="Submit" type="submit" class="formbtn" value="Disable firmware upload"> + <?php else: ?> + <input name="Submit" type="submit" class="formbtn" value="Disable firmware upload"> <br><br> - <strong>Firmware image file: </strong> - <input type="hidden" name="UPLOAD_IDENTIFIER" value="<?=$id?>"> - <input name="ulfile" type="file" class="formfld"> + <strong>Firmware image file: </strong> + <input type="hidden" name="UPLOAD_IDENTIFIER" value="<?=$id?>"> + <input name="ulfile" type="file" class="formfld"> <br><br> - <input name="Submit" type="submit" class="formbtn" value="Upgrade firmware" onClick="window.open('progress.php?UPLOAD_IDENTIFIER=<?=$id?>','UploadMeter','width=400,height=200', true); return true; "> - <?php endif; else: ?> - <strong>You must reboot the system before you can upgrade the firmware.</strong> - <?php endif; ?> + <input name="Submit" type="submit" class="formbtn" value="Upgrade firmware" onClick="window.open('progress.php?UPLOAD_IDENTIFIER=<?=$id?>','Uplo +adMeter','width=400,height=200', true); return true; "> + <?php endif; else: ?> + <strong>You must reboot the system before you can upgrade the firmware.</strong> + <?php endif; ?> </td> - </td> + </td> </tr> <tr> <td width="22%" valign="top"> </td> @@ -187,10 +218,9 @@ print_info_box($sig_warning); has started. The firewall will reboot automatically after storing the new firmware. The configuration will be maintained.</span></td> </table> - </tr> - </td> + </td> + </tr> </table> - </form> <?php endif; endif; ?> <?php include("fend.inc"); ?> |