f2d8ed45e3
This is not really new class. Originally, the validator was implemented in the scope of the tool_installaddon plugin. But we need its features in other parts at the core level (e.g. during the upgrade to validate available missing dependencies or available updates). Looking back, it was a mistake to have it implemented at the plugin level rather than the core level. So this patch moves the tool_installaddon_validator class to \core\update\validator class, together with associated unit tests, fixture files and strings. There were changes made in the tool_installaddon to make use of this new class instead of the old one. This is a great step towards the bright future, hopefully there won't be many regressions. AMOS BEGIN MOV [validationmsg_componentmatch,tool_installaddon],[validationmsg_componentmatch,core_plugin] MOV [validationmsg_componentmismatchname,tool_installaddon],[validationmsg_componentmismatchname,core_plugin] MOV [validationmsg_componentmismatchname_help,tool_installaddon],[validationmsg_componentmismatchname_help,core_plugin] MOV [validationmsg_componentmismatchname_info,tool_installaddon],[validationmsg_componentmismatchname_info,core_plugin] MOV [validationmsg_componentmismatchtype,tool_installaddon],[validationmsg_componentmismatchtype,core_plugin] MOV [validationmsg_componentmismatchtype_info,tool_installaddon],[validationmsg_componentmismatchtype_info,core_plugin] MOV [validationmsg_filenotexists,tool_installaddon],[validationmsg_filenotexists,core_plugin] MOV [validationmsg_filesnumber,tool_installaddon],[validationmsg_filesnumber,core_plugin] MOV [validationmsg_filestatus,tool_installaddon],[validationmsg_filestatus,core_plugin] MOV [validationmsg_filestatus_info,tool_installaddon],[validationmsg_filestatus_info,core_plugin] MOV [validationmsg_foundlangfile,tool_installaddon],[validationmsg_foundlangfile,core_plugin] MOV [validationmsg_maturity,tool_installaddon],[validationmsg_maturity,core_plugin] MOV [validationmsg_maturity_help,tool_installaddon],[validationmsg_maturity_help,core_plugin] MOV [validationmsg_missingcomponent,tool_installaddon],[validationmsg_missingcomponent,core_plugin] MOV [validationmsg_missingcomponent_help,tool_installaddon],[validationmsg_missingcomponent_help,core_plugin] MOV [validationmsg_missingcomponent_link,tool_installaddon],[validationmsg_missingcomponent_link,core_plugin] MOV [validationmsg_missingexpectedlangenfile,tool_installaddon],[validationmsg_missingexpectedlangenfile,core_plugin] MOV [validationmsg_missingexpectedlangenfile_info,tool_installaddon],[validationmsg_missingexpectedlangenfile_info,core_plugin] MOV [validationmsg_missinglangenfile,tool_installaddon],[validationmsg_missinglangenfile,core_plugin] MOV [validationmsg_missinglangenfolder,tool_installaddon],[validationmsg_missinglangenfolder,core_plugin] MOV [validationmsg_missingversion,tool_installaddon],[validationmsg_missingversion,core_plugin] MOV [validationmsg_missingversionphp,tool_installaddon],[validationmsg_missingversionphp,core_plugin] MOV [validationmsg_multiplelangenfiles,tool_installaddon],[validationmsg_multiplelangenfiles,core_plugin] MOV [validationmsg_onedir,tool_installaddon],[validationmsg_onedir,core_plugin] MOV [validationmsg_onedir_help,tool_installaddon],[validationmsg_onedir_help,core_plugin] MOV [validationmsg_pathwritable,tool_installaddon],[validationmsg_pathwritable,core_plugin] MOV [validationmsg_pluginversion,tool_installaddon],[validationmsg_pluginversion,core_plugin] MOV [validationmsg_release,tool_installaddon],[validationmsg_release,core_plugin] MOV [validationmsg_requiresmoodle,tool_installaddon],[validationmsg_requiresmoodle,core_plugin] MOV [validationmsg_rootdir,tool_installaddon],[validationmsg_rootdir,core_plugin] MOV [validationmsg_rootdir_help,tool_installaddon],[validationmsg_rootdir_help,core_plugin] MOV [validationmsg_rootdirinvalid,tool_installaddon],[validationmsg_rootdirinvalid,core_plugin] MOV [validationmsg_rootdirinvalid_help,tool_installaddon],[validationmsg_rootdirinvalid_help,core_plugin] MOV [validationmsg_targetexists,tool_installaddon],[validationmsg_targetexists,core_plugin] MOV [validationmsg_targetexists_help,tool_installaddon],[validationmsg_targetexists_help,core_plugin] MOV [validationmsg_unknowntype,tool_installaddon],[validationmsg_unknowntype,core_plugin] MOV [validationmsg_versionphpsyntax,tool_installaddon],[validationmsg_versionphpsyntax,core_plugin] MOV [validationmsglevel_debug,tool_installaddon],[validationmsglevel_debug,core_plugin] MOV [validationmsglevel_error,tool_installaddon],[validationmsglevel_error,core_plugin] MOV [validationmsglevel_info,tool_installaddon],[validationmsglevel_info,core_plugin] MOV [validationmsglevel_warning,tool_installaddon],[validationmsglevel_warning,core_plugin] AMOS END
200 lines
7.9 KiB
PHP
200 lines
7.9 KiB
PHP
<?php
|
|
|
|
// This file is part of Moodle - http://moodle.org/
|
|
//
|
|
// Moodle is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Moodle is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
/**
|
|
* Provides the unit tests class and some helper classes
|
|
*
|
|
* @package tool_installaddon
|
|
* @category test
|
|
* @copyright 2013 David Mudrak <david@moodle.com>
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
|
|
defined('MOODLE_INTERNAL') || die();
|
|
|
|
|
|
/**
|
|
* Unit tests for the {@link tool_installaddon_installer} class
|
|
*
|
|
* @copyright 2013 David Mudrak <david@moodle.com>
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
class tool_installaddon_installer_testcase extends advanced_testcase {
|
|
|
|
public function test_get_addons_repository_url() {
|
|
$installer = testable_tool_installaddon_installer::instance();
|
|
$url = $installer->get_addons_repository_url();
|
|
$query = parse_url($url, PHP_URL_QUERY);
|
|
$this->assertEquals(1, preg_match('~^site=(.+)$~', $query, $matches));
|
|
$site = rawurldecode($matches[1]);
|
|
$site = json_decode(base64_decode($site), true);
|
|
$this->assertInternalType('array', $site);
|
|
$this->assertEquals(3, count($site));
|
|
$this->assertSame('Nasty site', $site['fullname']);
|
|
$this->assertSame('file:///etc/passwd', $site['url']);
|
|
$this->assertSame("2.5'; DROP TABLE mdl_user; --", $site['majorversion']);
|
|
}
|
|
|
|
public function test_extract_installfromzip_file() {
|
|
global $CFG;
|
|
|
|
$jobid = md5(rand().uniqid('test_', true));
|
|
$sourcedir = make_temp_directory('tool_installaddon/'.$jobid.'/source');
|
|
$contentsdir = make_temp_directory('tool_installaddon/'.$jobid.'/contents');
|
|
copy($CFG->libdir.'/tests/fixtures/update_validator/zips/invalidroot.zip', $sourcedir.'/testinvalidroot.zip');
|
|
|
|
$installer = tool_installaddon_installer::instance();
|
|
$files = $installer->extract_installfromzip_file($sourcedir.'/testinvalidroot.zip', $contentsdir, 'fixed_root');
|
|
$this->assertInternalType('array', $files);
|
|
$this->assertCount(4, $files);
|
|
$this->assertSame(true, $files['fixed_root/']);
|
|
$this->assertSame(true, $files['fixed_root/lang/']);
|
|
$this->assertSame(true, $files['fixed_root/lang/en/']);
|
|
$this->assertSame(true, $files['fixed_root/lang/en/fixed_root.php']);
|
|
foreach ($files as $file => $status) {
|
|
if (substr($file, -1) === '/') {
|
|
$this->assertTrue(is_dir($contentsdir.'/'.$file));
|
|
} else {
|
|
$this->assertTrue(is_file($contentsdir.'/'.$file));
|
|
}
|
|
}
|
|
}
|
|
|
|
public function test_decode_remote_request() {
|
|
$installer = testable_tool_installaddon_installer::instance();
|
|
|
|
$request = base64_encode(json_encode(array(
|
|
'name' => '<h1>Stamp collection</h1>"; DELETE FROM mdl_users; --',
|
|
'component' => 'mod_stampcoll',
|
|
'version' => 2013032800,
|
|
)));
|
|
$request = $installer->testable_decode_remote_request($request);
|
|
$this->assertTrue(is_object($request));
|
|
// One, my little hobbit, never trusts the input parameters!
|
|
$this->assertEquals('Stamp collection"; DELETE FROM mdl_users; --', $request->name);
|
|
$this->assertEquals('mod_stampcoll', $request->component);
|
|
$this->assertEquals(2013032800, $request->version);
|
|
|
|
$request = base64_encode(json_encode(array(
|
|
'name' => 'Theme with invalid version number',
|
|
'component' => 'theme_invalid',
|
|
'version' => '1.0',
|
|
)));
|
|
$this->assertSame(false, $installer->testable_decode_remote_request($request));
|
|
|
|
$request = base64_encode(json_encode(array(
|
|
'name' => 'Invalid activity name',
|
|
'component' => 'mod_invalid_activity',
|
|
'version' => 2013032800,
|
|
)));
|
|
$this->assertSame(false, $installer->testable_decode_remote_request($request));
|
|
|
|
$request = base64_encode(json_encode(array(
|
|
'name' => 'Moodle 3.0',
|
|
'component' => 'core',
|
|
'version' => 2022010100,
|
|
)));
|
|
$this->assertSame(false, $installer->testable_decode_remote_request($request));
|
|
|
|
$request = base64_encode(json_encode(array(
|
|
'name' => 'Invalid core subsystem',
|
|
'component' => 'core_cache',
|
|
'version' => 2014123400,
|
|
)));
|
|
$this->assertSame(false, $installer->testable_decode_remote_request($request));
|
|
|
|
$request = base64_encode(json_encode(array(
|
|
'name' => 'Non-existing plugintype',
|
|
'component' => 'david_mudrak',
|
|
'version' => 2012123199,
|
|
)));
|
|
$this->assertSame(false, $installer->testable_decode_remote_request($request));
|
|
|
|
$request = base64_encode(json_encode(array(
|
|
'name' => 'Bogus module name',
|
|
'component' => 'mod_xxx_yyy',
|
|
'version' => 2012123190,
|
|
)));
|
|
$this->assertSame(false, $installer->testable_decode_remote_request($request));
|
|
}
|
|
|
|
public function test_move_directory() {
|
|
$jobid = md5(rand().uniqid('test_', true));
|
|
$jobroot = make_temp_directory('tool_installaddon/'.$jobid);
|
|
$contentsdir = make_temp_directory('tool_installaddon/'.$jobid.'/contents/sub/folder');
|
|
file_put_contents($contentsdir.'/readme.txt', 'Hello world!');
|
|
|
|
$installer = tool_installaddon_installer::instance();
|
|
$installer->move_directory($jobroot.'/contents', $jobroot.'/moved', 0777, 0666);
|
|
|
|
$this->assertFalse(is_dir($jobroot.'/contents'));
|
|
$this->assertTrue(is_file($jobroot.'/moved/sub/folder/readme.txt'));
|
|
$this->assertSame('Hello world!', file_get_contents($jobroot.'/moved/sub/folder/readme.txt'));
|
|
}
|
|
|
|
public function test_detect_plugin_component() {
|
|
global $CFG;
|
|
|
|
$jobid = md5(rand().uniqid('test_', true));
|
|
$workdir = make_temp_directory('tool_installaddon/'.$jobid.'/version');
|
|
$zipfile = $CFG->libdir.'/tests/fixtures/update_validator/zips/bar.zip';
|
|
$installer = tool_installaddon_installer::instance();
|
|
$this->assertEquals('foo_bar', $installer->detect_plugin_component($zipfile, $workdir));
|
|
}
|
|
|
|
public function test_detect_plugin_component_from_versionphp() {
|
|
$installer = testable_tool_installaddon_installer::instance();
|
|
$this->assertEquals('bar_bar_conan', $installer->detect_plugin_component_from_versionphp('
|
|
$plugin->version = 2014121300;
|
|
$plugin->component= "bar_bar_conan" ; // Go Arnie go!'));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Testable subclass of the tested class
|
|
*
|
|
* @copyright 2013 David Mudrak <david@moodle.com>
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
class testable_tool_installaddon_installer extends tool_installaddon_installer {
|
|
|
|
public function get_site_fullname() {
|
|
return strip_tags('<h1 onmouseover="alert(\'Hello Moodle.org!\');">Nasty site</h1>');
|
|
}
|
|
|
|
public function get_site_url() {
|
|
return 'file:///etc/passwd';
|
|
}
|
|
|
|
public function get_site_major_version() {
|
|
return "2.5'; DROP TABLE mdl_user; --";
|
|
}
|
|
|
|
public function testable_decode_remote_request($request) {
|
|
return parent::decode_remote_request($request);
|
|
}
|
|
|
|
protected function should_send_site_info() {
|
|
return true;
|
|
}
|
|
|
|
public function detect_plugin_component_from_versionphp($code) {
|
|
return parent::detect_plugin_component_from_versionphp($code);
|
|
}
|
|
}
|