tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-06-05 06:10:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

RequestCertificateHandler(): also renew if CA needs a renewal

Browse Source 
and a newer one is available.
This commit is contained in:
Alexander A. Klimov 2023-11-09 10:33:22 +01:00
parent 551c3afa60
commit 966216f4ba
1 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/remote/jsonrpcconnection-pki.cpp
View File

@ -14,6 +14,7 @@
#include <boost/thread/once.hpp> #include <boost/thread/once.hpp>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <fstream> #include <fstream>
#include <openssl/asn1.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/x509.h> #include <openssl/x509.h>
@ -31,11 +32,11 @@ Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictiona
std::shared_ptr<X509> cert; std::shared_ptr<X509> cert;
Dictionary::Ptr result = new Dictionary(); Dictionary::Ptr result = new Dictionary();
auto& tlsConn (origin->FromClient->GetStream()->next_layer());
/* Use the presented client certificate if not provided. */ /* Use the presented client certificate if not provided. */
if (certText.IsEmpty()) { if (certText.IsEmpty()) {
auto stream (origin->FromClient->GetStream()); cert = tlsConn.GetPeerCertificate();
cert = stream->next_layer().GetPeerCertificate();
} else { } else {
cert = StringToCertificate(certText); cert = StringToCertificate(certText);
} }
@ -77,13 +78,54 @@ Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictiona
} }
} }
if (signedByCA) { std::shared_ptr<X509> parsedRequestorCA;
if (IsCertUptodate(cert)) { X509* requestorCA = nullptr;
if (signedByCA) {
bool uptodate = IsCertUptodate(cert);
if (uptodate) {
// Even if the leaf is up-to-date, the root may expire soon.
// In a regular setup where Icinga manages the PKI, there is only one CA.
// Icinga includes it in handshakes, let's see whether the peer needs a fresh one...
if (cn == origin->FromClient->GetIdentity()) {
auto chain (SSL_get_peer_cert_chain(tlsConn.native_handle()));
if (chain) {
auto len (sk_X509_num(chain));
for (int i = 0; i < len; ++i) {
auto link (sk_X509_value(chain, i));
if (!X509_NAME_cmp(X509_get_subject_name(link), X509_get_issuer_name(link))) {
requestorCA = link;
}
}
}
} else {
Value requestorCaStr;
if (params->Get("requestor_ca", &requestorCaStr)) {
parsedRequestorCA = StringToCertificate(requestorCaStr);
requestorCA = parsedRequestorCA.get();
}
}
if (requestorCA && !IsCaUptodate(requestorCA)) {
int days;
if (ASN1_TIME_diff(&days, nullptr, X509_get_notAfter(requestorCA), X509_get_notAfter(cacert.get())) && days > 0) {
uptodate = false;
}
}
}
if (uptodate) {
Log(LogInformation, "JsonRpcConnection") Log(LogInformation, "JsonRpcConnection")
<< "The certificate for CN '" << cn << "' is valid and uptodate. Skipping automated renewal."; << "The certificates for CN '" << cn << "' and its root CA are valid and uptodate. Skipping automated renewal.";
result->Set("status_code", 1); result->Set("status_code", 1);
result->Set("error", "The certificate for CN '" + cn + "' is valid and uptodate. Skipping automated renewal."); result->Set("error", "The certificates for CN '" + cn + "' and its root CA are valid and uptodate. Skipping automated renewal.");
return result; return result;
} }
} }
@ -230,6 +272,10 @@ delayed_request:
{ "ticket", params->Get("ticket") } { "ticket", params->Get("ticket") }
}); });
if (requestorCA) {
request->Set("requestor_ca", CertificateToString(requestorCA));
}
Utility::SaveJsonFile(requestPath, 0600, request); Utility::SaveJsonFile(requestPath, 0600, request);
JsonRpcConnection::SendCertificateRequest(nullptr, origin, requestPath); JsonRpcConnection::SendCertificateRequest(nullptr, origin, requestPath);
@ -291,8 +337,7 @@ void JsonRpcConnection::SendCertificateRequest(const JsonRpcConnection::Ptr& acl
if (request->Contains("cert_response")) if (request->Contains("cert_response"))
return; return;
params->Set("cert_request", request->Get("cert_request")); request->CopyTo(params);
params->Set("ticket", request->Get("ticket"));
} }
/* Send the request to a) the connected client /* Send the request to a) the connected client