harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if target directories are writable when adding, updating, or removing plugin repos

Browse Source
This commit is contained in:
Andrew Manning 2016-05-11 05:53:23 -04:00
parent 40e3d37a72
commit c7698e4dc3
2 changed files with 94 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
Zotlabs/Module/Admin.php
View File

@ -1717,130 +1717,156 @@ class Admin extends \Zotlabs\Web\Controller {
} }
function admin_page_plugins_post($action) { function admin_page_plugins_post($action) {
switch($action) { switch ($action) {
case 'updaterepo': case 'updaterepo':
if(array_key_exists('repoName', $_REQUEST)) { if (array_key_exists('repoName', $_REQUEST)) {
$repoName = $_REQUEST['repoName']; $repoName = $_REQUEST['repoName'];
} else { } else {
json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
} }
$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/'.$repoName; $repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName;
if(!is_dir($repoDir)) { if (!is_dir($repoDir)) {
logger('Repo directory does not exist: ' . $repoDir);
json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
} }
if (!is_writable($repoDir)) {
logger('Repo directory not writable to web server: ' . $repoDir);
json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
}
$git = new GitRepo('sys', null, false, $repoName, $repoDir); $git = new GitRepo('sys', null, false, $repoName, $repoDir);
try { try {
if($git->pull()) { if ($git->pull()) {
json_return_and_die(array('message' => 'Repo updated.', 'success' => true)); json_return_and_die(array('message' => 'Repo updated.', 'success' => true));
} else { } else {
json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
} }
} catch(\PHPGit\Exception\GitException $e) { } catch (\PHPGit\Exception\GitException $e) {
json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
} }
case 'removerepo': case 'removerepo':
if(array_key_exists('repoName', $_REQUEST)) { if (array_key_exists('repoName', $_REQUEST)) {
$repoName = $_REQUEST['repoName']; $repoName = $_REQUEST['repoName'];
} else { } else {
json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
} }
$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/'.$repoName; $repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName;
if(!is_dir($repoDir)) { if (!is_dir($repoDir)) {
logger('Repo directory does not exist: ' . $repoDir);
json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
} }
if (!is_writable($repoDir)) {
logger('Repo directory not writable to web server: ' . $repoDir);
json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
}
// TODO: remove directory and unlink /addon/files // TODO: remove directory and unlink /addon/files
if(rrmdir($repoDir)) { if (rrmdir($repoDir)) {
json_return_and_die(array('message' => 'Repo deleted.', 'success' => true)); json_return_and_die(array('message' => 'Repo deleted.', 'success' => true));
} else { } else {
json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false));
} }
case 'installrepo': case 'installrepo':
require_once('library/markdown.php'); require_once('library/markdown.php');
if(array_key_exists('repoURL',$_REQUEST)) { if (array_key_exists('repoURL', $_REQUEST)) {
require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies
$repoURL = $_REQUEST['repoURL']; $repoURL = $_REQUEST['repoURL'];
$extendDir = __DIR__ . '/../../store/git/sys/extend'; $extendDir = __DIR__ . '/../../store/git/sys/extend';
$addonDir = $extendDir.'/addon'; $addonDir = $extendDir . '/addon';
if(!file_exists($extendDir)) { if (!file_exists($extendDir)) {
if(!mkdir($extendDir, 0770, true)) { if (!mkdir($extendDir, 0770, true)) {
logger('Error creating extend folder: ' . $extendDir); logger('Error creating extend folder: ' . $extendDir);
json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
} else { } else {
if(!symlink(__DIR__ . '/../../extend/addon', $addonDir)) { if (!symlink(__DIR__ . '/../../extend/addon', $addonDir)) {
logger('Error creating symlink to addon folder: ' . $addonDir); logger('Error creating symlink to addon folder: ' . $addonDir);
json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
} }
} }
} }
if (!is_writable($extendDir)) {
logger('Directory not writable to web server: ' . $extendDir);
json_return_and_die(array('message' => 'Directory not writable to web server.', 'success' => false));
}
$repoName = null; $repoName = null;
if(array_key_exists('repoName',$_REQUEST) && $_REQUEST['repoName'] !== '') { if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
$repoName = $_REQUEST['repoName']; $repoName = $_REQUEST['repoName'];
} else { } else {
$repoName = GitRepo::getRepoNameFromURL($repoURL); $repoName = GitRepo::getRepoNameFromURL($repoURL);
} }
if(!$repoName) { if (!$repoName) {
logger('Invalid git repo'); logger('Invalid git repo');
json_return_and_die(array('message' => 'Invalid git repo', 'success' => false)); json_return_and_die(array('message' => 'Invalid git repo', 'success' => false));
} }
$repoDir = $addonDir.'/'.$repoName; $repoDir = $addonDir . '/' . $repoName;
$tempAddonDir = __DIR__ . '/../../store/git/sys/temp/' . $repoName; $tempRepoBaseDir = __DIR__ . '/../../store/git/sys/temp/';
$tempAddonDir = $tempRepoBaseDir . $repoName;
if (!is_writable($addonDir) || !is_writable($tempAddonDir)) {
logger('Temp repo directory or /extend/addon not writable to web server: ' . $tempAddonDir);
json_return_and_die(array('message' => 'Temp repo directory not writable to web server.', 'success' => false));
}
rename($tempAddonDir, $repoDir); rename($tempAddonDir, $repoDir);
if (!is_writable(realpath(__DIR__ . '/../../addon/'))) {
logger('/addon directory not writable to web server: ' . $tempAddonDir);
json_return_and_die(array('message' => '/addon directory not writable to web server.', 'success' => false));
}
$files = array_diff(scandir($repoDir), array('.', '..')); $files = array_diff(scandir($repoDir), array('.', '..'));
logger('files: ' . json_encode($files)); foreach ($files as $file) {
foreach ($files as $file) if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
{ $source = '../extend/addon/' . $repoName . '/' . $file;
if(is_dir($repoDir.'/'.$file) && $file !== '.git') { $target = realpath(__DIR__ . '/../../addon/') . '/' . $file;
$source = '../extend/addon/'.$repoName.'/'.$file; unlink($target);
$target = realpath(__DIR__ . '/../../addon/').'/'.$file; if (!symlink($source, $target)) {
unlink($target); logger('Error linking addons to /addon');
if(!symlink($source, $target)) { json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
logger('Error linking addons to /addon');
json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
}
} }
}
} }
$git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir); $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir);
$repo = $git->probeRepo(); $repo = $git->probeRepo();
json_return_and_die(array('repo'=> $repo, 'message' => '', 'success' => true)); json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
} }
case 'addrepo': case 'addrepo':
require_once('library/markdown.php'); require_once('library/markdown.php');
if(array_key_exists('repoURL',$_REQUEST)) { if (array_key_exists('repoURL', $_REQUEST)) {
require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies require __DIR__ . '/../../library/PHPGit.autoload.php'; // Load PHPGit dependencies
$repoURL = $_REQUEST['repoURL']; $repoURL = $_REQUEST['repoURL'];
$extendDir = __DIR__ . '/../../store/git/sys/extend'; $extendDir = __DIR__ . '/../../store/git/sys/extend';
$addonDir = $extendDir.'/addon'; $addonDir = $extendDir . '/addon';
$tempAddonDir = __DIR__ . '/../../store/git/sys/temp'; $tempAddonDir = __DIR__ . '/../../store/git/sys/temp';
if(!file_exists($extendDir)) { if (!file_exists($extendDir)) {
if(!mkdir($extendDir, 0770, true)) { if (!mkdir($extendDir, 0770, true)) {
logger('Error creating extend folder: ' . $extendDir); logger('Error creating extend folder: ' . $extendDir);
json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
} else { } else {
if(!symlink(__DIR__ . '/../../extend/addon', $addonDir)) { if (!symlink(__DIR__ . '/../../extend/addon', $addonDir)) {
logger('Error creating symlink to addon folder: ' . $addonDir); logger('Error creating symlink to addon folder: ' . $addonDir);
json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
} }
} }
} }
$repoName = null; $repoName = null;
if(array_key_exists('repoName',$_REQUEST) && $_REQUEST['repoName'] !== '') { if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
$repoName = $_REQUEST['repoName']; $repoName = $_REQUEST['repoName'];
} else { } else {
$repoName = GitRepo::getRepoNameFromURL($repoURL); $repoName = GitRepo::getRepoNameFromURL($repoURL);
} }
if(!$repoName) { if (!$repoName) {
logger('Invalid git repo'); logger('Invalid git repo');
json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false)); json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false));
} }
$repoDir = $tempAddonDir.'/'.$repoName; $repoDir = $tempAddonDir . '/' . $repoName;
if (!is_writable($tempAddonDir)) {
logger('Temporary directory for new addon repo is not writable to web server: ' . $tempAddonDir);
json_return_and_die(array('message' => 'Temporary directory for new addon repo is not writable to web server.', 'success' => false));
}
// clone the repo if new automatically // clone the repo if new automatically
$git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
$remotes = $git->git->remote(); $remotes = $git->git->remote();
$fetchURL = $remotes['origin']['fetch']; $fetchURL = $remotes['origin']['fetch'];
if($fetchURL !== $git->url) { if ($fetchURL !== $git->url) {
if(rrmdir($repoDir)) { if (rrmdir($repoDir)) {
$git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
} else { } else {
json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false)); json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false));
@ -1849,14 +1875,13 @@ class Admin extends \Zotlabs\Web\Controller {
$repo = $git->probeRepo(); $repo = $git->probeRepo();
$repo['readme'] = $repo['manifest'] = null; $repo['readme'] = $repo['manifest'] = null;
foreach ($git->git->tree('master') as $object) { foreach ($git->git->tree('master') as $object) {
if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) { if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) {
$repo['readme'] = Markdown($git->git->cat->blob($object['hash'])); $repo['readme'] = Markdown($git->git->cat->blob($object['hash']));
} else if ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') { } else if ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') {
$repo['manifest'] = $git->git->cat->blob($object['hash']); $repo['manifest'] = $git->git->cat->blob($object['hash']);
} }
} }
json_return_and_die(array('repo'=> $repo, 'message' => '', 'success' => true)); json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
} else { } else {
json_return_and_die(array('message' => 'No repo URL provided', 'success' => false)); json_return_and_die(array('message' => 'No repo URL provided', 'success' => false));
} }

