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

#208 Block GPG when using open_basedir

Browse source
This commit is contained in:
the-djmaze 2022-02-03 21:49:08 +01:00
parent fb1c0dd606
commit 25d946b873
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1381,20 +1381,22 @@ class GPG
private static function findBinary($name) : ?string private static function findBinary($name) : ?string
{ {
$binary = \trim(`which $name`); if (!\ini_get('open_basedir')) {
if ($binary && \is_executable($binary)) { $binary = \trim(`which $name`);
return $binary; if ($binary && \is_executable($binary)) {
} return $binary;
$locations = [ }
'/sw/bin/', $locations = [
'/usr/bin/', '/sw/bin/',
'/usr/local/bin/', '/usr/bin/',
'/opt/local/bin/', '/usr/local/bin/',
'/run/current-system/sw/bin/' '/opt/local/bin/',
]; '/run/current-system/sw/bin/'
foreach ($locations as $location) { ];
if (\is_executable($location . $name)) { foreach ($locations as $location) {
return $location . $name; if (\is_executable($location . $name)) {
return $location . $name;
}
} }
} }
return null; return null;