beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

Change of permissionscheck in UpdateManager

Browse Source
This commit is contained in:
Max Klaversma 2014-01-24 19:00:26 +01:00 committed by Steffen Schröder
parent b59292ca57
commit 3aa0e8d9a7
1 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
application/core/UpdateManager.php
View File

@ -211,7 +211,6 @@ class UpdateManager implements CallbackListener, CommandListener {
return; return;
} }
if($this->checkPermissions($player)) {
$this->maniaControl->chat->sendInformation("Starting Update to Version v{$updateData->version}...", $player->login); $this->maniaControl->chat->sendInformation("Starting Update to Version v{$updateData->version}...", $player->login);
$this->maniaControl->log("Starting Update to Version v{$updateData->version}..."); $this->maniaControl->log("Starting Update to Version v{$updateData->version}...");
$performBackup = $this->maniaControl->settingManager->getSetting($this, self::SETTING_PERFORM_BACKUPS); $performBackup = $this->maniaControl->settingManager->getSetting($this, self::SETTING_PERFORM_BACKUPS);
@ -227,44 +226,6 @@ class UpdateManager implements CallbackListener, CommandListener {
$this->maniaControl->restart(); $this->maniaControl->restart();
} }
}
private function checkPermissions(Player $player) {
$writableDirectories = array('core/', 'plugins/');
$readableDirectories = array('configs/');
$ignore = array('.', '..');
$path = str_replace('core', '', realpath(dirname(__FILE__)));
try {
foreach($writableDirectories as $writableDirecotry) {
$files = scandir($path.$writableDirecotry);
foreach($files as $file) {
if(!in_array($file, $ignore)) {
if(!is_writable($path.$writableDirecotry.$file)) {
throw new \Exception('"'.$path.$writableDirecotry.$file.'" is not writable!');
}
}
}
}
foreach($readableDirectories as $readableDirectory) {
$files = scandir($path.$readableDirectory);
foreach($files as $file) {
if(!in_array($file, $ignore)) {
if(!is_readable($path.$readableDirectory.$file)) {
throw new \Exception('"'.$path.$readableDirectory.$file.'" is not readable!');
}
}
}
}
} catch(\Exception $e) {
$this->maniaControl->log('Cannot update: '.$e->getMessage());
$this->maniaControl->chat->sendError('Cannot update: '.$e->getMessage(), $player->login);
return false;
}
return true;
}
/** /**
* Check given Plugin Class for Update * Check given Plugin Class for Update
@ -379,6 +340,10 @@ class UpdateManager implements CallbackListener, CommandListener {
* @return bool * @return bool
*/ */
private function performCoreUpdate($updateData = null) { private function performCoreUpdate($updateData = null) {
if(!$this->checkPermissions()) {
return false;
}
if(!$updateData) { if(!$updateData) {
$updateData = $this->checkCoreUpdate(); $updateData = $this->checkCoreUpdate();
if(!$updateData) { if(!$updateData) {
@ -409,6 +374,26 @@ class UpdateManager implements CallbackListener, CommandListener {
return true; return true;
} }
private function checkPermissions() {
$writableDirectories = array('core/', 'plugins/');
$ignore = array('.', '..');
$path = str_replace('core', '', realpath(dirname(__FILE__)));
foreach($writableDirectories as $writableDirecotry) {
$files = scandir($path.$writableDirecotry);
foreach($files as $file) {
if(!in_array($file, $ignore)) {
if(!is_writable($path.$writableDirecotry.$file)) {
$this->maniaControl->log('Cannot update: the file/directory "'.$path.$writableDirecotry.$file.'" is not writable!');
return false;
}
}
}
}
return true;
}
/** /**
* Retrieve the Update Channel Setting * Retrieve the Update Channel Setting
* *