Skip to content

Commit dce4199

Browse files
author
Till Brehm
committed
Merge branch '6472-fix-tempdir' into 'develop'
Resolve "Create a shell user - PHP Fatal error: Uncaught TypeError: realpath()" Closes #6472 See merge request ispconfig/ispconfig3!1713
2 parents 510ace7 + cdff1de commit dce4199

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

server/lib/classes/functions.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,14 +470,14 @@ public function generate_ssh_key($client_id, $username = ''){
470470
// generate the SSH key pair for the client
471471
$app->system->exec_safe('mktemp -dt id_rsa.XXXXXXXX');
472472
$tmpdir = $app->system->last_exec_out();
473-
$id_rsa_file = $tmpdir . uniqid('',true);
473+
$id_rsa_file = $tmpdir[0] . '/' . uniqid('',true);
474474
$id_rsa_pub_file = $id_rsa_file.'.pub';
475475
if(file_exists($id_rsa_file)) unset($id_rsa_file);
476476
if(file_exists($id_rsa_pub_file)) unset($id_rsa_pub_file);
477477
if(!file_exists($id_rsa_file) && !file_exists($id_rsa_pub_file)) {
478478
$app->system->exec_safe('ssh-keygen -t rsa -C ? -f ? -N ""', $username.'-rsa-key-'.time(), $id_rsa_file);
479479
$app->db->query("UPDATE client SET created_at = UNIX_TIMESTAMP(), id_rsa = ?, ssh_rsa = ? WHERE client_id = ?", $app->system->file_get_contents($id_rsa_file), $app->system->file_get_contents($id_rsa_pub_file), $client_id);
480-
$app->system->rmdir($tmpdir, true);
480+
$app->system->rmdir($tmpdir[0], true);
481481
} else {
482482
$app->log("Failed to create SSH keypair for ".$username, LOGLEVEL_WARN);
483483
}

0 commit comments

Comments
 (0)