[pbs-devel] [PATCH proxmox 1/2] acme-api: use inner mutability for ACME_ACME_CONFIG
Shannon Sterz
s.sterz at proxmox.com
Tue Dec 3 14:53:24 CET 2024
in edition 2024 references to mutable static will be disallowed [1]. the
recommended way around this is to use types with inner mutability. so
use a `OnceLock` for `ACME_ACME_CONFIG` as the directoryfor ACME
configuration purposes shouldn't change throughout the run time of an
application.
[1]:
https://doc.rust-lang.org/nightly/edition-guide/rust-2024/static-mut-references.html
Signed-off-by: Shannon Sterz <s.sterz at proxmox.com>
---
proxmox-acme-api/src/init.rs | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/proxmox-acme-api/src/init.rs b/proxmox-acme-api/src/init.rs
index a5287a8e..5dcf048c 100644
--- a/proxmox-acme-api/src/init.rs
+++ b/proxmox-acme-api/src/init.rs
@@ -1,26 +1,28 @@
use std::path::{Path, PathBuf};
+use std::sync::OnceLock;
use anyhow::Error;
use proxmox_product_config::create_secret_dir;
+#[derive(Debug)]
struct AcmeApiConfig {
acme_config_dir: PathBuf,
acme_account_dir: PathBuf,
}
-static mut ACME_ACME_CONFIG: Option<AcmeApiConfig> = None;
+static ACME_ACME_CONFIG: OnceLock<AcmeApiConfig> = OnceLock::new();
/// Initialize the global product configuration.
pub fn init<P: AsRef<Path>>(acme_config_dir: P, create_subdirs: bool) -> Result<(), Error> {
let acme_config_dir = acme_config_dir.as_ref().to_owned();
- unsafe {
- ACME_ACME_CONFIG = Some(AcmeApiConfig {
+ ACME_ACME_CONFIG
+ .set(AcmeApiConfig {
acme_account_dir: acme_config_dir.join("accounts"),
acme_config_dir,
- });
- }
+ })
+ .expect("cannot set acme configuration twice");
if create_subdirs {
create_secret_dir(self::acme_config_dir(), false)?;
@@ -31,11 +33,9 @@ pub fn init<P: AsRef<Path>>(acme_config_dir: P, create_subdirs: bool) -> Result<
}
fn acme_api_config() -> &'static AcmeApiConfig {
- unsafe {
- ACME_ACME_CONFIG
- .as_ref()
- .expect("ProxmoxProductConfig is not initialized!")
- }
+ ACME_ACME_CONFIG
+ .get()
+ .expect("ProxmoxProductConfig is not initialized!")
}
fn acme_config_dir() -> &'static Path {
--
2.39.5
More information about the pbs-devel
mailing list