demostf/frontend
1
0
Fork 0
mirror of https://codeberg.org/demostf/frontend.git synced 2026-06-03 18:24:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch to secretfile

Browse source
This commit is contained in:
Robin Appelman 2024-03-26 20:42:09 +01:00
commit f46ef086a8
4 changed files with 49 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/error.rs
View file

@ -2,6 +2,7 @@ use axum::http::StatusCode;
use axum::response::{IntoResponse, Response};
use config::ConfigError;
use opentelemetry::trace::TraceError;
use secretfile::SecretError;
use tracing_subscriber::util::TryInitError;
#[derive(Debug, thiserror::Error)]
@ -36,6 +37,8 @@ pub enum SetupError {
TracingSubscriber(#[from] TryInitError),
#[error(transparent)]
Config(#[from] ConfigError),
#[error(transparent)]
Secret(#[from] SecretError),
#[error("{0}")]
Other(String),
}

11
src/main.rs
View file

@ -42,9 +42,10 @@ use maud::{Markup, Render};
use opentelemetry::KeyValue;
use opentelemetry_otlp::WithExportConfig;
use opentelemetry_sdk::{runtime, trace, Resource};
use secretfile::load;
use sqlx::PgPool;
use std::env::{args, var};
use std::fs::{read, remove_file, set_permissions, Permissions};
use std::fs::{remove_file, set_permissions, Permissions};
use std::net::SocketAddr;
use std::os::unix::fs::PermissionsExt;
use std::sync::Arc;
@ -94,12 +95,8 @@ fn setup() -> Result<Config, SetupError> {
.with_endpoint(&tracing_cfg.endpoint);
if let Some(tracing_ident) = tracing_cfg.tls.as_ref().map(|tracing_tls_cfg| {
let key = read(&tracing_tls_cfg.key_file).map_err(|_| {
SetupError::Other(format!("failed to open {}", tracing_tls_cfg.key_file))
})?;
let cert = read(&tracing_tls_cfg.cert_file).map_err(|_| {
SetupError::Other(format!("failed to open {}", tracing_tls_cfg.cert_file))
})?;
let key = load(&tracing_tls_cfg.key_file)?;
let cert = load(&tracing_tls_cfg.cert_file)?;
Result::<_, SetupError>::Ok(Identity::from_pem(cert, key))
}) {
let tls_config = ClientTlsConfig::new().identity(tracing_ident?);