Skip to content

feat(mail_smtpstreamoptions): Allow to use global default_certificates_bundle_path in mail_smtpstreamoptions #56875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
szaimen wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −0
Draft

feat(mail_smtpstreamoptions): Allow to use global default_certificates_bundle_path in mail_smtpstreamoptions #56875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/private/Mail/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
try {
$mailer->send($message->getSymfonyEmail());
} catch (TransportExceptionInterface $e) {
$logMessage = sprintf('Sending mail to "%s" with subject "%s" failed', print_r($message->getTo(), true), $message->getSubject());

Check failure on line 207 in lib/private/Mail/Mailer.php

View workflow job for this annotation

GitHub Actions / static-code-analysis-security

TaintedHtml 

lib/private/Mail/Mailer.php:207:83: TaintedHtml: Detected tainted HTML (see https://psalm.dev/245)
$this->logger->error($logMessage, ['app' => 'core', 'exception' => $e]);
if ($debugMode) {
$this->logger->debug($e->getDebug(), ['app' => 'core']);
Expand All @@ -224,7 +224,7 @@
}

// Debugging logging
$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());

Check failure on line 227 in lib/private/Mail/Mailer.php

View workflow job for this annotation

GitHub Actions / static-code-analysis-security

TaintedHtml 

lib/private/Mail/Mailer.php:227:72: TaintedHtml: Detected tainted HTML (see https://psalm.dev/245)
$this->logger->debug($logMessage, ['app' => 'core']);

return [];
Expand Down Expand Up @@ -293,6 +293,8 @@

$streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);
if (is_array($streamingOptions) && !empty($streamingOptions)) {
$rootCertPath = $streamingOptions['ssl']['cafile'] ?? $this->config->getValue('default_certificates_bundle_path', null) ?? '';

Check failure on line 296 in lib/private/Mail/Mailer.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedInterfaceMethod 

lib/private/Mail/Mailer.php:296:73: UndefinedInterfaceMethod: Method OCP\IConfig::getValue does not exist (see https://psalm.dev/181)
Copy link
Member

@provokateurin provokateurin Dec 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use \OCP\ICertificateManager::getAbsoluteBundlePath instead.

$streamingOptions['ssl']['cafile'] = $rootCertPath;
/** @psalm-suppress InternalMethod */
$currentStreamingOptions = $stream->getStreamOptions();

Expand Down
Loading