Bugfix: gnupg dir failed when /tmp/snappymail is not writable

This commit is contained in:
the-djmaze 2022-09-20 14:50:26 +02:00
parent d69e45f7bf
commit 2aad2efc3c

View file

@ -39,7 +39,8 @@ trait Pgp
// First try a symbolic link // First try a symbolic link
$tmpdir = \sys_get_temp_dir() . '/snappymail'; $tmpdir = \sys_get_temp_dir() . '/snappymail';
// if (\RainLoop\Utils::inOpenBasedir($tmpdir) && // if (\RainLoop\Utils::inOpenBasedir($tmpdir) &&
if (\is_dir($tmpdir) || \mkdir($tmpdir, 0700, true)) { is_dir($tmpdir) || \mkdir($tmpdir, 0700);
if (\is_dir($tmpdir) && \is_writable($tmpdir)) {
$link = $tmpdir . '/' . \md5($homedir); $link = $tmpdir . '/' . \md5($homedir);
if (\is_link($link) || \symlink($homedir, $link)) { if (\is_link($link) || \symlink($homedir, $link)) {
$homedir = $link; $homedir = $link;
@ -57,7 +58,7 @@ trait Pgp
} }
// if (\RainLoop\Utils::inOpenBasedir($tmpdir) && // if (\RainLoop\Utils::inOpenBasedir($tmpdir) &&
if (\is_dir($tmpdir) || \mkdir($tmpdir, 0700, true)) { if (\is_dir($tmpdir) || \mkdir($tmpdir, 0700, true)) {
$homedir = $link; $homedir = $tmpdir;
} }
} }