beenull/PhyrePanel-mirror
1
0
Fork 0
mirror of https://github.com/PhyreApps/PhyrePanel.git synced 2024-09-19 23:31:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update GitRepository.php

Browse source
This commit is contained in:
Bozhidar 2024-09-11 17:47:37 +03:00
parent a0daa4052f
commit 8bb6cfda37
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
web/app/Models/GitRepository.php
View file

@ -91,9 +91,9 @@ class GitRepository extends Model
$gitSSHKey = GitSshKey::find($this->git_ssh_key_id);
if ($gitSSHKey) {
$sshPath = '/home/'.$findHostingSubscription->system_username .'/.git-ssh/'.$gitSSHKey->id;
$privateKeyFile = $sshPath.'/id_rsa';
$publicKeyFile = $sshPath.'/id_rsa.pub';
$sshPath = '/home/'.$findHostingSubscription->system_username .'/.ssh';
$privateKeyFile = $sshPath.'/id_rsa_'. $gitSSHKey->id;
$publicKeyFile = $sshPath.'/id_rsa_'.$gitSSHKey->id.'.pub';
if (!is_dir($sshPath)) {
shell_exec('mkdir -p ' . $sshPath);
@ -103,14 +103,16 @@ class GitRepository extends Model
if (!file_exists($privateKeyFile)) {
file_put_contents($privateKeyFile, $gitSSHKey->private_key);
chown($privateKeyFile, $findHostingSubscription->system_username);
chmod($privateKeyFile, 0400);
shell_exec('chown '.$findHostingSubscription->system_username.':'.$findHostingSubscription->system_username.' ' . $privateKeyFile);
shell_exec('chmod 0400 ' . $privateKeyFile);
}
if (!file_exists($publicKeyFile)) {
file_put_contents($publicKeyFile, $gitSSHKey->public_key);
chown($publicKeyFile, $findHostingSubscription->system_username);
chmod($publicKeyFile, 0400);
shell_exec('chown '.$findHostingSubscription->system_username.':'.$findHostingSubscription->system_username.' ' . $publicKeyFile);
shell_exec('chmod 0400 ' . $publicKeyFile);
}
}
@ -130,6 +132,11 @@ class GitRepository extends Model
if ($gitSSHKey) {
$shellCommand[] = "ssh-keyscan github.com >> /home/$findHostingSubscription->system_username/.ssh/known_hosts";
$shellCommand[] = 'chmod 0600 /home/'.$findHostingSubscription->system_username.'/.ssh/known_hosts';
$shellCommand[] = 'chown '.$findHostingSubscription->system_username.':'.$findHostingSubscription->system_username.' /home/'.$findHostingSubscription->system_username.'/.ssh/known_hosts';
$cloneUrl = 'git@'.$gitSSHUrl['provider'].':'.$gitSSHUrl['owner'].'/'.$gitSSHUrl['name'].'.git';
$cloneCommand = 'git -c core.sshCommand="ssh -i '.$privateKeyFile .'" clone '.$cloneUrl.' '.$projectDir . ' 2>&1';
} else {