mirror of
https://github.com/Icinga/icinga2.git
synced 2025-09-25 18:48:50 +02:00
InfluxdbWriter: actually verify TLS server certificates
And add a new option ssl_insecure_noverify to explicitly disable it if desired.
This commit is contained in:
parent
d7133ae429
commit
6db8795ca4
@ -1640,6 +1640,7 @@ Configuration Attributes:
|
|||||||
username | String | **Optional.** InfluxDB user name. Defaults to `none`.
|
username | String | **Optional.** InfluxDB user name. Defaults to `none`.
|
||||||
password | String | **Optional.** InfluxDB user password. Defaults to `none`.
|
password | String | **Optional.** InfluxDB user password. Defaults to `none`.
|
||||||
ssl\_enable | Boolean | **Optional.** Whether to use a TLS stream. Defaults to `false`.
|
ssl\_enable | Boolean | **Optional.** Whether to use a TLS stream. Defaults to `false`.
|
||||||
|
ssl\_insecure\_noverify | Boolean | **Optional.** Disable TLS peer verification.
|
||||||
ssl\_ca\_cert | String | **Optional.** Path to CA certificate to validate the remote host.
|
ssl\_ca\_cert | String | **Optional.** Path to CA certificate to validate the remote host.
|
||||||
ssl\_cert | String | **Optional.** Path to host certificate to present to the remote host for mutual verification.
|
ssl\_cert | String | **Optional.** Path to host certificate to present to the remote host for mutual verification.
|
||||||
ssl\_key | String | **Optional.** Path to host key to accompany the ssl\_cert.
|
ssl\_key | String | **Optional.** Path to host key to accompany the ssl\_cert.
|
||||||
|
@ -211,6 +211,18 @@ OptionalTlsStream InfluxdbWriter::Connect()
|
|||||||
<< "TLS handshake with host '" << GetHost() << "' failed.";
|
<< "TLS handshake with host '" << GetHost() << "' failed.";
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!GetSslInsecureNoverify()) {
|
||||||
|
if (!tlsStream.GetPeerCertificate()) {
|
||||||
|
BOOST_THROW_EXCEPTION(std::runtime_error("InfluxDB didn't present any TLS certificate."));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!tlsStream.IsVerifyOK()) {
|
||||||
|
BOOST_THROW_EXCEPTION(std::runtime_error(
|
||||||
|
"TLS certificate validation failed: " + std::string(tlsStream.GetVerifyError())
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return std::move(stream);
|
return std::move(stream);
|
||||||
|
@ -29,6 +29,9 @@ class InfluxdbWriter : ConfigObject
|
|||||||
[config] bool ssl_enable {
|
[config] bool ssl_enable {
|
||||||
default {{{ return false; }}}
|
default {{{ return false; }}}
|
||||||
};
|
};
|
||||||
|
[config] bool ssl_insecure_noverify {
|
||||||
|
default {{{ return false; }}}
|
||||||
|
};
|
||||||
[config] String ssl_ca_cert {
|
[config] String ssl_ca_cert {
|
||||||
default {{{ return ""; }}}
|
default {{{ return ""; }}}
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user