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

Finally fixed project directory for Build::writeSshKey and

Browse source 
Build::writeSshWrapper (Now files in system temp directory).
Issue #165.
This commit is contained in:
Dmitry Khomutov 2018-03-16 20:46:46 +07:00
commit 55bebf05dc
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Model/Build.php
View file

@ -472,13 +472,11 @@ class Build extends BaseBuild
*/
protected function writeSshKey($cloneTo)
{
$keyPath = $cloneTo . 'temp';
$keyFile = $keyPath . '.key';
$tempKeyFile = tempnam(sys_get_temp_dir(), 'key_');
file_put_contents($keyFile, $this->getProject()->getSshPrivateKey());
chmod($keyFile, 0600);
file_put_contents($tempKeyFile, $this->getProject()->getSshPrivateKey());
return $keyFile;
return $tempKeyFile;
}
/**
@ -491,9 +489,6 @@ class Build extends BaseBuild
*/
protected function writeSshWrapper($cloneTo, $keyFile)
{
$path = $cloneTo . 'temp';
$wrapperFile = $path . '.sh';
$sshFlags = '-o CheckHostIP=no -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o PasswordAuthentication=no';
// Write out the wrapper script for this build:
@ -502,11 +497,12 @@ class Build extends BaseBuild
ssh {$sshFlags} -o IdentityFile={$keyFile} $*
OUT;
$tempShFile = tempnam(sys_get_temp_dir(), 'sh_');
file_put_contents($wrapperFile, $script);
shell_exec('chmod +x "' . $wrapperFile . '"');
file_put_contents($tempShFile, $script);
shell_exec('chmod +x "' . $tempShFile . '"');
return $wrapperFile;
return $tempShFile;
}
/**