Skip to content
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

PHRAS-3900 Check TLS version use for email SMTP sending - TLS 1.0 of 1.1 deprecation #4382

Merged
merged 10 commits into from
Oct 30, 2023
Merged

PHRAS-3900 Check TLS version use for email SMTP sending - TLS 1.0 of 1.1 deprecation #4382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8f66d7e
swift tls 1.2
aynsix Sep 25, 2023
fb32db3
Merge branch 'master' into PHRAS-3900-email-tls12
nmaillat Sep 29, 2023
4321d0e
add tls 1.1 and 1.2 option
aynsix Oct 2, 2023
d612898
Merge branch 'PHRAS-3900-email-tls12' of https://github.com/alchemy-f…
aynsix Oct 2, 2023
66cd8f6
Merge branch 'master' into PHRAS-3900-email-tls12
nmaillat Oct 3, 2023
0b70ac6
Merge branch 'master' into PHRAS-3900-email-tls12
nmaillat Oct 9, 2023
e7979eb
Merge branch 'master' into PHRAS-3900-email-tls12
nmaillat Oct 10, 2023
37ba13c
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet int…
aynsix Oct 19, 2023
82a310a
tlsv1.2 by default
aynsix Oct 19, 2023
45f635f
Merge branch 'master' into PHRAS-3900-email-tls12
nmaillat Oct 30, 2023
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
21 changes: 18 additions & 3 deletions lib/Alchemy/Phrasea/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,9 +687,20 @@ private function setupSwiftMailer()
);

$encryption = null;

if (in_array($app['conf']->get(['registry', 'email', 'smtp-secure-mode']), ['ssl', 'tls'])) {
$encryption = $app['conf']->get(['registry', 'email', 'smtp-secure-mode']);
$secureMode = '';

if (in_array($app['conf']->get(['registry', 'email', 'smtp-secure-mode']), ['ssl', 'tls', 'tlsv1.1', 'tlsv1.2'])) {
$secureMode = $app['conf']->get(['registry', 'email', 'smtp-secure-mode']);

if ($secureMode == 'ssl') {
$encryption = 'ssl';
} else {
$encryption = 'tls';
if ($secureMode == 'tls') {
// by default use tlsv1.2
$secureMode = 'tlsv1.2';
}
}
}

$options = $app['swiftmailer.options'] = array_replace([
Expand All @@ -706,6 +717,10 @@ private function setupSwiftMailer()
// tls or ssl
$transport->setEncryption($options['encryption']);

if ($options['encryption'] == 'tls') {
$transport->setStreamOptions(['ssl' =>[$secureMode => true]]);
}

if ($app['conf']->get(['registry', 'email', 'smtp-auth-enabled'])) {
$transport->setUsername($options['username']);
$transport->setPassword($options['password']);
Expand Down
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private function getDefaultData(array $config)
'smtp-auth-enabled' => false,
'smtp-host' => null,
'smtp-port' => null,
'smtp-secure-mode' => 'tls',
'smtp-secure-mode' => 'tlsv1.2',
'smtp-user' => null,
'smtp-password' => isset($config['email']['smtp-password']) ? $config['email']['smtp-password'] : null,
],
Expand Down
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/Form/Configuration/EmailFormType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
]);
$builder->add('smtp-secure-mode', ChoiceType::class, [
'label' => 'SMTP encryption',
'choices' => ['none' => 'None', 'ssl' => 'SSL', 'tls' => 'TLS'],
'choices' => ['none' => 'None', 'ssl' => 'SSL', 'tlsv1.1' => 'TLSV1.1', 'tlsv1.2' => 'TLSV1.2'],
]);
$builder->add('smtp-user', TextType::class, [
'label' => 'SMTP user',
Expand Down