public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Shannon Sterz <s.sterz@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox 03/16] tls-certificates: add self_signed_cert_expires_in to check certificates
Date: Thu, 30 Jul 2026 15:31:45 +0200	[thread overview]
Message-ID: <20260730133158.418015-4-s.sterz@proxmox.com> (raw)
In-Reply-To: <20260730133158.418015-1-s.sterz@proxmox.com>

this is useful when self-signed certificates are in use. it
heuristically checks whether a certificate is self-signed by the
specified node and returns for how many more days the certificate is
valid if it is a self-signed certificate.

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 proxmox-tls-certificates/Cargo.toml  |  3 ++
 proxmox-tls-certificates/src/lib.rs  |  2 +-
 proxmox-tls-certificates/src/util.rs | 56 ++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/proxmox-tls-certificates/Cargo.toml b/proxmox-tls-certificates/Cargo.toml
index 105657f2..3d5ee365 100644
--- a/proxmox-tls-certificates/Cargo.toml
+++ b/proxmox-tls-certificates/Cargo.toml
@@ -11,11 +11,13 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true, optional = true }
+const_format = { workspace = true, optional = true }
 foreign-types = { workspace = true, optional = true }
 hex = { workspace = true, optional = true }
 libc = { workspace = true, optional = true }
 openssl = { workspace = true, optional = true }
 serde = { workspace = true, features = [ "derive" ] }
+regex = { workspace = true, optional = true }
 
 proxmox-schema = { workspace = true, features = [ "api-macro" ] }
 proxmox-sys = { workspace = true, optional = true }
@@ -31,6 +33,7 @@ impl = [
     "dep:hex",
     "dep:libc",
     "dep:openssl",
+    "dep:regex",
 
     "dep:proxmox-time",
     "dep:proxmox-uuid",
diff --git a/proxmox-tls-certificates/src/lib.rs b/proxmox-tls-certificates/src/lib.rs
index 454c700f..66def7d6 100644
--- a/proxmox-tls-certificates/src/lib.rs
+++ b/proxmox-tls-certificates/src/lib.rs
@@ -4,4 +4,4 @@ pub use types::CertificateInfo;
 #[cfg(feature = "impl")]
 mod util;
 #[cfg(feature = "impl")]
-pub use util::create_self_signed_cert;
+pub use util::{create_self_signed_cert, self_signed_cert_expires_in};
diff --git a/proxmox-tls-certificates/src/util.rs b/proxmox-tls-certificates/src/util.rs
index 8a822956..d627338c 100644
--- a/proxmox-tls-certificates/src/util.rs
+++ b/proxmox-tls-certificates/src/util.rs
@@ -1,13 +1,57 @@
 use std::mem::MaybeUninit;
 
 use anyhow::{Error, bail, format_err};
+use const_format::concatcp;
 use foreign_types::ForeignTypeRef;
+use openssl::asn1::Asn1Time;
 use openssl::pkey::{PKey, Private};
 use openssl::rsa::Rsa;
 use openssl::x509::{X509, X509Builder};
 
 use crate::CertificateInfo;
 
+proxmox_schema::const_regex! {
+    SELF_SIGNED_REGEX = concatcp!(
+        // O = $product_name, OU = $uuid, CN = $nodename
+        r#"^O\s?=\s(?<product>.*)?, OU\s?=\s?[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, CN\s?=\s?(?<fqdn>.*)$"#
+    );
+}
+
+/// Check whether the current certificate is self-signed and returns the remaining days the
+/// certificate is valid for.
+pub fn self_signed_cert_expires_in(
+    product_name: &str,
+    nodename: &str,
+    domain: Option<&str>,
+    cert: CertificateInfo,
+) -> Result<Option<i32>, Error> {
+    let Some(captures) = (SELF_SIGNED_REGEX.regex_obj)().captures(&cert.issuer) else {
+        return Ok(None);
+    };
+
+    let mut fqdn = nodename.to_string();
+
+    if let Some(domain) = domain {
+        fqdn = format!("{fqdn}.{domain}");
+    }
+
+    if captures["product"] != *product_name {
+        return Ok(None);
+    }
+
+    if captures["fqdn"] != fqdn {
+        return Ok(None);
+    }
+
+    let now = Asn1Time::from_unix(proxmox_time::epoch_i64())?;
+    let not_after = Asn1Time::from_unix(cert.notafter.ok_or_else(|| {
+        format_err!("Could not get \"not after\" epoch for current certificate.")
+    })?)?;
+
+    let diff = now.diff(&not_after)?;
+    Ok(Some(diff.days))
+}
+
 /// Create a new self-signed certificate and its private key.
 ///
 /// * `product_name`: The name of the product, will be used as the organization of the certificate.
@@ -237,6 +281,18 @@ mod test {
         }
     }
 
+    #[test]
+    fn self_signed_cert_expires_in_gets_correct_days() {
+        let cert_info =
+            get_self_signed_certificate_info("Proxmox Test Product", "name", Some("fqdn"), Some(2));
+
+        match self_signed_cert_expires_in("Proxmox Test Product", "name", Some("fqdn"), cert_info) {
+            Ok(Some(days)) => assert_eq!(days, 2i32),
+            Ok(None) => panic!("not a self-signed certificate"),
+            Err(e) => panic!("error occured checking certificate - {e:#}"),
+        }
+    }
+
     #[test]
     fn self_signed_certificate_correct_with_product_and_name_only() {
         let cert_info =
-- 
2.47.3





  parent reply	other threads:[~2026-07-30 13:32 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-30 13:31 [PATCH datacenter-manager/proxmox{,-backup} 00/16] TLS Certificate Rotation Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox 01/16] acme-api/tls-certificates: add new crate collecting tls realted helpers Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox 02/16] tls-certificates: add days_valid parameter to create_self_signed_cert Shannon Sterz
2026-07-30 13:31 ` Shannon Sterz [this message]
2026-07-30 13:31 ` [PATCH proxmox 04/16] acme-api: stop re-exporting create_self_signed_cert Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox-backup 05/16] config: use proxmox_tls_certificates for generating self-signed certificates Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox-backup 06/16] config/server/api: add certificate renewal logic including notifications Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox-backup 07/16] daily update: warn about excessive self-signed certificate lifetime Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox-backup 08/16] docs: document force refreshing long-lived certificates Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox-backup 09/16] backup-manager cli: `cert update` can create auth and csrf key Shannon Sterz
2026-07-30 13:31 ` [PATCH proxmox-backup 10/16] notifications: use `Severity::Error` for acme renewal failures Shannon Sterz
2026-07-30 13:31 ` [PATCH datacenter-manager 11/16] certs: use proxmox-tls-certificates directly, add days_valid paramter Shannon Sterz
2026-07-30 13:31 ` [PATCH datacenter-manager 12/16] api/auth/bin: add certificate renewal logic Shannon Sterz
2026-07-30 13:31 ` [PATCH datacenter-manager 13/16] cli: expose certificate management endpoints via the cli Shannon Sterz
2026-07-30 13:31 ` [PATCH datacenter-manager 14/16] daily-update: warn about certificates with excessive lifetimes Shannon Sterz
2026-07-30 13:31 ` [PATCH datacenter-manager 15/16] docs: add section on forcing a new self-signed certificate Shannon Sterz
2026-07-30 13:31 ` [PATCH datacenter-manager 16/16] docs/certificates: use correct certificate file name Shannon Sterz
2026-07-30 13:44 ` [PATCH datacenter-manager/proxmox{,-backup} 00/16] TLS Certificate Rotation Shannon Sterz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260730133158.418015-4-s.sterz@proxmox.com \
    --to=s.sterz@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal