From 7fec4e849b07c3dd2a8d5c27208e8824ee3d7875 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 4 Feb 2022 14:44:38 +0100
Subject: [PATCH] Improved GPGP homedir detection for #208

---
 .../v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
index 1f7ef39bd..ccd79105e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
@@ -30,6 +30,7 @@ trait Pgp
 		if (80 < \strlen($homedir)) {
 			// First try a symbolic link
 			$tmpdir = \sys_get_temp_dir() . '/snappymail';
+//			if (\RainLoop\Utils::inOpenBasedir($tmpdir) &&
 			if (\is_dir($tmpdir) || \mkdir($tmpdir, 0700, true)) {
 				$link = $tmpdir . '/' . \md5($homedir);
 				if (\is_link($link) || \symlink($homedir, $link)) {
@@ -38,11 +39,15 @@ trait Pgp
 			}
 			// Else try ~/.gnupg/ + hash(email address)
 			if (80 < \strlen($homedir)) {
-				$homedir = ($_SERVER['HOME'] ?: \exec('echo ~')) . '/.gnupg/';
+				$tmpdir = ($_SERVER['HOME'] ?: \exec('echo ~') ?: \dirname(getcwd())) . '/.gnupg/';
 				if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
-					$homedir .= \sha1($oAccount->ParentEmail());
+					$tmpdir .= \sha1($oAccount->ParentEmail());
 				} else {
-					$homedir .= \sha1($oAccount->Email());
+					$tmpdir .= \sha1($oAccount->Email());
+				}
+//				if (\RainLoop\Utils::inOpenBasedir($tmpdir) &&
+				if (\is_dir($tmpdir) || \mkdir($tmpdir, 0700, true)) {
+					$homedir = $link;
 				}
 			}
 		}