feat: generate certificates signed by the root CA (#3144)

Co-authored-by: Aiden McClelland <me@drbonez.dev>
This commit is contained in:
Matt Hill
2026-03-26 18:57:11 -06:00
committed by GitHub
parent 7c1c15073d
commit 2b676808a9
6 changed files with 127 additions and 1 deletions

View File

@@ -2818,6 +2818,13 @@ help.arg.echoip-urls:
fr_FR: "URLs du service Echo IP pour la détection d'IP externe"
pl_PL: "Adresy URL usługi Echo IP do wykrywania zewnętrznego IP"
help.arg.ed25519:
en_US: "Use Ed25519 instead of NIST P-256"
de_DE: "Ed25519 anstelle von NIST P-256 verwenden"
es_ES: "Usar Ed25519 en lugar de NIST P-256"
fr_FR: "Utiliser Ed25519 au lieu de NIST P-256"
pl_PL: "Użyj Ed25519 zamiast NIST P-256"
help.arg.emulate-missing-arch:
en_US: "Emulate missing architecture using this one"
de_DE: "Fehlende Architektur mit dieser emulieren"
@@ -2902,6 +2909,13 @@ help.arg.host-url:
fr_FR: "URL du serveur StartOS"
pl_PL: "URL serwera StartOS"
help.arg.hostnames:
en_US: "Hostnames to include in the certificate"
de_DE: "Hostnamen, die in das Zertifikat aufgenommen werden sollen"
es_ES: "Nombres de host para incluir en el certificado"
fr_FR: "Noms d'hôtes à inclure dans le certificat"
pl_PL: "Nazwy hostów do uwzględnienia w certyfikacie"
help.arg.icon-path:
en_US: "Path to service icon file"
de_DE: "Pfad zur Service-Icon-Datei"
@@ -5150,6 +5164,13 @@ about.manage-query-dns:
fr_FR: "Gérer et interroger le DNS"
pl_PL: "Zarządzaj i odpytuj DNS"
about.manage-ssl-certificates:
en_US: "Manage SSL certificates"
de_DE: "SSL-Zertifikate verwalten"
es_ES: "Gestionar certificados SSL"
fr_FR: "Gérer les certificats SSL"
pl_PL: "Zarządzaj certyfikatami SSL"
about.manage-ssl-vhost-proxy:
en_US: "Manage SSL vhost proxy"
de_DE: "SSL-vhost-Proxy verwalten"
@@ -5654,6 +5675,13 @@ about.stop-service:
fr_FR: "Arrêter un service"
pl_PL: "Zatrzymaj usługę"
about.ssl-generate-certificate:
en_US: "Generate an SSL certificate from the system root CA"
de_DE: "SSL-Zertifikat von der System-Root-CA generieren"
es_ES: "Generar un certificado SSL desde la CA raíz del sistema"
fr_FR: "Générer un certificat SSL depuis l'autorité racine du système"
pl_PL: "Wygeneruj certyfikat SSL z głównego CA systemu"
about.teardown-rebuild-containers:
en_US: "Teardown and rebuild containers"
de_DE: "Container abbauen und neu erstellen"

View File

@@ -42,6 +42,10 @@ pub fn net_api<C: Context>() -> ParentHandler<C> {
"tunnel",
tunnel::tunnel_api::<C>().with_about("about.manage-tunnels"),
)
.subcommand(
"ssl",
ssl::ssl_api::<C>().with_about("about.manage-ssl-certificates"),
)
.subcommand(
"vhost",
vhost::vhost_api::<C>().with_about("about.manage-ssl-vhost-proxy"),

View File

@@ -5,6 +5,7 @@ use std::path::Path;
use std::sync::Arc;
use std::time::{Duration, SystemTime, UNIX_EPOCH};
use clap::Parser;
use futures::FutureExt;
use imbl_value::InternedString;
use libc::time_t;
@@ -21,16 +22,19 @@ use openssl::x509::extension::{
use openssl::x509::{X509, X509Builder, X509NameBuilder, X509Ref};
use openssl::*;
use patch_db::HasModel;
use rpc_toolkit::{Context, HandlerExt, ParentHandler, from_fn_async};
use serde::{Deserialize, Serialize};
use tokio_rustls::rustls::ServerConfig;
use tokio_rustls::rustls::crypto::CryptoProvider;
use tokio_rustls::rustls::pki_types::{PrivateKeyDer, PrivatePkcs8KeyDer};
use tokio_rustls::rustls::server::ClientHello;
use tracing::instrument;
use ts_rs::TS;
use visit_rs::Visit;
use crate::SOURCE_DATE;
use crate::account::AccountInfo;
use crate::context::{CliContext, RpcContext};
use crate::db::model::Database;
use crate::db::{DbAccess, DbAccessMut};
use crate::hostname::ServerHostname;
@@ -39,7 +43,7 @@ use crate::net::gateway::GatewayInfo;
use crate::net::tls::{TlsHandler, TlsHandlerAction};
use crate::net::web_server::{Accept, ExtractVisitor, TcpMetadata, extract};
use crate::prelude::*;
use crate::util::serde::Pem;
use crate::util::serde::{HandlerExtSerde, Pem};
pub fn should_use_cert(cert: &X509Ref) -> Result<bool, ErrorStack> {
Ok(cert
@@ -592,6 +596,85 @@ pub fn make_self_signed(applicant: (&PKey<Private>, &SANInfo)) -> Result<X509, E
Ok(cert)
}
pub fn ssl_api<C: Context>() -> ParentHandler<C> {
ParentHandler::new().subcommand(
"generate-certificate",
from_fn_async(generate_certificate)
.with_display_serializable()
.with_custom_display_fn(|_, res: GenerateCertificateResponse| {
println!("Private Key:");
print!("{}", res.key);
println!("\nCertificate Chain:");
print!("{}", res.fullchain);
Ok(())
})
.with_about("about.ssl-generate-certificate")
.with_call_remote::<CliContext>(),
)
}
#[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
#[serde(rename_all = "camelCase")]
#[command(rename_all = "kebab-case")]
#[group(skip)]
#[ts(export)]
pub struct GenerateCertificateParams {
#[arg(help = "help.arg.hostnames")]
pub hostnames: Vec<String>,
#[arg(long, help = "help.arg.ed25519")]
#[serde(default)]
pub ed25519: bool,
}
#[derive(Debug, Clone, Deserialize, Serialize, TS)]
#[serde(rename_all = "camelCase")]
#[ts(export)]
pub struct GenerateCertificateResponse {
pub key: String,
pub fullchain: String,
}
pub async fn generate_certificate(
ctx: RpcContext,
GenerateCertificateParams { hostnames, ed25519 }: GenerateCertificateParams,
) -> Result<GenerateCertificateResponse, Error> {
let peek = ctx.db.peek().await;
let cert_store = peek.as_private().as_key_store().as_local_certs();
let int_key = cert_store.as_int_key().de()?.0;
let int_cert = cert_store.as_int_cert().de()?.0;
let root_cert = cert_store.as_root_cert().de()?.0;
drop(peek);
let hostnames: BTreeSet<InternedString> = hostnames.into_iter().map(InternedString::from).collect();
let san_info = SANInfo::new(&hostnames);
let (key, cert) = if ed25519 {
let key = PKey::generate_ed25519()?;
let cert = make_leaf_cert((&int_key, &int_cert), (&key, &san_info))?;
(key, cert)
} else {
let key = gen_nistp256()?;
let cert = make_leaf_cert((&int_key, &int_cert), (&key, &san_info))?;
(key, cert)
};
let key_pem =
String::from_utf8(key.private_key_to_pem_pkcs8()?).with_kind(ErrorKind::Utf8)?;
let fullchain_pem = String::from_utf8(
[&cert, &int_cert, &root_cert]
.into_iter()
.map(|c| c.to_pem())
.collect::<Result<Vec<_>, _>>()?
.concat(),
)
.with_kind(ErrorKind::Utf8)?;
Ok(GenerateCertificateResponse {
key: key_pem,
fullchain: fullchain_pem,
})
}
pub struct RootCaTlsHandler<M: HasModel> {
pub db: TypedPatchDb<M>,
pub crypto_provider: Arc<CryptoProvider>,