Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hopefully resolve #231

Browse source
This commit is contained in:
the-djmaze 2022-02-14 22:20:57 +01:00
parent 938fd36a9b
commit 3fd4cd5d33
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
View file

@ -28,6 +28,7 @@ trait Pgp
* BSD 4.4 max length = 104 * BSD 4.4 max length = 104
*/ */
if (80 < \strlen($homedir)) { if (80 < \strlen($homedir)) {
\clearstatcache();
// 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) &&
@ -39,7 +40,7 @@ trait Pgp
} }
// Else try ~/.gnupg/ + hash(email address) // Else try ~/.gnupg/ + hash(email address)
if (80 < \strlen($homedir)) { if (80 < \strlen($homedir)) {
$tmpdir = ($_SERVER['HOME'] ?: \exec('echo ~') ?: \dirname(getcwd())) . '/.gnupg/'; $tmpdir = ($_SERVER['HOME'] ?: \exec('echo ~') ?: \dirname(\getcwd())) . '/.gnupg/';
if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) { if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
$tmpdir .= \sha1($oAccount->ParentEmail()); $tmpdir .= \sha1($oAccount->ParentEmail());
} else { } else {
@ -50,6 +51,10 @@ trait Pgp
$homedir = $link; $homedir = $link;
} }
} }
if (104 <= \strlen($homedir . '/S.gpg-agent.extra')) {
throw new \Exception("socket name for '{$homedir}/S.gpg-agent.extra' is too long");
}
} }
return \SnappyMail\PGP\GnuPG::getInstance($homedir); return \SnappyMail\PGP\GnuPG::getInstance($homedir);

13
snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php
View file

@ -81,18 +81,7 @@ class GPG
function __construct(string $homedir) function __construct(string $homedir)
{ {
$homedir = \rtrim($homedir, '/\\'); $this->options['homedir'] = \rtrim($homedir, '/\\');
// BSD 4.4 max length
if (104 <= \strlen($homedir . '/S.gpg-agent.extra')) {
throw new \Exception("socket name for '{$homedir}/S.gpg-agent.extra' is too long");
}
\clearstatcache();
if ($homedir && !\is_dir($homedir) && !\mkdir($homedir, 0700, true)) {
throw new \Exception("mkdir({$homedir}) failed");
}
$this->options['homedir'] = $homedir;
// the random seed file makes subsequent actions faster so only disable it if we have to. // the random seed file makes subsequent actions faster so only disable it if we have to.
if ($this->options['homedir'] && !\is_writeable($this->options['homedir'])) { if ($this->options['homedir'] && !\is_writeable($this->options['homedir'])) {