aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-05-06 15:39:27 -0400
committerjim-p <jimp@pfsense.org>2011-05-06 15:39:27 -0400
commitdceb67ec01824f07e585d7894888721ee4eb2590 (patch)
treef09ccdcb67efda6dbca8171ab04d46db05372438
parent8ab4016b7681c4b264c7b7230ab1c2e23b0c2ee1 (diff)
downloadpfsense-packages-dceb67ec01824f07e585d7894888721ee4eb2590.tar.gz
pfsense-packages-dceb67ec01824f07e585d7894888721ee4eb2590.tar.bz2
pfsense-packages-dceb67ec01824f07e585d7894888721ee4eb2590.zip
Add a TFTP package fixed for pfSense 2.0
-rw-r--r--config/tftp2/tftp.inc126
-rw-r--r--config/tftp2/tftp.xml83
-rw-r--r--config/tftp2/tftp_files.php257
-rwxr-xr-xpkg_config.8.xml7
-rwxr-xr-xpkg_config.8.xml.amd647
5 files changed, 472 insertions, 8 deletions
diff --git a/config/tftp2/tftp.inc b/config/tftp2/tftp.inc
new file mode 100644
index 00000000..698122d2
--- /dev/null
+++ b/config/tftp2/tftp.inc
@@ -0,0 +1,126 @@
+<?php
+/* $Id$ */
+/*
+/* ========================================================================== */
+/*
+ tftp_inc.php
+ Copyright (C) 2008 Mark J Crane
+ 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.
+*/
+
+function tftp_guid() {
+ if (function_exists('com_create_guid')){
+ return com_create_guid();
+ }else{
+ mt_srand((double)microtime()*10000);//optional for php 4.2.0 and up.
+ $charid = strtoupper(md5(uniqid(rand(), true)));
+ $hyphen = chr(45);// "-"
+ $uuid = chr(123)// "{"
+ .substr($charid, 0, 8).$hyphen
+ .substr($charid, 8, 4).$hyphen
+ .substr($charid,12, 4).$hyphen
+ .substr($charid,16, 4).$hyphen
+ .substr($charid,20,12)
+ .chr(125);// "}"
+ return $uuid;
+ }
+}
+
+function tftp_pkg_is_service_running($servicename) {
+ exec("/bin/ps ax | awk '{ print $5 }'", $psout);
+ array_shift($psout);
+ foreach($psout as $line) {
+ $ps[] = trim(array_pop(explode(' ', array_pop(explode('/', $line)))));
+ }
+ if(is_service_running($servicename, $ps) or is_process_running($servicename) ) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+function tftp_byte_convert( $bytes ) {
+
+ if ($bytes<=0)
+ return '0 Byte';
+
+ $convention=1000; //[1000->10^x|1024->2^x]
+ $s=array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
+ $e=floor(log($bytes,$convention));
+ return round($bytes/pow($convention,$e),2).' '.$s[$e];
+}
+
+function tftp_install_command() {
+ global $config;
+ conf_mount_rw();
+
+ if (!is_dir('/tftpboot')) {
+ // Create the directory
+ exec("mkdir /tftpboot");
+
+ //Set the directory permissions
+ exec("chmod -R 777 /tftpboot");
+ }
+
+ if (!is_dir('/root/backup/')) {
+ // Create the backup directory
+ exec("mkdir /root/backup/");
+ }
+
+ // if backup file exists restore it
+ $filename = 'tftp.bak.tgz';
+
+ //extract a specific directory to /usr/local/freeswitch
+ if (file_exists('/root/backup/'.$filename)) {
+ system('cd /; tar xvpfz /root/backup/tftp.bak.tgz');
+ system('chmod -R 744 /tftpboot/*');
+ unset($filename);
+ }
+}
+
+function tftp_deinstall_command() {
+
+ unlink_if_exists("/usr/local/pkg/tftp.xml");
+ unlink_if_exists("/usr/local/pkg/tftp.inc");
+ unlink_if_exists("/usr/local/www/packages/tftp/tftp_files.php");
+ exec("rm -R /usr/local/www/packages/tftp/");
+
+ //exec("rm -R /tftpboot");
+ unlink_if_exists("/usr/local/etc/rc.d/tftp.sh");
+ unlink_if_exists("/tmp/pkg_mgr_tftp.log");
+}
+
+function tftp_generate_rules($type) {
+ if ($type != "nat")
+ return;
+ // Open inetd.conf write handle
+ $inetd_fd = fopen("/var/etc/inetd.conf","a+");
+ /* add tftp daemon */
+ fwrite($inetd_fd, "tftp\t\tdgram\tudp\twait\t\troot\t/usr/libexec/tftpd\ttftpd /tftpboot\n");
+ fclose($inetd_fd); // Close file handle
+}
+?>
diff --git a/config/tftp2/tftp.xml b/config/tftp2/tftp.xml
new file mode 100644
index 00000000..6d757cc4
--- /dev/null
+++ b/config/tftp2/tftp.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<packagegui>
+ <copyright>
+ <![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+ tftp.xml
+ Copyright (C) 2008 Mark J Crane
+ 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.
+ */
+/* ========================================================================== */
+ ]]>
+ </copyright>
+ <description></description>
+ <requirements>Describe your package requirements here</requirements>
+ <faq>Currently there are no FAQ items provided.</faq>
+ <name>tftp Settings</name>
+ <version>2.0</version>
+ <title>TFTP: Settings</title>
+ <include_file>/usr/local/pkg/tftp.inc</include_file>
+ <menu>
+ <name>TFTP</name>
+ <tooltiptext>Add or Remove files for TFTP.</tooltiptext>
+ <section>Services</section>
+ <configfile>tftp.xml</configfile>
+ <url>tftp_files.php</url>
+ </menu>
+ <service>
+ <name>tftp</name>
+ <executable>inetd</executable>
+ <description>Trivial File Transport Protocol is a very simple file transfer protocol. Often used with routers, voip phones and more.</description>
+ </service>
+ <tabs>
+ <tab>
+ <text>Files</text>
+ <url>tftp_files.php</url>
+ </tab>
+ </tabs>
+ <configpath>installedpackages->$packagename</configpath>
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <chmod>0755</chmod>
+ <item>http://www.pfsense.com/packages/config/tftp/tftp.inc</item>
+ </additional_files_needed>
+ <additional_files_needed>
+ <prefix>/usr/local/www/</prefix>
+ <chmod>0755</chmod>
+ <item>http://www.pfsense.com/packages/config/tftp/tftp_files.php</item>
+ </additional_files_needed>
+ <custom_php_install_command>
+ tftp_install_command();
+ </custom_php_install_command>
+ <custom_php_deinstall_command>
+ tftp_deinstall_command();
+ </custom_php_deinstall_command>
+ <filter_rules_needed>tftp_generate_rules</filter_rules_needed>
+</packagegui> \ No newline at end of file
diff --git a/config/tftp2/tftp_files.php b/config/tftp2/tftp_files.php
new file mode 100644
index 00000000..a55e92c6
--- /dev/null
+++ b/config/tftp2/tftp_files.php
@@ -0,0 +1,257 @@
+<?php
+/* $Id$ */
+/*
+ tftp_files.php
+ Copyright (C) 2008 Mark J Crane
+ 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.
+*/
+
+require_once("guiconfig.inc");
+require_once("/usr/local/pkg/tftp.inc");
+
+$filename = $_GET['filename'];
+if (($_GET['a'] == "download") && $_GET['t'] == "backup") {
+ conf_mount_rw();
+ $tmp = '/root/backup/';
+ $filename = 'tftp.bak.tgz';
+ system('cd /;tar cvzf /root/backup/tftp.bak.tgz tftpboot');
+ conf_mount_ro();
+}
+if (($_GET['a'] == "download") && file_exists("/root/backup/".$filename)) {
+
+ session_cache_limiter('public');
+ $fd = fopen("/root/backup/".$filename, "rb");
+ header("Content-Type: application/force-download");
+ header("Content-Type: application/octet-stream");
+ header("Content-Type: application/download");
+ header("Content-Description: File Transfer");
+ header('Content-Disposition: attachment; filename="'.$filename.'"');
+ header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
+ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+ header("Content-Length: " . filesize("/root/backup/".$filename));
+ fpassthru($fd);
+ exit;
+}
+
+
+if ($_GET['a'] == "other") {
+ if ($_GET['t'] == "restore") {
+ $tmp = '/root/backup/';
+ $filename = 'tftp.bak.tgz';
+
+ //extract a specific directory to /tftpboot
+ if (file_exists('/root/backup/'.$filename)) {
+ //echo "The file $filename exists";
+ conf_mount_rw();
+ system('cd /; tar xvpfz /root/backup/'.$filename);
+ system('chmod -R 744 /tftpboot/*');
+ header( 'Location: tftp_files.php?savemsg=Backup+has+been+restored.' ) ;
+ conf_mount_ro();
+ }
+ else {
+ header( 'Location: tftp_files.php?savemsg=Restore+failed.+Backup+file+not+found.' ) ;
+ }
+
+ exit;
+ }
+}
+
+
+if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
+ conf_mount_rw();
+ move_uploaded_file($_FILES['ulfile']['tmp_name'], "/tftpboot/" . $_FILES['ulfile']['name']);
+ $savemsg = "Uploaded file to /tftpboot/" . htmlentities($_FILES['ulfile']['name']);
+ system('chmod -R 744 /tftpboot/*');
+ unset($_POST['txtCommand']);
+ conf_mount_ro();
+}
+
+
+if ($_GET['act'] == "del") {
+ if ($_GET['type'] == 'tftp') {
+ conf_mount_rw();
+ unlink_if_exists("/tftpboot/".$_GET['filename']);
+ conf_mount_ro();
+ header("Location: tftp_files.php");
+ exit;
+ }
+}
+
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle">TFTP: Files</p>
+
+<?php
+$savemsg = $_GET["savemsg"];
+if ($savemsg) {
+ print_info_box($savemsg);
+}
+?>
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td class="tabnavtbl">
+<?php
+
+ $tab_array = array();
+ $tab_array[] = array(gettext("Files"), false, "/packages/tftp/tftp_files.php");
+ display_top_tabs($tab_array);
+
+?>
+</td></tr>
+</table>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="tabcont" >
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td><p><span class="vexpl"><span class="red"><strong>TFTP files<br />
+ </strong></span>
+ Trivial File Transport Protocol is a very simple file transfer
+ protocol. Use the file upload to add files to the /tftpboot directory.
+ Click on the file from the file list below to download it.
+ </span></p></td>
+ </tr>
+ </table>
+ <br />
+
+
+ <div id="niftyOutter">
+ <form action="tftp_files.php" method="POST" enctype="multipart/form-data" name="frmUpload" onSubmit="">
+ <table>
+
+ <tr>
+ <td align="right">File to upload:</td>
+ <td valign="top" class="label">
+ <input name="ulfile" type="file" class="button" id="ulfile">
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">&nbsp;&nbsp;&nbsp;</td>
+ <td valign="top" class="label">
+ <input name="submit" type="submit" class="button" id="upload" value="Upload"></td>
+ </tr>
+
+ </table>
+ </div>
+ </form>
+
+ <br />
+ <br />
+
+ <?php
+ echo "<table width='690' cellpadding='0' cellspacing='0' border='0'>\n";
+ echo "<tr>\n";
+ echo "<td width='80%'>\n";
+ echo "<b>Backup / Restore</b><br />\n";
+ echo "The 'backup' button will tar gzip /tftpboot/ to /root/backup/tftp.bak.tgz it then presents a file to download. \n";
+ echo "If the backup file does not exist in /root/backup/tftp.bak.tgz then the 'restore' button will be hidden. \n";
+ echo "Use Diagnostics->Command->File to upload: to browse to the file and then click on upload it now ready to be restored. \n";
+ echo "<br /><br />\n";
+ echo "</td>\n";
+ echo "<td width='20%' valign='middle' align='right'>\n";
+ echo " <input type='button' value='backup' onclick=\"document.location.href='/packages/tftp/tftp_files.php?a=download&t=backup';\" />\n";
+ if (file_exists('/root/backup/tftp.bak.tgz')) {
+ echo " <input type='button' value='restore' onclick=\"document.location.href='/packages/tftp/tftp_files.php?a=other&t=restore';\" />\n";
+ }
+ echo "</td>\n";
+ echo "</tr>\n";
+ echo "</table>\n";
+ echo "<br /><br />\n\n";
+ ?>
+
+
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="25%" class="listhdrr">File Name (download)</td>
+ <td width="50%" class="listhdr">Last Modified</td>
+ <td width="50%" class="listhdr">Size</td>
+ </tr>
+
+ <?php
+ if ($handle = opendir('/tftpboot')) {
+ while (false !== ($file = readdir($handle))) {
+ if ($file != "." && $file != "..") {
+
+ $tftp_filesize = filesize('/tftpboot/'.$file);
+ $tftp_filesize = tftp_byte_convert($tftp_filesize);
+
+ echo "<tr>\n";
+ echo " <td class=\"listlr\" ondblclick=\"\">\n";
+ echo " <a href=\"tftp_files.php?a=download&filename=".$file."\">\n";
+ echo " $file";
+ echo " </a>";
+ echo " </td>\n";
+ echo " <td class=\"listlr\" ondblclick=\"\">\n";
+ echo date ("F d Y H:i:s", filemtime('/tftpboot/'.$file));
+ echo " </td>\n";
+ echo " <td class=\"listlr\" ondblclick=\"\">\n";
+ echo " ".$tftp_filesize;
+ echo " </td>\n";
+ echo " <td valign=\"middle\" nowrap class=\"list\">\n";
+ echo " <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
+ echo " <tr>\n";
+ echo " <td valign=\"middle\"><form method='POST' action='/edit.php' target='_blank'><input type='hidden' name='savetopath' value='/tftpboot/".$file."'><input type='hidden' name='submit' value='Load'><input type='image' src=\"/themes/".$g['theme']."/images/icons/icon_e.gif\" width=\"17\" height=\"17\" border=\"0\"></form></td>\n";
+ echo " <td><a href=\"tftp_files.php?type=tftp&act=del&filename=".$file."\" onclick=\"return confirm('Do you really want to delete this file?')\"><img src=\"/themes/". $g['theme']."/images/icons/icon_x.gif\" width=\"17\" height=\"17\" border=\"0\"></a></td>\n";
+ echo " </tr>\n";
+ echo " </table>\n";
+ echo " </td>\n";
+ echo "</tr>\n";
+
+ }
+ }
+ closedir($handle);
+ }
+ ?>
+
+ <tr>
+ <td class="list" colspan="3"></td>
+ <td class="list"></td>
+ </tr>
+ </table>
+
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
+</td>
+</tr>
+</table>
+
+</div>
+
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 3ace991d..702ef870 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -222,12 +222,11 @@
<descr>Trivial File Transport Protocol is a very simple file transfer protocol. Often used with routers, voip phones and more.</descr>
<category>Services</category>
<pkginfolink/>
- <config_file>http://www.pfsense.com/packages/config/tftp/tftp.xml</config_file>
+ <config_file>http://www.pfsense.com/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>1.0.5</version>
+ <version>2.0</version>
<status>Stable</status>
- <required_version>1.2.1</required_version>
- <maintainer>markjcrane@gmail.com</maintainer>
+ <required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>
</package>
<package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 39bd360c..ef284c04 100755
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -273,12 +273,11 @@
<descr>Trivial File Transport Protocol is a very simple file transfer protocol. Often used with routers, voip phones and more.</descr>
<category>Services</category>
<pkginfolink/>
- <config_file>http://www.pfsense.com/packages/config/tftp/tftp.xml</config_file>
+ <config_file>http://www.pfsense.com/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>1.0.5</version>
+ <version>2.0</version>
<status>Stable</status>
- <required_version>1.2.1</required_version>
- <maintainer>markjcrane@gmail.com</maintainer>
+ <required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>
</package>
<package>