mirror/provision_sccp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed resolver -> resolve

Browse Source 
Signed-off-by: Diederik de Groot <ddegroot@talon.nl>
This commit is contained in:
Diederik de Groot
2020-03-18 11:21:48 +01:00
parent 3621e1d6e6
commit c535113c55
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/resolver.php → lib/resolve.php
View File

@@ -34,7 +34,7 @@ class ResolveResult {
const InvalidPath = 7; const InvalidPath = 7;
} }
class Resolver { class Resolve {
private $isDirty = FALSE; private $isDirty = FALSE;
private $cache; private $cache;
private $config; private $config;
@@ -151,7 +151,7 @@ class Resolver {
// Testing // Testing
if(defined('STDIN') ) { if(defined('STDIN') ) {
$resolver = new Resolver($config); $resolve = new Resolve($config);
$test_cases = Array( $test_cases = Array(
Array('request' => 'jar70sccp.9-4-2ES26.sbn', 'expected' => '/data/firmware/7970/jar70sccp.9-4-2ES26.sbn'), Array('request' => 'jar70sccp.9-4-2ES26.sbn', 'expected' => '/data/firmware/7970/jar70sccp.9-4-2ES26.sbn'),
Array('request' => 'Russian_Russian_Federation/be-sccp.jar', 'expected' => '/data/locales/languages/Russian_Russian_Federation/be-sccp.jar'), Array('request' => 'Russian_Russian_Federation/be-sccp.jar', 'expected' => '/data/locales/languages/Russian_Russian_Federation/be-sccp.jar'),
@@ -163,7 +163,7 @@ if(defined('STDIN') ) {
); );
foreach($test_cases as $test) { foreach($test_cases as $test) {
try { try {
$result = $resolver->resolve($test['request']); $result = $resolve->resolve($test['request']);
if (is_string($result)) { if (is_string($result)) {
if ($result === $base_path . $test['expected']) { if ($result === $base_path . $test['expected']) {
print("'" . $test['request'] . "' => '" . $result . "'\n"); print("'" . $test['request'] . "' => '" . $result . "'\n");
@@ -184,7 +184,7 @@ if(defined('STDIN') ) {
print("Exception: " . $e->getMessage() . "\n"); print("Exception: " . $e->getMessage() . "\n");
} }
} }
unset($resolver); unset($resolve);
#unlink($CACHEFILE_NAME); #unlink($CACHEFILE_NAME);
} }
?> ?>

8
srv/tftp/tftp_provisioner
View File

@@ -4,14 +4,14 @@ declare(strict_types=1);
require_once("lib/tftp.php"); require_once("lib/tftp.php");
require_once("lib/config.php"); require_once("lib/config.php");
require_once("lib/resolver.php"); require_once("lib/resolve.php");
use SCCP\TFTP as TFTP; use SCCP\TFTP as TFTP;
use SCCP\Resolve as Resolve; use SCCP\Resolve as Resolve;
class TFTPProvisioner extends TFTP\TFTPServer class TFTPProvisioner extends TFTP\TFTPServer
{ {
private $_debug; private $_debug;
private $_resolver; private $_resolve;
private $_settings_path; private $_settings_path;
function __construct($server_url, $config, $logger = NULL, $debug = false) function __construct($server_url, $config, $logger = NULL, $debug = false)
@@ -23,7 +23,7 @@ class TFTPProvisioner extends TFTP\TFTPServer
parent::__construct($server_url, $logger); parent::__construct($server_url, $logger);
$this->_debug = $debug; $this->_debug = $debug;
$this->max_put_size = 60000000; $this->max_put_size = 60000000;
$this->_resolver = new Resolve\Resolver($config); $this->_resolve = new Resolve\Resolver($config);
$this->_settings_path = $this->_config['main']['base_path'] . DIRECTORY_SEPARATOR $this->_settings_path = $this->_config['main']['base_path'] . DIRECTORY_SEPARATOR
. $this->_config['subdirs']['settings']['path'] . DIRECTORY_SEPARATOR; . $this->_config['subdirs']['settings']['path'] . DIRECTORY_SEPARATOR;
} }
@@ -39,7 +39,7 @@ class TFTPProvisioner extends TFTP\TFTPServer
public function get($peer, $req_filename, $mode) public function get($peer, $req_filename, $mode)
{ {
$filename = $this->_resolver->resolve($req_filename); $filename = $this->_resolve->resolve($req_filename);
if (file_exists($filename) && is_readable($filename)) if (file_exists($filename) && is_readable($filename))
return file_get_contents($filename); return file_get_contents($filename);
return false; return false;

8
srv/web/index.php
View File

@@ -1,6 +1,6 @@
<?php <?php
include_once("../lib/config.php"); include_once("../lib/config.php");
include_once("../lib/resolver.php"); include_once("../lib/resolve.php");
$request = $_REQUEST ?? null; $request = $_REQUEST ?? null;
function send_fallback_html($message) { function send_fallback_html($message) {
@@ -51,11 +51,11 @@ if (!$request || empty($request) || !array_key_exists('filename',$request) || em
} }
try { try {
$req_filename=$request['filename']; $req_filename=$request['filename'];
$resolver = new Resolver($config); $resolve = new Resolver($config);
if (($filename = $resolver->resolve($req_filename))) { if (($filename = $resolve->resolve($req_filename))) {
sendfile($filename); sendfile($filename);
} }
unset($resolver); unset($resolve);
} catch(Exception $e) { } catch(Exception $e) {
send_fallback_html($e->getMessage()); send_fallback_html($e->getMessage());
} }