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

Improvements to ssl-keystore parameter #824

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Improvements to ssl-keystore parameter #824

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a46cd30
Add SystemRootCA for macOS and support other OSes to Mozilla:CA in ss…
eduardomozart Jan 17, 2025
7dd35db
Add Unix/Linux keystore support
eduardomozart Jan 17, 2025
8ccb507
Fix typo
eduardomozart Jan 17, 2025
df97ac7
Allow loading macOS system CA store
eduardomozart Jan 17, 2025
22fc53b
Load Mozilla::CA only if not loaded certs from other stores
eduardomozart Jan 17, 2025
a57c19d
Update Client.pm
eduardomozart Jan 17, 2025
7de97c1
Update Client.pm
eduardomozart Jan 17, 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
16 changes: 12 additions & 4 deletions lib/GLPI/Agent/HTTP/Client.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,9 +553,6 @@ sub _setSSLOptions {
sub _KeyChain_or_KeyStore_Export {
my ($self) = @_;

# Only MacOSX and MSWin32 are supported
return unless $OSNAME =~ /^darwin|MSWin32$/;

Comment on lines -556 to -558
Copy link
Member

Choose a reason for hiding this comment

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

You probably misunderstood my purpose: Mozilla::CA library is supported by default on all platform.

"ssl-keystore" is only there to permit usage of certificates deployed in keystore or keychain as related OS provides tools to handle such deployment.

On other OS, we don't have such usage and people still have other solutions. So don't enable "ssl-keystore" support on other OS and keep this code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

From what I've seen, the Mozilla::CA isn't loaded because this line exit the function if OS is not macOS or Windows, but if Mozilla::CA is supported on Unix/Linux systems but this support isn't enable because the code exits the function before importing it.

# But we don't need to extract anything if we still use an option to authenticate server certificate
return if $self->{ca_cert_file} || $self->{ca_cert_dir} || (ref($self->{ssl_fingerprint}) eq 'ARRAY' && @{$self->{ssl_fingerprint}});

Expand Down Expand Up @@ -607,7 +604,11 @@ sub _KeyChain_or_KeyStore_Export {
command => "security find-certificate -a -p > '$file'",
logger => $logger
);
@certs = IO::Socket::SSL::Utils::PEM_file2certs($file)
getAllLines(
command => "security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain >> '$file'",
logger => $logger
);
push @certs, IO::Socket::SSL::Utils::PEM_file2certs($file)
Copy link
Member

@g-bougard g-bougard Jan 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

That was not my idea.

I prefer to change the command on a given "ssl-keystore" value.

Here you force the run of 2 commands where this is not required for most people as Mozilla::CA should provide the public CA certificates.

I would prefer something like:

my $command = "security find-certificate -a -p";
$command .= " /System/Library/Keychains/SystemRootCertificates.keychain"
    if $self->{ssl_keystore} =~ /^system-ssl-ca$/i;
getAllLines(
     command => "$command > '$file'",
     logger  => $logger
);

and even, on l.695, the test on Mozilla::CA should be changed to not load it if system public ca are used as this would be redundant:

if (($OSNAME ne 'darwin' || $self->{ssl_keystore} !~ /^system-ssl-ca$/i) && Mozilla::CA->require()) {

Copy link
Contributor Author

@eduardomozart eduardomozart Jan 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

The Mozilla CA may not include self-signed CA certs available on system store. I updated the macOS code to meet your expectations, but I still believe the system root CA store should be loaded instead of the current user (root) as it's useless since it contains only Apple CA's - I know the default CA store from the user can be changed but most users won't do that.
I updated the code to load Mozilla::CA only if @certs is empty (it means it didn't load the CAs from third party cert stores) or if it's macOS and user didn't provided the 'system-root-ca' parameter.

if -s $file;
} else {
my @certCommands;
Expand Down Expand Up @@ -691,6 +692,13 @@ sub _KeyChain_or_KeyStore_Export {
}
}

# Like Mozilla::CA, but using certs from /etc/ssl/certs
if ($OSNAME !~ /^darwin|MSWin32$/) {
my $sslcacert = "/etc/ssl/certs/ca-certificates.crt";
push @certs, IO::Socket::SSL::Utils::PEM_file2certs($sslcacert)
if -e $sslcacert;
}

Comment on lines +694 to +700
Copy link
Member

Choose a reason for hiding this comment

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

As I said on my first comment, this is not required as this is still the default.

Copy link
Contributor Author

@eduardomozart eduardomozart Jan 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I believe there should be cases where internal CA is used and some automation tool already added the self-signed certificate to system CA store and it's not a public certificate provided by Mozilla::CA. As this use case is supported on Windows and macOS (otherwise it wouldn't need to import the keystore/keychain from those systems), I don't see why don't include support for keystore of other systems too, only if the SSL library loads it by default?

# Always include default CA file from Mozilla::CA
if (Mozilla::CA->require()) {
my $cacert = Mozilla::CA::SSL_ca_file();
Expand Down
Loading