- Fixed typo in lib/resolver.php

- Added temporary tftptestserver.php
- Added example file for nginx, for the new tftpboot server using index.php

Signed-off-by: Diederik de Groot <ddegroot@talon.nl>

etc/nginx/sites-available/new_tftpboot

@@ -0,0 +1,29 @@
+server {
+	listen 6971;
+	server_name tftp.servername.org;
+	root /data/development/sccp/sources/tftp/tftpboot;
+
+	# Normal Logging
+	access_log /var/log/nginx/tftp1.access.log;
+	error_log /var/log/nginx/tftp1.error.log;
+
+	index           index.php;
+	location ~ \.php$ {
+		fastcgi_split_path_info ^(.+\.php)(/.+)$;
+		fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
+		fastcgi_index index.php;
+		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+		include fastcgi_params;
+	}
+
+	location / {
+		try_files $uri $uri/ /index.php$is_args$args;
+		rewrite ^/(.*)$ /index.php?filename=$1 last;
+	}
+
+	error_page 404 /;
+	error_page 500 502 503 504 /50x.html;
+	location = /50x.html {
+		root /usr/share/nginx/html;
+	}
+}

lib/resolver.php

@@ -136,7 +136,7 @@ if(defined('STDIN') ) {
 		Array('request' => 'Russian_Russian_Federation/be-sccp.jar', 'expected' => '/tftpboot/locales/languages/Russian_Russian_Federation/be-sccp.jar'),
 		Array('request' => 'Spain/g3-tones.xml', 'expected' => '/tftpboot/locales/countries/Spain/g3-tones.xml'),
 		Array('request' => '320x196x4/Chan-SCCP-b.png', 'expected' => '/tftpboot/wallpapers/320x196x4/Chan-SCCP-b.png'),
-		Array('request' => 'XMLDefault.cnf.xml', 'expected' => '/tftpboot/settings/bak/XMLDefault.cnf.xml'),
+		Array('request' => 'XMLDefault.cnf.xml', 'expected' => '/tftpboot/settings/XMLDefault.cnf.xml'),
 		Array('request' => '../XMLDefault.cnf.xml', 'expected' => ResolveResult::RequestContainsPathWalk),
 		Array('request' => 'XMLDefault.cnf.xml/../../text.xml', 'expected' => ResolveResult::RequestContainsPathWalk),
 	);

tftptestserver.php

@@ -0,0 +1,136 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Functional test for TFTPServer
+ *
+ * Copyright (c) 2011 <mattias.wadman@gmail.com>
+ *
+ * MIT License:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+require_once("lib/tftp.php");
+
+class TestTFTPServer extends TFTPServer
+{
+  private $_files = array();
+  private $_debug;
+
+  function __construct($server_url, $logger = NULL, $debug = false)
+  {
+    parent::__construct($server_url, $logger);
+    $this->_debug = $debug;
+    $this->max_put_size = 60000000;
+  }
+
+  private function log($peer, $level, $message)
+  {
+    echo
+      date("H:i:s") . " " .
+      $level . " " .
+      $peer . " " .
+      $message . "\n";
+  }
+
+  public function log_debug($peer, $message)
+  {
+    if(!$this->_debug)
+      return;
+
+    $this->log($peer, "D", $message);
+  }
+
+  public function log_info($peer, $message)
+  {
+    $this->log($peer, "I", $message);
+  }
+
+  public function log_warning($peer, $message)
+  {
+    $this->log($peer, "W", $message);
+  }
+
+  public function log_error($peer, $message)
+  {
+    $this->log($peer, "E", $message);
+  }
+
+  public function exists($peer, $filename)
+  {
+    if($filename == "not_writable" || $filename == "not_readable")
+      return true;
+
+    return isset($this->_files[$filename]);
+  }
+
+  public function readable($peer, $filename)
+  {
+    if($filename == "not_readable")
+      return false;
+
+    return isset($this->_files[$filename]);
+  }
+
+  public function get($peer, $filename, $mode)
+  {
+    if(isset($this->_files[$filename]))
+      return $this->_files[$filename];
+    else
+      return false;
+  }
+
+  public function writable($peer, $filename)
+  {
+    if($filename == "not_writable")
+      return false;
+
+    return true;
+  }
+
+  public function put($peer, $filename, $mode, $content)
+  {
+    $this->_files[$filename] = $content;
+  }
+}
+
+$host = "127.0.0.1";
+$port = 1196;
+$url = "udp://$host:$port";
+
+if(count($_SERVER["argv"]) > 1) {
+  $server = new TestTFTPServer($url, true);
+  if(!$server->loop($error))
+    die("$error\n");
+} else {
+
+  $pid = pcntl_fork();
+  $logger = new Logger_Stdout('LOG_DEBUG');
+  if($pid == 0) {
+    $server = new TestTFTPServer($url, $logger);
+    if(!$server->loop($error))
+      die("$error\n");
+    exit(0);
+  }
+  usleep(100000);
+  // kill server
+  posix_kill($pid, SIGINT);
+}
+
+?>
+