Add dependency validation
parent
75661ada39
commit
9a1cabff9d
|
@ -6,6 +6,7 @@ interface h5pFramework {
|
||||||
public function getUploadedH5pDir();
|
public function getUploadedH5pDir();
|
||||||
public function getTempPath();
|
public function getTempPath();
|
||||||
public function getUploadedH5pPath();
|
public function getUploadedH5pPath();
|
||||||
|
public function isStoredLibrary($machineName, $minimumVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
class h5pValidator {
|
class h5pValidator {
|
||||||
|
@ -78,6 +79,8 @@ class h5pValidator {
|
||||||
$file_path = $tmp_dir . DIRECTORY_SEPARATOR . $file;
|
$file_path = $tmp_dir . DIRECTORY_SEPARATOR . $file;
|
||||||
if (strtolower($file) == 'h5p.json') {
|
if (strtolower($file) == 'h5p.json') {
|
||||||
$json_exists = TRUE;
|
$json_exists = TRUE;
|
||||||
|
// TODO: Validate this main h5p.json file
|
||||||
|
// TODO: Make sure preloadedDependencies isn't required in the libraries
|
||||||
}
|
}
|
||||||
|
|
||||||
elseif (strtolower($file) == 'h5p.jpg') {
|
elseif (strtolower($file) == 'h5p.jpg') {
|
||||||
|
@ -132,16 +135,53 @@ class h5pValidator {
|
||||||
$validLibrary = $this->isExcistingFiles($h5pData->preloadedCss, $tmp_dir, $file) && $validLibrary;
|
$validLibrary = $this->isExcistingFiles($h5pData->preloadedCss, $tmp_dir, $file) && $validLibrary;
|
||||||
}
|
}
|
||||||
if ($validLibrary) {
|
if ($validLibrary) {
|
||||||
$libraries[$file][$h5pData['mainVersion']] = TRUE;
|
$libraries[$file][$h5pData['mainVersion']] = $h5pData;
|
||||||
}
|
}
|
||||||
$valid = $validLibrary && $valid;
|
$valid = $validLibrary && $valid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($valid) {
|
if ($valid) {
|
||||||
// TODO: Load info about excisting libraries from database
|
// TODO: Also validate the main h5p.json file
|
||||||
// TODO: validate dependencies
|
$missingLibraries = $this->getMissingLibraries($libraries);
|
||||||
|
foreach ($missingLibraries as $missing) {
|
||||||
|
if ($this->h5pF->isStoredLibrary($missing['machineName'], $missing['minimumVersion'])) {
|
||||||
|
unset($missingLibraries[$missing['machineName']]);
|
||||||
}
|
}
|
||||||
// TODO: Handle invalid packages(delete them and communicate it to the framework)
|
}
|
||||||
|
$valid = empty($missingLibraries) && $valid;
|
||||||
|
}
|
||||||
|
if (!$valid) {
|
||||||
|
$this->delTree($tmp_dir);
|
||||||
|
}
|
||||||
|
return $valid;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getMissingLibraries($libraries) {
|
||||||
|
$missing = array();
|
||||||
|
foreach ($libraries as $library) {
|
||||||
|
if (isset($library['preloadedDependencies'])) {
|
||||||
|
array_merge($missing, $this->getMissingDependencies($library['preloadedDependencies'], $libraries));
|
||||||
|
}
|
||||||
|
if (isset($library['dynamicDependencies'])) {
|
||||||
|
array_merge($missing, $this->getMissingDependencies($library['dynamicDependencies'], $libraries));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $missing;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getMissingDependencies($dependencies, $libraries) {
|
||||||
|
$missing = array();
|
||||||
|
foreach ($library['preloadedDependencies'] as $dependency) {
|
||||||
|
if (isset($libraries[$dependency['machineName']])) {
|
||||||
|
if ($libraries[$dependency['machineName']]['minimumVersion'] < $dependency['minimumVersion']) {
|
||||||
|
$missing[$dependency['machineName']] = $dependency;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$missing[$dependency['machineName']] = $dependency;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $missing;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function isExcistingFiles($files, $tmp_dir, $library) {
|
private function isExcistingFiles($files, $tmp_dir, $library) {
|
||||||
|
@ -243,21 +283,12 @@ class h5pValidator {
|
||||||
* @param string $dir Directory.
|
* @param string $dir Directory.
|
||||||
* @return boolean Indicates if the directory existed.
|
* @return boolean Indicates if the directory existed.
|
||||||
*/
|
*/
|
||||||
private function rRmdir($dir) {
|
public static function delTree($dir) {
|
||||||
if (is_dir($dir)) {
|
$files = array_diff(scandir($dir), array('.','..'));
|
||||||
$files = scandir($dir);
|
foreach ($files as $file) {
|
||||||
for ($i = 2, $s = count($files); $i < $s; $i++) {
|
(is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
|
||||||
$file = $dir . DIRECTORY_SEPARATOR . $files[$i];
|
|
||||||
if (!$this->rRmdir($file)) {
|
|
||||||
unlink($file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rmdir($dir);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
|
return rmdir($dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue