adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Support bookworm openssl in Csr

Browse source
This commit is contained in:
Adrian Heine 2023-09-12 10:41:42 +02:00
parent c41ad54c37
commit 6d564e58e0
1 changed files with 72 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/symbols/tls/csr.rs
View file

@ -2,6 +2,7 @@ use crate::command_runner::CommandRunner;
use crate::symbols::Symbol;
use async_trait::async_trait;
use std::borrow::Borrow;
use std::convert::AsRef;
use std::error::Error;
use std::path::Path;
@ -25,11 +26,9 @@ impl<C, D, K, P> Csr<C, D, K, P> {
}
#[async_trait(?Send)]
impl<C: CommandRunner, D: Borrow<str>, K: Borrow<Path>, P: Borrow<Path>> Symbol
for Csr<C, D, K, P>
{
impl<C: CommandRunner, D: Borrow<str>, K: AsRef<Path>, P: AsRef<Path>> Symbol for Csr<C, D, K, P> {
async fn target_reached(&self) -> Result<bool, Box<dyn Error>> {
if !self.csr_path.borrow().exists() {
if !self.csr_path.as_ref().exists() {
return Ok(false);
}
@ -37,10 +36,10 @@ impl<C: CommandRunner, D: Borrow<str>, K: Borrow<Path>, P: Borrow<Path>> Symbol
.command_runner
.get_stderr(
"openssl",
args!["req", "-in", self.csr_path.borrow(), "-noout", "-verify",],
args!["req", "-in", self.csr_path.as_ref(), "-noout", "-verify",],
)
.await?;
Ok(output == b"verify OK\n")
Ok(output == b"verify OK\n" || output == b"Certificate request self-signature verify OK\n")
}
async fn execute(&self) -> Result<(), Box<dyn Error>> {
@ -53,9 +52,9 @@ impl<C: CommandRunner, D: Borrow<str>, K: Borrow<Path>, P: Borrow<Path>> Symbol
"-new",
"-sha256",
"-key",
self.key_path.borrow(),
self.key_path.as_ref(),
"-out",
self.csr_path.borrow(),
self.csr_path.as_ref(),
"-subj",
format!("/CN={}", self.domain.borrow()),
],
@ -65,4 +64,68 @@ impl<C: CommandRunner, D: Borrow<str>, K: Borrow<Path>, P: Borrow<Path>> Symbol
}
#[cfg(test)]
mod test {}
mod test {
use super::{Csr, Symbol};
use crate::async_utils::run;
use crate::command_runner::MockCommandRunner;
#[test]
fn test_bookworm_success() {
let mut command_runner = MockCommandRunner::new();
command_runner
.expect_get_stderr()
.times(1)
.returning(|_, _| Ok("Certificate request self-signature verify OK\n".into()));
let symbol = Csr::new(command_runner, "", "/nonexisting", "/"); // FIXME: Csr path has to be an existing file
run(async {
assert_eq!(symbol.target_reached().await.unwrap(), true);
});
}
#[test]
fn test_bookworm_invalid() {
let mut command_runner = MockCommandRunner::new();
command_runner
.expect_get_stderr()
.times(1)
.returning(|_, _| {
Ok("Unable to load X509 request
40F746B61E7F0000:error:0480006C:PEM routines:get_name:no start line:../crypto/pem/pem_lib.c:763:Expecting: CERTIFICATE REQUEST
" .into())
});
let symbol = Csr::new(command_runner, "", "/nonexisting", "/"); // FIXME: Csr path has to be an existing file
run(async {
assert_eq!(symbol.target_reached().await.unwrap(), false);
});
}
#[test]
fn test_bullseye_success() {
let mut command_runner = MockCommandRunner::new();
command_runner
.expect_get_stderr()
.times(1)
.returning(|_, _| Ok("verify OK\n".into()));
let symbol = Csr::new(command_runner, "", "/nonexisting", "/"); // FIXME: Csr path has to be an existing file
run(async {
assert_eq!(symbol.target_reached().await.unwrap(), true);
});
}
#[test]
fn test_bullseye_invalid() {
let mut command_runner = MockCommandRunner::new();
command_runner
.expect_get_stderr()
.times(1)
.returning(|_, _| {
Ok("unable to load X509 request
140032085857600:error:0909006C:PEM routines:get_name:no start line:../crypto/pem/pem_lib.c:745:Expecting: CERTIFICATE REQUEST
" .into())
});
let symbol = Csr::new(command_runner, "", "/nonexisting", "/"); // FIXME: Csr path has to be an existing file
run(async {
assert_eq!(symbol.target_reached().await.unwrap(), false);
});
}
}