fix(Mailer): Fix sendmail binary fallback

feat: add debug logging to sendmail binary finder Signed-off-by: Josh <josh.t.richards@gmail.com> [skip ci]
nextcloud · Feb 4, 2025 · 86bdf51 · 86bdf51
1 parent 7448885
commit 86bdf51
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/apps/settings/lib/Settings/Admin/Mail.php b/apps/settings/lib/Settings/Admin/Mail.php
@@ -28,6 +28,7 @@
 namespace OCA\Settings\Settings\Admin;
 
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IBinaryFinder;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\Settings\IDelegatedSettings;

diff --git a/apps/settings/tests/Settings/Admin/MailTest.php b/apps/settings/tests/Settings/Admin/MailTest.php
@@ -30,6 +30,7 @@
 
 use OCA\Settings\Settings\Admin\Mail;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IBinaryFinder;
 use OCP\IConfig;
 use OCP\IL10N;
 use Test\TestCase;

diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
@@ -361,8 +361,10 @@ protected function getSendMailInstance(): SendmailTransport {
 				break;
 			default:
 				$sendmail = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath('sendmail');
-				if ($sendmail === null) {
+				if ($sendmail === false) {
+					// fallback (though not sure what good it'll do)
 					$sendmail = '/usr/sbin/sendmail';
+					$this->logger->debug('sendmail binary search failed, using fallback ' . $sendmail, ['app' => 'core']);
 				}
 				$binaryPath = $sendmail;
 				break;
@@ -373,6 +375,7 @@ protected function getSendMailInstance(): SendmailTransport {
 			default => ' -bs',
 		};
 
+		$this->logger->debug('Using sendmail binary: ' . $binaryPath, ['app' => 'core']);
 		return new SendmailTransport($binaryPath . $binaryParam, null, $this->logger);
 	}
 }
diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
@@ -16,6 +16,7 @@
 use OC\Mail\Message;
 use OCP\Defaults;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IBinaryFinder;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
@@ -90,7 +91,7 @@ public function testGetSendmailInstanceSendMail($sendmailMode, $binaryParam) {
 				['mail_sendmailmode', 'smtp', $sendmailMode],
 			]);
 
-		$path = \OC_Helper::findBinaryPath('sendmail');
+		$path = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath('sendmail');
 		if ($path === false) {
 			$path = '/usr/sbin/sendmail';
 		}