From 325c748acc84c39c6ac2727b9cd62b8b9860e500 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sun, 21 Apr 2024 03:52:30 +0200
Subject: [PATCH] Check open basedir for #1555

---
 snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php      | 6 +-----
 snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index 6ce00fb6e..241cfdf95 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -134,11 +134,7 @@ class Utils
 	{
 		static $open_basedir;
 		if (null === $open_basedir) {
-			$open_basedir = \ini_get('open_basedir');
-			if ($open_basedir) {
-				\SnappyMail\Log::warning('OpenBasedir', "open_basedir restriction in effect. Allowed path(s): {$open_basedir}");
-			}
-			$open_basedir = \array_filter(\explode(PATH_SEPARATOR, $open_basedir));
+			$open_basedir = \array_filter(\explode(PATH_SEPARATOR, \ini_get('open_basedir')));
 		}
 		if ($open_basedir) {
 			foreach ($open_basedir as $dir) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
index 68e8d4c0f..3a6be33f2 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
@@ -484,7 +484,7 @@ abstract class Base
 	protected static function findBinary($name) : ?string
 	{
 		$binary = \trim((string) `which $name`);
-		if ($binary && \is_executable($binary)) {
+		if ($binary && \RainLoop\Utils::inOpenBasedir($binary) && \is_executable($binary)) {
 			return $binary;
 		}
 		$locations = \array_filter([