gru/RustProxy
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.25.5

Browse Source
This commit is contained in:
Mateusz Gruszczyński committed 2026-10-05 09:30:21 +02:00
1 parent 1dea7f55c8
commit c819f0a335
151 files changed
+7610 -4264
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/admin/certificates.rs
+31 -20
View File
@@ -169,8 +169,7 @@ async fn certificate_deploy(
}
let administration_restart_required = config.administration.tls
&& config.administration.certificate_id.as_deref()
== Some(certificate_id.as_str());
&& config.administration.certificate_id.as_deref() == Some(certificate_id.as_str());
let result = state
.update_as(
Update {
@@ -196,8 +195,12 @@ async fn certificate_deploy(
})
.await
{
Err(join_error) => tracing::warn!(%join_error, "external certificate rollback task failed"),
Ok(Err(rollback_error)) => tracing::warn!(%rollback_error, "external certificate rollback failed"),
Err(join_error) => {
tracing::warn!(%join_error, "external certificate rollback task failed")
}
Ok(Err(rollback_error)) => {
tracing::warn!(%rollback_error, "external certificate rollback failed")
}
Ok(Ok(())) => {}
}
}
@@ -227,8 +230,12 @@ async fn certificate_deploy(
})
.await
{
Err(join_error) => tracing::warn!(%join_error, "previous external certificate cleanup task failed"),
Ok(Err(cleanup_error)) => tracing::warn!(%cleanup_error, "previous external certificate cleanup failed"),
Err(join_error) => {
tracing::warn!(%join_error, "previous external certificate cleanup task failed")
}
Ok(Err(cleanup_error)) => {
tracing::warn!(%cleanup_error, "previous external certificate cleanup failed")
}
Ok(Ok(())) => {}
}
}
@@ -271,12 +278,13 @@ async fn certificate_reload(
) -> Result<Json<Value>, ApiError> {
let revision = state.reload_certificates().await?;
let snapshot = state.config.load_full();
let admin_certificate_restart_required = snapshot
.envelope
.config
.administration
.tls
&& snapshot.envelope.config.administration.certificate_id.is_some();
let admin_certificate_restart_required = snapshot.envelope.config.administration.tls
&& snapshot
.envelope
.config
.administration
.certificate_id
.is_some();
state
.store
.audit(
@@ -295,23 +303,26 @@ async fn certificate_reload(
})))
}
async fn certificate_reload_one(
State(state): State<Arc<App>>,
Extension(session): Extension<Session>,
Path(certificate_id): Path<String>,
) -> Result<Json<Value>, ApiError> {
if !crate::config::valid_id(&certificate_id) {
return Err(ApiError(StatusCode::NOT_FOUND, "certificate not found".into()));
return Err(ApiError(
StatusCode::NOT_FOUND,
"certificate not found".into(),
));
}
let revision = state.reload_certificate(&certificate_id).await?;
let snapshot = state.config.load_full();
let admin_certificate_restart_required = snapshot
.envelope
.config
.administration
.tls
&& snapshot.envelope.config.administration.certificate_id.as_deref()
let admin_certificate_restart_required = snapshot.envelope.config.administration.tls
&& snapshot
.envelope
.config
.administration
.certificate_id
.as_deref()
== Some(certificate_id.as_str());
state
.store