Skip to content

Add parameter SMIME::NoDefaultCA and remove unnecessary parameter #681

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

Open
pboguslawski wants to merge 4 commits into
base: rel-6_5-dev
Choose a base branch
from
Open

Add parameter SMIME::NoDefaultCA and remove unnecessary parameter #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b75146
Add parameter SMIME::NoDefaultCA and remove unnecessary parameter
pboguslawski Jun 6, 2025
c11e72f
Update CHANGES.md
pboguslawski Jun 6, 2025
4a416e3
Update SMIME.pm
pboguslawski Jun 6, 2025
0c9b6cf
Merge branch 'rel-6_5-dev' into rel-6_5-IB#1161846
pboguslawski Jun 6, 2025
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
1 change: 1 addition & 0 deletions Kernel/Config/Defaults.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,7 @@ sub LoadDefaults {

# $Self->{'SMIME::CertPath'} = '/etc/ssl/certs';
# $Self->{'SMIME::PrivatePath'} = '/etc/ssl/private';
# $Self->{'SMIME::NoDefaultCA'} = 0;

# --------------------------------------------------- #
# system permissions
Expand Down
7 changes: 7 additions & 0 deletions Kernel/Config/Files/XML/Framework.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3095,6 +3095,13 @@
<Item ValueType="Checkbox">0</Item>
</Value>
</Setting>
<Setting Name="SMIME::NoDefaultCA" Required="0" Valid="0">
<Description Translatable="1">When enabled, no default CA certificates on S/MIME verification will be used.</Description>
<Navigation>Core::Crypt::SMIME</Navigation>
<Value>
<Item ValueType="Checkbox">0</Item>
</Value>
</Setting>
<Setting Name="NotificationSenderName" Required="1" Valid="1">
<Description Translatable="1">Specifies the name that should be used by the application when sending notifications. The sender name is used to build the complete display name for the notification master (i.e. "OTRS Notifications" otrs@your.example.com).</Description>
<Navigation>Core::Email</Navigation>
Expand Down
17 changes: 15 additions & 2 deletions Kernel/System/Crypt/SMIME.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,21 @@ sub Verify {
$NoVerifyOption = '-noverify';
}

my $Options = "smime -verify $NoVerifyOption -in $SignedFile -out $VerifiedFile -signer $SignerFile "
. "-CApath $Self->{CertPath} $CertificateOption $SignedFile";
# Don't use default CA certs on S/MIME verification if SMIME::NoDefaultCA is enabled.
# See also https://docs.openssl.org/master/man1/openssl-verification-options/#trusted-certificate-options
my $NoDefaultCAOptions = '';
if ( $ConfigObject->Get('SMIME::NoDefaultCA') ) {
$NoDefaultCAOptions = '-no-CAfile -no-CApath';
if ( $Self->{OpenSSLMajorVersion} >= 3 ) {

# Disable also default certificates store (option available in OpenSSL 3+).
$NoDefaultCAOptions = $NoDefaultCAOptions . ' -no-CAstore';
}
}

my $Options
= "smime -verify $NoVerifyOption $NoDefaultCAOptions -in $SignedFile -out $VerifiedFile -signer $SignerFile "
. "-CApath $Self->{CertPath} $CertificateOption";

my @LogLines = qx{$Self->{Cmd} $Options 2>&1};
for my $LogLine (@LogLines) {
Expand Down
Loading