deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adding guard around ssh-keygen in project controller, hopefully fixes #340

Browse source
This commit is contained in:
Dan Cryer 2014-04-16 09:15:39 +00:00
commit e6d0cee4bd
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
PHPCI/Controller/ProjectController.php
View file

@ -160,12 +160,17 @@ class ProjectController extends \PHPCI\Controller
mkdir($tempPath);
}
shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"');
if ($this->canGenerateKeys()) {
shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"');
$pub = file_get_contents($keyFile . '.pub');
$prv = file_get_contents($keyFile);
$pub = file_get_contents($keyFile . '.pub');
$prv = file_get_contents($keyFile);
$values = array('key' => $prv, 'pubkey' => $pub);
$values = array('key' => $prv, 'pubkey' => $pub);
} else {
$pub = null;
$values = array();
}
}
$form = $this->projectForm($values);
@ -325,7 +330,7 @@ class ProjectController extends \PHPCI\Controller
$field = new Form\Element\TextArea('build_config');
$field->setRequired(false);
$field->setLabel('PHPCI build config for this project (instead phpci.yml in the project repository)');
$field->setLabel('PHPCI build config for this project (if you cannot add a phpci.yml file in the project repository)');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$field->setRows(6);
@ -425,4 +430,10 @@ class ProjectController extends \PHPCI\Controller
return true;
};
}
protected function canGenerateKeys()
{
$result = @shell_exec('ssh-keygen');
return !empty($result);
}
}