tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enh(protocol/x509): add ipv6 support for subjectAltNames (#2749)

This commit is contained in:
qgarnier 2021-04-29 15:26:46 +02:00 committed by GitHub
parent 9f2680ba45
commit b1cb95a079
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
centreon-plugins/apps/protocols/x509/custom/file.pm
View File

@ -23,6 +23,7 @@ package apps::protocols::x509::custom::file;
use strict; use strict;
use warnings; use warnings;
use centreon::plugins::http; use centreon::plugins::http;
use Socket;
use Net::SSLeay 1.42; use Net::SSLeay 1.42;
use DateTime; use DateTime;
@ -130,7 +131,7 @@ sub read_certificate {
for (my $i = 0; $i < $#subject_alt_names; $i += 2) { for (my $i = 0; $i < $#subject_alt_names; $i += 2) {
my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]); my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]);
if ($type == &Net::SSLeay::GEN_IPADD) { if ($type == &Net::SSLeay::GEN_IPADD) {
$name = inet_ntoa($name); $name = Socket::inet_ntop(length($name) > 4 ? Socket::AF_INET6 : Socket::AF_INET, $name);
} }
$cert_infos->{alt_subjects} .= $append . $name; $cert_infos->{alt_subjects} .= $append . $name;
$append = ', '; $append = ', ';

5
centreon-plugins/apps/protocols/x509/custom/https.pm
View File

@ -25,6 +25,7 @@ use warnings;
use centreon::plugins::http; use centreon::plugins::http;
use Net::SSLeay 1.42; use Net::SSLeay 1.42;
use DateTime; use DateTime;
use Socket;
sub new { sub new {
my ($class, %options) = @_; my ($class, %options) = @_;
@ -119,7 +120,7 @@ sub pem_type {
for (my $i = 0; $i < $#subject_alt_names; $i += 2) { for (my $i = 0; $i < $#subject_alt_names; $i += 2) {
my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]); my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]);
if ($type == &Net::SSLeay::GEN_IPADD) { if ($type == &Net::SSLeay::GEN_IPADD) {
$name = inet_ntoa($name); $name = Socket::inet_ntop(length($name) > 4 ? Socket::AF_INET6 : Socket::AF_INET, $name);
} }
$cert_infos->{alt_subjects} .= $append . $name; $cert_infos->{alt_subjects} .= $append . $name;
$append = ', '; $append = ', ';
@ -145,7 +146,7 @@ sub socket_type {
for (my $i = 0; $i < $#subject_alt_names; $i += 2) { for (my $i = 0; $i < $#subject_alt_names; $i += 2) {
my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]); my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]);
if ($type == &Net::SSLeay::GEN_IPADD) { if ($type == &Net::SSLeay::GEN_IPADD) {
$name = inet_ntoa($name); $name = Socket::inet_ntop(length($name) > 4 ? Socket::AF_INET6 : Socket::AF_INET, $name);
} }
$cert_infos->{alt_subjects} .= $append . $name; $cert_infos->{alt_subjects} .= $append . $name;
$append = ', '; $append = ', ';

2
centreon-plugins/apps/protocols/x509/custom/tcp.pm
View File

@ -217,7 +217,7 @@ sub get_certificate_informations {
for (my $i = 0; $i < $#subject_alt_names; $i += 2) { for (my $i = 0; $i < $#subject_alt_names; $i += 2) {
my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]); my ($type, $name) = ($subject_alt_names[$i], $subject_alt_names[$i + 1]);
if ($type == GEN_IPADD) { if ($type == GEN_IPADD) {
$name = inet_ntoa($name); $name = Socket::inet_ntop(length($name) > 4 ? Socket::AF_INET6 : Socket::AF_INET, $name);
} }
$cert_infos->{alt_subjects} .= $append . $name; $cert_infos->{alt_subjects} .= $append . $name;
$append = ', '; $append = ', ';