6
view/tpl/admin_plugins.tpl
View File

@ -15,7 +15,7 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div class="section-content-info-wrapper"> <div class="section-content-info-wrapper">
<h3>Installed Addon Repositories</h3> <h3>Installed Plugin Repositories</h3>
{{foreach $addonrepos as $repo}} {{foreach $addonrepos as $repo}}
<!-- <div class="section-content-tools-wrapper"> --> <!-- <div class="section-content-tools-wrapper"> -->
<div style="margin-left: 30%; margin-right: 30%;"> <div style="margin-left: 30%; margin-right: 30%;">
@ -123,7 +123,7 @@
"/admin/plugins/updaterepo", {repoName: repoName}, "/admin/plugins/updaterepo", {repoName: repoName},
function(response) { function(response) {
if (response.success) { if (response.success) {
window.console.log('Addon repo'+repoName+'successfully updated :' + response['message']); window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']);
alert('Addon repo updated.'); alert('Addon repo updated.');
} else { } else {
window.console.log('Error updating repo :' + response['message']); window.console.log('Error updating repo :' + response['message']);
@ -146,7 +146,7 @@
"/admin/plugins/removerepo", {repoName: repoName}, "/admin/plugins/removerepo", {repoName: repoName},
function(response) { function(response) {
if (response.success) { if (response.success) {
window.console.log('Addon repo'+repoName+'successfully removed :' + response['message']); window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']);
if(confirm('Repo deleted. Click OK to refresh page.')) { if(confirm('Repo deleted. Click OK to refresh page.')) {
location.reload(); location.reload();
} }