tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip: started to implement reloader service

Browse source
This commit is contained in:
Jun Kurihara 2024-05-27 11:55:22 +09:00
commit 377096c14e
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
4 changed files with 82 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpxy-certs/src/source.rs
View file

@ -1,4 +1,4 @@
use crate::{certs::SingleServerCrypto, error::*, log::*};
use crate::{certs::SingleServerCertsKeys, error::*, log::*};
use async_trait::async_trait;
use derive_builder::Builder;
use std::{
@ -15,7 +15,7 @@ pub trait CryptoSource {
type Error;
/// read crypto materials from source
async fn read(&self) -> Result<SingleServerCrypto, Self::Error>;
async fn read(&self) -> Result<SingleServerCertsKeys, Self::Error>;
/// Returns true when mutual tls is enabled
fn is_mutual_tls(&self) -> bool;
@ -58,7 +58,7 @@ impl CryptoFileSourceBuilder {
impl CryptoSource for CryptoFileSource {
type Error = RpxyCertError;
/// read crypto materials from source
async fn read(&self) -> Result<SingleServerCrypto, Self::Error> {
async fn read(&self) -> Result<SingleServerCertsKeys, Self::Error> {
read_certs_and_keys(
&self.tls_cert_path,
&self.tls_cert_key_path,
@ -77,7 +77,7 @@ fn read_certs_and_keys(
cert_path: &PathBuf,
cert_key_path: &PathBuf,
client_ca_cert_path: Option<&PathBuf>,
) -> Result<SingleServerCrypto, RpxyCertError> {
) -> Result<SingleServerCertsKeys, RpxyCertError> {
debug!("Read TLS server certificates and private key");
// certificates
@ -152,7 +152,7 @@ fn read_certs_and_keys(
None
};
Ok(SingleServerCrypto::new(
Ok(SingleServerCertsKeys::new(
&raw_certs,
&Arc::new(raw_cert_keys),
&client_ca_certs,